Skip to content

Commit bed2612

Browse files
update Nix and Nixpkgs releases
1 parent ac38abe commit bed2612

File tree

5 files changed

+36
-32
lines changed

5 files changed

+36
-32
lines changed

Diff for: default.nix

+7-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
let
1212
lib = pkgs.lib;
1313
releases = import ./nix/releases.nix { inherit lib inputs system; };
14+
pkgs-unstable = import inputs.main.nixpkgs-rolling {
15+
config = { };
16+
overlays = [ ];
17+
inherit system;
18+
};
1419

1520
nix-dev =
1621
pkgs.stdenv.mkDerivation {
@@ -111,8 +116,8 @@ let
111116
python ${pkgs.writeText "live.py" script}
112117
'';
113118
};
114-
update-nix-releases = pkgs.callPackage ./nix/update-nix-releases.nix { };
115-
update-nixpkgs-releases = pkgs.callPackage ./nix/update-nixpkgs-releases.nix { };
119+
update-nix-releases = pkgs-unstable.callPackage ./nix/update-nix-releases.nix { };
120+
update-nixpkgs-releases = pkgs-unstable.callPackage ./nix/update-nixpkgs-releases.nix { };
116121
in
117122
{
118123
# build with `nix-build -A build`

Diff for: nix/nix-versions.json

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
{
22
"2.24": {
3-
"url": "https://github.com/nixos/nix/tarball/1b076b4f84a74a47d4f4eeb14c7d1e485a754c87",
4-
"version": "2.24.7",
5-
"sha256": "0r2n0mq992lva4jn03a0rx6jsn2k87xqji67ph810dq8f56g7hsk"
3+
"url": "https://github.com/nixos/nix/tarball/6e095ddef9bc12ebde519ee1985d687b5ad2ca4f",
4+
"version": "2.24.11",
5+
"sha256": "0zxjfd2iq2sjk5pr92xdkydsy19jalxsfgh0x26d7qp4q2cx1wyy"
66
},
77
"2.23": {
8-
"url": "https://github.com/nixos/nix/tarball/e873d00bda0162c54bdd5009e7a4d8025cfb17b9",
9-
"version": "2.23.4",
10-
"sha256": "1zrpmw19nl1phw043xbq8myn67ci338xxvvdnwpf2d8azvhm8v5n"
8+
"url": "https://github.com/nixos/nix/tarball/f50d7186917b441c3165fe85fc5d703c04ad41a4",
9+
"version": "2.23.5",
10+
"sha256": "004qmr3an365vh9h8swmmhm9hd4zwz0brcsckxi847svnijcxr1v"
1111
},
1212
"2.22": {
13-
"url": "https://github.com/nixos/nix/tarball/e67d6b6447b062d53ad646c665dfe053720bc58b",
14-
"version": "2.22.4",
15-
"sha256": "0r4lg9jn83lhddi4r5504rj3hsdj6s2ylij5ii3wa10zs1qdbdn0"
13+
"url": "https://github.com/nixos/nix/tarball/278e02c0efc83bdaec0c93bb8315560528516ab0",
14+
"version": "2.22.5",
15+
"sha256": "11kbrq2q57hchiglkgnrck619xnxiyc3sdka88kbly4ks69rc0bv"
1616
},
1717
"2.21": {
18-
"url": "https://github.com/nixos/nix/tarball/16591ff737dea5af56fa01d0efdc0cc0cb36fa4e",
19-
"version": "2.21.5",
20-
"sha256": "05vswykvvgli2rwy05hc6rx7lmm39n5xnb3caxg9rn8jd9h7r6nd"
18+
"url": "https://github.com/nixos/nix/tarball/2c6c438f436c019ad7340faa31c6f0603b2b9b46",
19+
"version": "2.21.6",
20+
"sha256": "10b9n0gzf5h3bcmx7zwnkb31iwanyfjzpif3vzp9gcwfngr6ikrn"
2121
},
2222
"2.20": {
23-
"url": "https://github.com/nixos/nix/tarball/1da3fd549e33a2f1cb1539efc71ea4abd17eb02b",
24-
"version": "2.20.9",
25-
"sha256": "092sla5mxr13nzzdnd6v9hyw82vkfq2g27b19sr5vbnmjlp4q7my"
23+
"url": "https://github.com/nixos/nix/tarball/28627c839f90b1dd158a0ceab9109839e6996d23",
24+
"version": "2.20.10",
25+
"sha256": "11xdcbm4slrcqcyr2jz49wkns4iq49z6p2b6i00chv0c7k8q92hm"
2626
},
2727
"2.19": {
28-
"url": "https://github.com/nixos/nix/tarball/0446f7be8c3a2bcbbc90546472befd22ea600383",
29-
"version": "2.19.7",
30-
"sha256": "15qy56xhwkijp2ha52f9dayd5swq3mcw2rg9nz3dqgrx7wxihwbc"
28+
"url": "https://github.com/nixos/nix/tarball/99a7cbdb6b6becd8717fd47339aa1200f0ac938c",
29+
"version": "2.19.8",
30+
"sha256": "1vljpsa4vmzp0k72psdl1w41jsidm1phrj7f2ld6vsfs79wyyg5y"
3131
},
3232
"2.18": {
33-
"url": "https://github.com/nixos/nix/tarball/a8196707ada639e5b3d70d21d104b95611c004f6",
34-
"version": "2.18.6",
35-
"sha256": "1gk2v0rss8w50p04is3g34x3y5c8b6cbxcvzpwb95h84sb3c141r"
33+
"url": "https://github.com/nixos/nix/tarball/266d76cf99cb82c96c91231f7a9a554ec69b67fb",
34+
"version": "2.18.10",
35+
"sha256": "0nnv36bwv1amk5c73ji1c2cpf2bglxiz1an9r9fgnbm7v9chbfsz"
3636
},
3737
"2.17": {
3838
"url": "https://github.com/nixos/nix/tarball/800f9c6dbac71594e2c250ff2b5f900268c4e522",

Diff for: nix/sources.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@
140140
"repo": "nixpkgs"
141141
},
142142
"branch": "nixos-24.05",
143-
"revision": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9",
144-
"url": "https://github.com/nixos/nixpkgs/archive/f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9.tar.gz",
145-
"hash": "1h9q8vrbxm9hf0vjvd5fxw9fxdly3jmigzl1yxf7g5abpbb0vbig"
143+
"revision": "dba414932936fde69f0606b4f1d87c5bc0003ede",
144+
"url": "https://github.com/nixos/nixpkgs/archive/dba414932936fde69f0606b4f1d87c5bc0003ede.tar.gz",
145+
"hash": "0lbnsjq251kalw9p1sxq1pjzl795f8h19sbxy57p55649cbwa2lv"
146146
}
147147
},
148148
"version": 3

