nix: upgrade nixpkgs to v24.11

This commit is contained in:
The MMGen Project 2025-03-10 14:28:55 +00:00
commit 400054975b
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
4 changed files with 11 additions and 2 deletions

View file

@ -1,7 +1,7 @@
{ add_pkgs_path }: { add_pkgs_path }:
let let
dfl_nixpkgs = import ./nixpkgs-24.05.nix {}; dfl_nixpkgs = import ./nixpkgs-24.11.nix {};
dfl_python = pkgs.python312; dfl_python = pkgs.python312;
null_pkgs = { null_pkgs = {
system-packages = {}; system-packages = {};

8
nix/nixpkgs-24.11.nix Normal file
View file

@ -0,0 +1,8 @@
import (
fetchGit {
url = "https://github.com/NixOS/nixpkgs.git";
ref = "release-24.11";
rev = "8b27c1239e5c421a2bbc2c65d52e4a6fbf2ff296"; # refs/tags/24.11
shallow = true;
}
)

View file

@ -39,6 +39,7 @@ pkgs.mkShellNoCC {
pwd=$(pwd) pwd=$(pwd)
export PYTHONPATH=$pwd export PYTHONPATH=$pwd
export PATH=$pwd/cmds:$pwd/.bin-override:$HOME/.local/bin:$PATH export PATH=$pwd/cmds:$pwd/.bin-override:$HOME/.local/bin:$PATH
export LANG="en_US.UTF-8"
[ "$UID" == 0 ] || do_bin_override [ "$UID" == 0 ] || do_bin_override
''; '';

View file

@ -8,7 +8,7 @@
rec { rec {
### Set nixpkgs globally for the MMGen environment. ### Set nixpkgs globally for the MMGen environment.
### If you set it, make sure to uncomment the python variable assignment below. ### If you set it, make sure to uncomment the python variable assignment below.
# pkgs = import (bdir + /nixpkgs-24.05.nix) {}; # pkgs = import (bdir + /nixpkgs-24.11.nix) {};
### Set python version globally for the MMGen environment. ### Set python version globally for the MMGen environment.
### Must be set if pkgs is set. ### Must be set if pkgs is set.