Skip to content

Commit 291dd73

Browse files
authored
Merge pull request #1570 from giuseppe/update-nixpkgs-7-oct-2024
nix: update list of packages
2 parents a3fcba9 + 7140aea commit 291dd73

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/cache@v4
1616
with:
1717
path: .cache
18-
key: nix-v1-2.12.0-${{ hashFiles('nix/nixpkgs.json') }}
18+
key: nix-v1-2.24.9-${{ hashFiles('nix/nixpkgs.json') }}
1919

2020
- run: sudo apt-get update
2121

@@ -25,7 +25,7 @@ jobs:
2525
set -ex
2626
sudo mkdir -p .cache
2727
sudo mv .cache /nix
28-
if [[ -z $(ls -A /nix) ]]; then sudo docker run --rm --privileged -v /:/mnt nixos/nix:2.12.0 cp -rfT /nix /mnt/nix; fi
28+
if [[ -z $(ls -A /nix) ]]; then sudo docker run --rm --privileged -v /:/mnt nixos/nix:2.24.9 cp -rfT /nix /mnt/nix; fi
2929
sudo RUNTIME=docker SKIP_CHECKS=1 SKIP_GPG=1 build-aux/release.sh
3030
sudo mv /nix .cache
3131
sudo chown -Rf $(whoami) .cache

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ git-version.h:
239239
fi
240240

241241
nixpkgs:
242-
@nix run -f channel:nixpkgs-unstable nix-prefetch-git -- \
242+
@nix --extra-experimental-features nix-command run -f channel:nixpkgs-unstable nix-prefetch-git -- \
243243
--no-deepClone https://github.com/nixos/nixpkgs > nix/nixpkgs.json
244244

245245
dist-hook:

build-aux/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -xeuo pipefail
55
SKIP_GPG=${SKIP_GPG:-}
66
SKIP_CHECKS=${SKIP_CHECKS:-}
77

8-
NIX_IMAGE=${NIX_IMAGE:-nixos/nix:2.12.0}
8+
NIX_IMAGE=${NIX_IMAGE:-nixos/nix:2.24.9}
99

1010
test -e Makefile && make distclean
1111

nix/derivation.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ with pkgs; stdenv.mkDerivation {
1414
autoreconfHook
1515
autoPatchelfHook
1616
bash
17-
gitMinimal
17+
git
1818
pkg-config
1919
python3
2020
which

nix/nixpkgs.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"url": "https://github.com/nixos/nixpkgs",
3-
"rev": "69b095e77f0a6b6ff498093410fc85d18919d3ad",
4-
"date": "2024-06-24T16:37:24+03:00",
5-
"path": "/nix/store/2bxcxg9rb6xhfnmzkx8lhsy1c6hrvw1m-nixpkgs",
6-
"sha256": "1km3laqpzhs669ml28rskqxy9v8924nvc5h1f1bw42si8j1a5kh4",
7-
"hash": "sha256-BM6igkRRC8JXcAEWti0RCe3kO546I0FrMkbDf7Gio84=",
3+
"rev": "75ed009f22af3b8439d2f426a793f26e5cd4cf77",
4+
"date": "2024-10-07T14:46:56+02:00",
5+
"path": "/nix/store/kdqcyq2g9skx5y5vdh08wg5kfqrdgb0a-nixpkgs",
6+
"sha256": "0vnxh80kbkc5lxdndbxr31pnvi0xj8shyyi8s75c58n3c0nfr6bc",
7+
"hash": "sha256-bJnsLGDDosLK0Sh6DzWSHcRtbxi5r2Zbp4XNNQGC3W4=",
88
"fetchLFS": false,
99
"fetchSubmodules": false,
1010
"deepClone": false,

0 commit comments

Comments
 (0)