Merge pull request #1570 from giuseppe/update-nixpkgs-7-oct-2024

nix: update list of packages
containers · Oct 9, 2024 · 291dd73 · 291dd73
2 parents a3fcba9 + 7140aea
commit 291dd73
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -15,7 +15,7 @@ jobs:
  - uses: actions/cache@v4
  with:
  path: .cache
- key: nix-v1-2.12.0-${{ hashFiles('nix/nixpkgs.json') }}
+ key: nix-v1-2.24.9-${{ hashFiles('nix/nixpkgs.json') }}
 
  - run: sudo apt-get update
 
@@ -25,7 +25,7 @@ jobs:
  set -ex
  sudo mkdir -p .cache
  sudo mv .cache /nix
- if [[ -z $(ls -A /nix) ]]; then sudo docker run --rm --privileged -v /:/mnt nixos/nix:2.12.0 cp -rfT /nix /mnt/nix; fi
+ if [[ -z $(ls -A /nix) ]]; then sudo docker run --rm --privileged -v /:/mnt nixos/nix:2.24.9 cp -rfT /nix /mnt/nix; fi
  sudo RUNTIME=docker SKIP_CHECKS=1 SKIP_GPG=1 build-aux/release.sh
  sudo mv /nix .cache
  sudo chown -Rf $(whoami) .cache

diff --git a/Makefile.am b/Makefile.am
@@ -239,7 +239,7 @@ git-version.h:
  fi
 
 nixpkgs:
- @nix run -f channel:nixpkgs-unstable nix-prefetch-git -- \
+ @nix --extra-experimental-features nix-command run -f channel:nixpkgs-unstable nix-prefetch-git -- \
  --no-deepClone https://github.com/nixos/nixpkgs > nix/nixpkgs.json
 
 dist-hook:

diff --git a/build-aux/release.sh b/build-aux/release.sh
@@ -5,7 +5,7 @@ set -xeuo pipefail
 SKIP_GPG=${SKIP_GPG:-}
 SKIP_CHECKS=${SKIP_CHECKS:-}
 
-NIX_IMAGE=${NIX_IMAGE:-nixos/nix:2.12.0}
+NIX_IMAGE=${NIX_IMAGE:-nixos/nix:2.24.9}
 
 test -e Makefile && make distclean
 

diff --git a/nix/derivation.nix b/nix/derivation.nix
@@ -14,7 +14,7 @@ with pkgs; stdenv.mkDerivation {
  autoreconfHook
  autoPatchelfHook
  bash
- gitMinimal
+ git
  pkg-config
  python3
  which

diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json
@@ -1,10 +1,10 @@
 {
  "url": "https://github.com/nixos/nixpkgs",
- "rev": "69b095e77f0a6b6ff498093410fc85d18919d3ad",
- "date": "2024-06-24T16:37:24+03:00",
- "path": "/nix/store/2bxcxg9rb6xhfnmzkx8lhsy1c6hrvw1m-nixpkgs",
- "sha256": "1km3laqpzhs669ml28rskqxy9v8924nvc5h1f1bw42si8j1a5kh4",
- "hash": "sha256-BM6igkRRC8JXcAEWti0RCe3kO546I0FrMkbDf7Gio84=",
+ "rev": "75ed009f22af3b8439d2f426a793f26e5cd4cf77",
+ "date": "2024-10-07T14:46:56+02:00",
+ "path": "/nix/store/kdqcyq2g9skx5y5vdh08wg5kfqrdgb0a-nixpkgs",
+ "sha256": "0vnxh80kbkc5lxdndbxr31pnvi0xj8shyyi8s75c58n3c0nfr6bc",
+ "hash": "sha256-bJnsLGDDosLK0Sh6DzWSHcRtbxi5r2Zbp4XNNQGC3W4=",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,