Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(build): #1353 upgrade nix to 2.23 #1385

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion makes/cli/env/runtime/main.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ makeSearchPaths {
__nixpkgs__.git
__nixpkgs__.gnutar
__nixpkgs__.gzip
__nixpkgs__.nixVersions.nix_2_15
__nixpkgs__.nixVersions.nix_2_23
__nixpkgs__.openssh
];
source = [ outputs."/cli/env/runtime/pypi" ];
Expand Down
2 changes: 1 addition & 1 deletion makes/container-image/main.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ __nixpkgs__.dockerTools.buildImage {
__nixpkgs__.gnugrep
__nixpkgs__.gnutar
__nixpkgs__.gzip
__nixpkgs__.nixVersions.nix_2_15
__nixpkgs__.nixVersions.nix_2_23

# Add /usr/bin/env pointing to /bin/env
(__nixpkgs__.runCommand "user-bin-env" { } ''
Expand Down
2 changes: 1 addition & 1 deletion makes/main.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ in makeScript {
aliases = [ "m-v${makesVersion}" "makes" "makes-v${makesVersion}" ];
replace = {
__argMakesSrc__ = projectPath "/";
__argNix__ = __nixpkgs__.nixVersions.nix_2_15;
__argNix__ = __nixpkgs__.nixVersions.nix_2_23;
};
entrypoint = ''
__MAKES_SRC__=__argMakesSrc__ \
Expand Down
2 changes: 1 addition & 1 deletion makes/utils/makeRubyLock/main.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ makeScript {
__argRuby32__ = __nixpkgs__.ruby_3_2;
__argRuby33__ = __nixpkgs__.ruby_3_3;
};
searchPaths.bin = [ __nixpkgs__.nixVersions.nix_2_15 __nixpkgs__.yj ];
searchPaths.bin = [ __nixpkgs__.nixVersions.nix_2_23 __nixpkgs__.yj ];
}
6 changes: 3 additions & 3 deletions src/nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9",
"sha256": "0yc83iqbzj1gd651x6p2wx7a76wfpifaq7jxz4srbinaglfwfb07",
"rev": "ca30f584e18024baf39c395001262ed936f27ebd",
"sha256": "0h79z53amzmxd9k0fzl9vmvg6l56sxx5wsqfd085jrivwrikzgn5",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5f5210aa20e343b7e35f40c033000db0ef80d7b9.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/ca30f584e18024baf39c395001262ed936f27ebd.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
Loading