Skip to content

Commit 898dcb2

Browse files
authored
add nixpkgs 24.11 channel (#170)
Why === * A [new stable NixOS version was released](https://nixos.org/manual/nixos/stable/release-notes.html#sec-release-24.11) What changed === * ran ./add.sh 24.11 * added some missing 24.05 changes * make unstable channel match 24.11 * remove replitPackages overlay for 24.11 channel Test plan === * CI builds for 24.11
1 parent 041913f commit 898dcb2

7 files changed

Lines changed: 42 additions & 6 deletions

File tree

.semaphore/semaphore.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ blocks:
5353
- nixpkgs-23.05
5454
- nixpkgs-23.11
5555
- nixpkgs-24.05
56+
- nixpkgs-24.11
5657
- nixpkgs-unstable
5758
commands:
5859
- mkdir /tmp/$NIXPKGS_CHANNEL
@@ -135,3 +136,12 @@ promotions:
135136
default_value: nixpkgs-24.05
136137
description: Which channel to update?
137138
name: NIXPKGS_CHANNEL
139+
140+
- name: Push nixpkgs-24.11 to GCS
141+
pipeline_file: push.yml
142+
parameters:
143+
env_vars:
144+
- required: true
145+
default_value: nixpkgs-24.11
146+
description: Which channel to update?
147+
name: NIXPKGS_CHANNEL

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
default=nixpkgs-24.05
3+
default=nixpkgs-24.11
44
channel=$default
55

66
function error() {

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ sources ? import nix/sources.nix
2-
, channelName ? "nixpkgs-24.05"
2+
, channelName ? "nixpkgs-24.11"
33
, channel ? sources.${channelName}
44
, system ? "x86_64-linux"
55
, config ? { }

hydra/release-24.11.nix

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{}:
2+
3+
let
4+
sources = import ../nix/sources.nix;
5+
pkgs = import ../default.nix {
6+
sources = sources;
7+
channel = sources."nixpkgs-24.11";
8+
};
9+
in
10+
{
11+
inherit (pkgs) replitPackages;
12+
inherit (pkgs.nodePackages) typescript-language-server yarn prettier svelte-language-server;
13+
}

nix/sources.json

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,18 @@
8383
"url": "https://github.com/nixos/nixpkgs/archive/47b604b07d1e8146d5398b42d3306fdebd343986.tar.gz",
8484
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
8585
},
86+
"nixpkgs-24.11": {
87+
"branch": "nixos-24.11",
88+
"description": "Nix Packages collection & NixOS",
89+
"homepage": "",
90+
"owner": "nixos",
91+
"repo": "nixpkgs",
92+
"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
93+
"sha256": "1bcgis62aj9slin2cm2h7ywqq4qswh4kzdlx0zgdwz80g4z10f8f",
94+
"type": "tarball",
95+
"url": "https://github.com/nixos/nixpkgs/archive/cbd8ec4de4469333c82ff40d057350c30e9f7d36.tar.gz",
96+
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
97+
},
8698
"nixpkgs-legacy": {
8799
"description": "Nix Packages collection",
88100
"homepage": "",
@@ -100,10 +112,10 @@
100112
"homepage": "",
101113
"owner": "nixos",
102114
"repo": "nixpkgs",
103-
"rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
104-
"sha256": "1m113g0jfmdhznx0b66x7aq7af8iz4vh00nacdvpmbnvz5bh66fd",
115+
"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
116+
"sha256": "1bcgis62aj9slin2cm2h7ywqq4qswh4kzdlx0zgdwz80g4z10f8f",
105117
"type": "tarball",
106-
"url": "https://github.com/nixos/nixpkgs/archive/ae815cee91b417be55d43781eb4b73ae1ecc396c.tar.gz",
118+
"url": "https://github.com/nixos/nixpkgs/archive/cbd8ec4de4469333c82ff40d057350c30e9f7d36.tar.gz",
107119
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
108120
},
109121
"prybar": {

overlay.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
self: super:
33

44
let
5-
noOverlay = channelName == "nixpkgs-23.05" || channelName == "nixpkgs-23.11" || channelName == "nixpkgs-24.05" || channelName == "nixpkgs-unstable";
5+
noOverlay = channelName != "nixpkgs-legacy" && channelName != "nixpkgs-21.11" && channelName != "nixpkgs-22.05" && channelName != "nixpkgs-22.11";
66
in
77

88
if noOverlay then { replitPackages = { }; } else

update.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ nix-shell -p niv --run 'niv update nixpkgs-22.11 -b nixos-22.11'
66
nix-shell -p niv --run 'niv update nixpkgs-23.05 -b nixos-23.05'
77
nix-shell -p niv --run 'niv update nixpkgs-23.11 -b nixos-23.11'
88
nix-shell -p niv --run 'niv update nixpkgs-24.05 -b nixos-24.05'
9+
nix-shell -p niv --run 'niv update nixpkgs-24.11 -b nixos-24.11'

0 commit comments

Comments
 (0)