Skip to content

Commit

Permalink
add nixpkgs 24.05 channel (#166)
Browse files Browse the repository at this point in the history
Why
===
* A [new stable NixOS version was
released](https://nixos.org/manual/nixos/stable/release-notes.html#sec-release-24.05)

What changed
===
* ran ./add.sh 24.05
* added some missing 24.05 changes
* make unstable channel match 24.05
* remove replitPackages overlay for 24.05 channel

Test plan
===
* CI builds for 24.05
  • Loading branch information
vlinkz authored Jun 12, 2024
1 parent 8f5700f commit eb18a07
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 7 deletions.
10 changes: 10 additions & 0 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ blocks:
- nixpkgs-22.11
- nixpkgs-23.05
- nixpkgs-23.11
- nixpkgs-24.05
- nixpkgs-unstable
commands:
- mkdir /tmp/$NIXPKGS_CHANNEL
Expand Down Expand Up @@ -125,3 +126,12 @@ promotions:
default_value: nixpkgs-23.11
description: Which channel to update?
name: NIXPKGS_CHANNEL

- name: Push nixpkgs-24.05 to GCS
pipeline_file: push.yml
parameters:
env_vars:
- required: true
default_value: nixpkgs-24.05
description: Which channel to update?
name: NIXPKGS_CHANNEL
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

default=nixpkgs-23.11
default=nixpkgs-24.05
channel=$default

function error() {
Expand Down
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ sources ? import nix/sources.nix
, channelName ? "nixpkgs-23.11"
, channelName ? "nixpkgs-24.05"
, channel ? sources.${channelName}
, system ? "x86_64-linux"
, config ? { }
Expand Down
13 changes: 13 additions & 0 deletions hydra/release-24.05.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{}:

let
sources = import ../nix/sources.nix;
pkgs = import ../default.nix {
sources = sources;
channel = sources."nixpkgs-24.05";
};
in
{
inherit (pkgs) replitPackages;
inherit (pkgs.nodePackages) typescript-language-server yarn prettier svelte-language-server;
}
18 changes: 15 additions & 3 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@
"url": "https://github.com/nixos/nixpkgs/archive/b2cf36f43f9ef2ded5711b30b1f393ac423d8f72.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-24.05": {
"branch": "nixos-24.05",
"description": "Nix Packages collection & NixOS",
"homepage": "",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "47b604b07d1e8146d5398b42d3306fdebd343986",
"sha256": "0g0nl5dprv52zq33wphjydbf3xy0kajp0yix7xg2m0qgp83pp046",
"type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/47b604b07d1e8146d5398b42d3306fdebd343986.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-legacy": {
"description": "Nix Packages collection",
"homepage": "",
Expand All @@ -88,10 +100,10 @@
"homepage": "",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f945939fd679284d736112d3d5410eb867f3b31c",
"sha256": "06da1wf4w752spsm16kkckfhxx5m09lwcs8931gwh76yvclq7257",
"rev": "47b604b07d1e8146d5398b42d3306fdebd343986",
"sha256": "0g0nl5dprv52zq33wphjydbf3xy0kajp0yix7xg2m0qgp83pp046",
"type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/f945939fd679284d736112d3d5410eb867f3b31c.tar.gz",
"url": "https://github.com/nixos/nixpkgs/archive/47b604b07d1e8146d5398b42d3306fdebd343986.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"prybar": {
Expand Down
3 changes: 1 addition & 2 deletions overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
self: super:

let
noOverlay = channelName == "nixpkgs-23.05" || channelName == "nixpkgs-23.11" || channelName == "nixpkgs-unstable";
noOverlay = channelName == "nixpkgs-23.05" || channelName == "nixpkgs-23.11" || channelName == "nixpkgs-24.05" || channelName == "nixpkgs-unstable";
in

if noOverlay then { replitPackages = { }; } else
Expand Down Expand Up @@ -116,4 +116,3 @@ rec {
};
};
}

1 change: 1 addition & 0 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ nix-shell -p niv --run 'niv update nixpkgs-22.05 -b nixos-22.05'
nix-shell -p niv --run 'niv update nixpkgs-22.11 -b nixos-22.11'
nix-shell -p niv --run 'niv update nixpkgs-23.05 -b nixos-23.05'
nix-shell -p niv --run 'niv update nixpkgs-23.11 -b nixos-23.11'
nix-shell -p niv --run 'niv update nixpkgs-24.05 -b nixos-24.05'

0 comments on commit eb18a07

Please sign in to comment.