Diff for: nix/update-nix-releases.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ writeShellApplication {
1919
git clone --quiet --filter=tree:0 --bare https://github.com/nixos/nix "$tmp/nix"
2020
2121
echo >&2 "Going through all *-maintenance branches"
22-
git -C "$tmp/nix" branch --list '*-maintenance' --format '%(refname)' \
22+
git -C "$tmp/nix" branch --list '[0-9]*.[0-9]*-maintenance' --format '%(refname)' \
2323
| rg 'refs/heads/(.*)-maintenance' -or '$1' \
2424
| sort --reverse --version-sort \
2525
| while read -r version; do

Diff for: npins/sources.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"repo": "nixpkgs"
99
},
1010
"branch": "nixpkgs-unstable",
11-
"revision": "5775c2583f1801df7b790bf7f7d710a19bac66f4",
12-
"url": "https://github.com/nixos/nixpkgs/archive/5775c2583f1801df7b790bf7f7d710a19bac66f4.tar.gz",
13-
"hash": "0vq01gfy9qlwsqmh6v8r1r8zqkp4w93bh31wk5nipllr66vl5nlz"
11+
"revision": "8c4dc69b9732f6bbe826b5fbb32184987520ff26",
12+
"url": "https://github.com/nixos/nixpkgs/archive/8c4dc69b9732f6bbe826b5fbb32184987520ff26.tar.gz",
13+
"hash": "1x9qqhvk2d3139v9szw0pj7563v4bkj19a7vd5z8miaih700fbfr"
1414
},
1515
"poetry2nix": {
1616
"type": "Git",
@@ -26,5 +26,4 @@
2626
}
2727
},
2828
"version": 3
29-
}
30-
29+
}

0 commit comments

Comments
 (0)