Skip to content

Commit 0d0c47c

Browse files
committed
Bump nixpkgs pins
1 parent 5cc5467 commit 0d0c47c

File tree

4 files changed

+39
-40
lines changed

4 files changed

+39
-40
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/pkgconf-nixpkgs-map.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2750,12 +2750,12 @@ pkgs:
27502750
"gaminggear-0" = [ "libgaminggear" ];
27512751
"libgbinder" = [ "libgbinder" ];
27522752
"libgcrypt" = [ "libgcrypt" ];
2753-
"libgda-5.0" = [ "libgda" ];
2754-
"libgda-report-5.0" = [ "libgda" ];
2755-
"libgda-sqlcipher-5.0" = [ "libgda" ];
2756-
"libgda-sqlite-5.0" = [ "libgda" ];
2757-
"libgda-ui-5.0" = [ "libgda" ];
2758-
"libgda-xslt-5.0" = [ "libgda" ];
2753+
"libgda-5.0" = [ "libgda5" ];
2754+
"libgda-report-5.0" = [ "libgda5" ];
2755+
"libgda-sqlcipher-5.0" = [ "libgda5" ];
2756+
"libgda-sqlite-5.0" = [ "libgda5" ];
2757+
"libgda-ui-5.0" = [ "libgda5" ];
2758+
"libgda-xslt-5.0" = [ "libgda5" ];
27592759
"libgda-6.0" = [ "libgda6" ];
27602760
"libgda-sqlite-6.0" = [ "libgda6" ];
27612761
"libgdamm-5.0" = [ "libgdamm" ];
@@ -5087,7 +5087,7 @@ pkgs:
50875087
"riscv-disasm" = [ "spike" ];
50885088
"riscv-fesvr" = [ "spike" ];
50895089
"SPIRV-Headers" = [ "spirv-headers" ];
5090-
"LLVMSPIRVLib" = [ "spirv-llvm-translator" ];
5090+
# "LLVMSPIRVLib" = [ "spirv-llvm-translator" ];
50915091
"SPIRV-Tools-shared" = [ "spirv-tools" ];
50925092
"SPIRV-Tools" = [ "spirv-tools" ];
50935093
"sqlcipher" = [ "sqlcipher" ];
@@ -5733,7 +5733,7 @@ pkgs:
57335733
then [ pkgs.gdk_pixbuf ]
57345734
else [];
57355735
# rocm-thunk was replaced by rocmPackages.rocm-thunk in 23.11
5736-
"libhsakmt" = [ pkgs.rocmPackages.rocm-thunk or pkgs.rocm-thunk ];
5736+
# "libhsakmt" = [ pkgs.rocmPackages.rocm-thunk or pkgs.rocm-thunk ];
57375737
} // lib.optionalAttrs (pkgs ? libsigcxx12) {
57385738
# libsigcxx12 was removed in 23.11
57395739
"sigc++-1.2" = [ "libsigcxx12" ];

lib/system-nixpkgs-map.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,3 @@ in
147147
# -- mingw32
148148
// { mingwex = null;
149149
}
150-
# -- os x
151-
# NB: these map almost 1:1 to the framework names
152-
// darwin.apple_sdk.frameworks

overlays/rcodesign.nix

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,33 @@
22
# versions of macOS (one of the tests fails validating signatures
33
# in `/usr/bin`).
44
final: prev: {
5-
rcodesign = prev.rcodesign.override (old: final.lib.optionalAttrs (prev.rcodesign.version == "0.22.0") {
6-
rustPlatform = old.rustPlatform // {
7-
buildRustPackage = args: old.rustPlatform.buildRustPackage (args // {
8-
version = "0.27.0";
5+
rcodesign = if builtins.compareVersions prev.rcodesign.version "0.27" >= 0
6+
then prev.rcodesign
7+
else prev.rcodesign.override (old: final.lib.optionalAttrs (prev.rcodesign.version == "0.22.0") {
8+
rustPlatform = old.rustPlatform // {
9+
buildRustPackage = args: old.rustPlatform.buildRustPackage (args // {
10+
version = "0.27.0";
911

10-
src = final.fetchFromGitHub {
11-
owner = "hamishmack";
12-
repo = "apple-platform-rs";
13-
rev = "hkm/cargo-update";
14-
hash = "sha256-gma2e73m2MDC8BAcIuclG/RPLhAHRLkehCa56f5835g=";
15-
};
12+
src = final.fetchFromGitHub {
13+
owner = "hamishmack";
14+
repo = "apple-platform-rs";
15+
rev = "hkm/cargo-update";
16+
hash = "sha256-gma2e73m2MDC8BAcIuclG/RPLhAHRLkehCa56f5835g=";
17+
};
1618

17-
cargoHash = "sha256-4ra1oBQK/kXZTKvvq17kX2+49iKyXXT484Z6ON4bFbU=";
19+
cargoHash = "sha256-4ra1oBQK/kXZTKvvq17kX2+49iKyXXT484Z6ON4bFbU=";
1820

19-
buildInputs = final.lib.optionals final.stdenv.hostPlatform.isDarwin [
20-
final.darwin.apple_sdk_11_0.frameworks.Security
21-
final.darwin.apple_sdk_11_0.frameworks.SystemConfiguration
22-
];
21+
buildInputs = final.lib.optionals final.stdenv.hostPlatform.isDarwin [
22+
final.darwin.apple_sdk_11_0.frameworks.Security
23+
final.darwin.apple_sdk_11_0.frameworks.SystemConfiguration
24+
];
2325

24-
checkFlags = [
25-
# Does network IO
26-
"--skip=ticket_lookup::test::lookup_ticket"
27-
"--skip=cli_tests"
28-
];
29-
});
30-
};
31-
});
26+
checkFlags = [
27+
# Does network IO
28+
"--skip=ticket_lookup::test::lookup_ticket"
29+
"--skip=cli_tests"
30+
];
31+
});
32+
};
33+
});
3234
}

0 commit comments

Comments
 (0)