Skip to content

Commit

Permalink
Merge pull request #419 from replit/dstewart/chore/bump-unstable
Browse files Browse the repository at this point in the history
[go, nixpkgs, dotnet] chore/bump unstable
  • Loading branch information
blast-hardcheese authored Dec 20, 2024
2 parents 4327245 + 1bccb99 commit 1b52ba9
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 62 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/update-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,3 @@ jobs:
take care to ensure its contents are correct. This Workflow
runs every week to ensure the rust-nightly module is regularly
updated.
- name: lock modules
run: nix develop -c python scripts/lock_modules.py

- name: push locked modules
run: |
git commit -am 'lock modules'
git push actions/update-weekly
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions pkgs/historical-modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ let
displayVersion = "1";
};
}
{
moduleId = "clojure-1.11";
commit = "4327245815e8500233ed3af1cbb674bd147f673b";
overrides = {
displayVersion = "1.11";
};
}
{
moduleId = "dart-2.18";
commit = "c48c43c6c698223ed3ce2abc5a2d708735a77d5b";
Expand Down Expand Up @@ -60,6 +67,13 @@ let
displayVersion = "3";
};
}
{
moduleId = "deno-1";
commit = "4327245815e8500233ed3af1cbb674bd147f673b";
overrides = {
displayVersion = "1";
};
}
{
moduleId = "docker";
commit = "185d7dc7645178f92fd891f9efa20b3343c0f20d";
Expand All @@ -68,6 +82,13 @@ let
internal = true;
};
}
{
moduleId = "dotnet-7.0";
commit = "4327245815e8500233ed3af1cbb674bd147f673b";
overrides = {
displayVersion = "7.0";
};
}
{
moduleId = "go-1.19";
commit = "c48c43c6c698223ed3ce2abc5a2d708735a77d5b";
Expand All @@ -86,6 +107,15 @@ let
displayVersion = "1.20";
};
}
{
moduleId = "go-1.21";
commit = "76ae6535d7d60e767fe9d54902400229ca0b9448";
overrides = {
# /nix/store/...-replit-module-go-1.21
# .runners["go-run"].displayVersion = "1...";
displayVersion = "1.21";
};
}
{
moduleId = "haskell-ghc9.0";
commit = "c48c43c6c698223ed3ce2abc5a2d708735a77d5b";
Expand Down Expand Up @@ -170,6 +200,13 @@ let
displayVersion = "8";
};
}
{
moduleId = "php-8.2";
commit = "4327245815e8500233ed3af1cbb674bd147f673b";
overrides = {
displayVersion = "8.2";
};
}
{
moduleId = "python-3.8";
commit = "76ae6535d7d60e767fe9d54902400229ca0b9448";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ let
(import ./nodejs-with-prybar)

(import ./go {
go = pkgs.go_1_21;
go = pkgs.go_1_23;
gopls = pkgs.gopls.override {
buildGoModule = pkgs.buildGo121Module;
buildGoModule = pkgs.buildGo123Module;
};
})

Expand Down
6 changes: 3 additions & 3 deletions pkgs/modules/docker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ let

configFiles = pkgs.copyPathToStore ./etc;

replit-runc = pkgs.buildGo121Module {
replit-runc = pkgs.buildGo123Module {
pname = "replit-runc";
version = "1.1.9+replit";

Expand All @@ -30,7 +30,7 @@ let
'';
};

replit-containerd = pkgs.buildGo121Module {
replit-containerd = pkgs.buildGo123Module {
pname = "replit-containerd";
version = "1.7.5+replit";

Expand Down Expand Up @@ -65,7 +65,7 @@ let
replitShimRunc = replit-containerd;
};

replit-buildkit = pkgs.buildGo121Module {
replit-buildkit = pkgs.buildGo123Module {
pname = "replit-buildkit";
version = "v0.13.0-beta1+replit";

Expand Down
6 changes: 3 additions & 3 deletions pkgs/modules/dotnet/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ pkgs, lib, ... }:

let
dotnet = pkgs.dotnet-sdk_7;
dotnet = pkgs.dotnet-sdk_8;

extensions = [ ".cs" ".csproj" ".fs" ".fsproj" ];

Expand All @@ -10,10 +10,10 @@ in

{
id = "dotnet-${dotnet-version}";
name = ".NET 7 Tools";
name = ".NET 8 Tools";
displayVersion = dotnet-version;
description = ''
.NET 7 development tools. Includes .NET and OmniSharp.
.NET 8 development tools. Includes .NET and OmniSharp.
'';

replit.packages = [
Expand Down
43 changes: 0 additions & 43 deletions pkgs/pip/default.nix

This file was deleted.

0 comments on commit 1b52ba9

Please sign in to comment.