diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index aceff3a..0dc2fba 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -52,6 +52,7 @@ blocks: - nixpkgs-22.11 - nixpkgs-23.05 - nixpkgs-23.11 + - nixpkgs-24.05 - nixpkgs-unstable commands: - mkdir /tmp/$NIXPKGS_CHANNEL @@ -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 diff --git a/build.sh b/build.sh index 5a5731b..fef7bdb 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -default=nixpkgs-23.11 +default=nixpkgs-24.05 channel=$default function error() { diff --git a/default.nix b/default.nix index 711f1e3..7211661 100644 --- a/default.nix +++ b/default.nix @@ -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 ? { } diff --git a/hydra/release-24.05.nix b/hydra/release-24.05.nix new file mode 100644 index 0000000..99407ee --- /dev/null +++ b/hydra/release-24.05.nix @@ -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; +} diff --git a/nix/sources.json b/nix/sources.json index 45faebd..bbf025b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -71,6 +71,18 @@ "url": "https://github.com/nixos/nixpkgs/archive/b2cf36f43f9ef2ded5711b30b1f393ac423d8f72.tar.gz", "url_template": "https://github.com///archive/.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///archive/.tar.gz" + }, "nixpkgs-legacy": { "description": "Nix Packages collection", "homepage": "", @@ -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///archive/.tar.gz" }, "prybar": { diff --git a/overlay.nix b/overlay.nix index 62eb630..ea8e3e8 100644 --- a/overlay.nix +++ b/overlay.nix @@ -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 @@ -116,4 +116,3 @@ rec { }; }; } - diff --git a/update.sh b/update.sh index 05d2655..0a689b8 100755 --- a/update.sh +++ b/update.sh @@ -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'