Skip to content

Bump nixpkgs pins #2354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump nixpkgs pins #2354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d0c47c
Bump nixpkgs pins
hamishmack May 9, 2025
12c3845
Unpin nodejs
hamishmack May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/check.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ in stdenv.mkDerivation ((

nativeBuildInputs = drv.nativeBuildInputs
++ [buildPackages.xorg.lndir]
++ lib.optional (stdenv.hostPlatform.isGhcjs) buildPackages.nodejs-18_x;
++ lib.optional (stdenv.hostPlatform.isGhcjs) buildPackages.nodejs;

inherit (component) doCheck doCrossCheck;

Expand Down
16 changes: 8 additions & 8 deletions lib/pkgconf-nixpkgs-map.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2750,12 +2750,12 @@ pkgs:
"gaminggear-0" = [ "libgaminggear" ];
"libgbinder" = [ "libgbinder" ];
"libgcrypt" = [ "libgcrypt" ];
"libgda-5.0" = [ "libgda" ];
"libgda-report-5.0" = [ "libgda" ];
"libgda-sqlcipher-5.0" = [ "libgda" ];
"libgda-sqlite-5.0" = [ "libgda" ];
"libgda-ui-5.0" = [ "libgda" ];
"libgda-xslt-5.0" = [ "libgda" ];
"libgda-5.0" = [ "libgda5" ];
"libgda-report-5.0" = [ "libgda5" ];
"libgda-sqlcipher-5.0" = [ "libgda5" ];
"libgda-sqlite-5.0" = [ "libgda5" ];
"libgda-ui-5.0" = [ "libgda5" ];
"libgda-xslt-5.0" = [ "libgda5" ];
"libgda-6.0" = [ "libgda6" ];
"libgda-sqlite-6.0" = [ "libgda6" ];
"libgdamm-5.0" = [ "libgdamm" ];
Expand Down Expand Up @@ -5087,7 +5087,7 @@ pkgs:
"riscv-disasm" = [ "spike" ];
"riscv-fesvr" = [ "spike" ];
"SPIRV-Headers" = [ "spirv-headers" ];
"LLVMSPIRVLib" = [ "spirv-llvm-translator" ];
# "LLVMSPIRVLib" = [ "spirv-llvm-translator" ];
"SPIRV-Tools-shared" = [ "spirv-tools" ];
"SPIRV-Tools" = [ "spirv-tools" ];
"sqlcipher" = [ "sqlcipher" ];
Expand Down Expand Up @@ -5733,7 +5733,7 @@ pkgs:
then [ pkgs.gdk_pixbuf ]
else [];
# rocm-thunk was replaced by rocmPackages.rocm-thunk in 23.11
"libhsakmt" = [ pkgs.rocmPackages.rocm-thunk or pkgs.rocm-thunk ];
# "libhsakmt" = [ pkgs.rocmPackages.rocm-thunk or pkgs.rocm-thunk ];
} // lib.optionalAttrs (pkgs ? libsigcxx12) {
# libsigcxx12 was removed in 23.11
"sigc++-1.2" = [ "libsigcxx12" ];
Expand Down
3 changes: 0 additions & 3 deletions lib/system-nixpkgs-map.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,3 @@ in
# -- mingw32
// { mingwex = null;
}
# -- os x
# NB: these map almost 1:1 to the framework names
// darwin.apple_sdk.frameworks
48 changes: 25 additions & 23 deletions overlays/rcodesign.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,33 @@
# versions of macOS (one of the tests fails validating signatures
# in `/usr/bin`).
final: prev: {
rcodesign = prev.rcodesign.override (old: final.lib.optionalAttrs (prev.rcodesign.version == "0.22.0") {
rustPlatform = old.rustPlatform // {
buildRustPackage = args: old.rustPlatform.buildRustPackage (args // {
version = "0.27.0";
rcodesign = if builtins.compareVersions prev.rcodesign.version "0.27" >= 0
then prev.rcodesign
else prev.rcodesign.override (old: final.lib.optionalAttrs (prev.rcodesign.version == "0.22.0") {
rustPlatform = old.rustPlatform // {
buildRustPackage = args: old.rustPlatform.buildRustPackage (args // {
version = "0.27.0";

src = final.fetchFromGitHub {
owner = "hamishmack";
repo = "apple-platform-rs";
rev = "hkm/cargo-update";
hash = "sha256-gma2e73m2MDC8BAcIuclG/RPLhAHRLkehCa56f5835g=";
};
src = final.fetchFromGitHub {
owner = "hamishmack";
repo = "apple-platform-rs";
rev = "hkm/cargo-update";
hash = "sha256-gma2e73m2MDC8BAcIuclG/RPLhAHRLkehCa56f5835g=";
};

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

buildInputs = final.lib.optionals final.stdenv.hostPlatform.isDarwin [
final.darwin.apple_sdk_11_0.frameworks.Security
final.darwin.apple_sdk_11_0.frameworks.SystemConfiguration
];
buildInputs = final.lib.optionals final.stdenv.hostPlatform.isDarwin [
final.darwin.apple_sdk_11_0.frameworks.Security
final.darwin.apple_sdk_11_0.frameworks.SystemConfiguration
];

checkFlags = [
# Does network IO
"--skip=ticket_lookup::test::lookup_ticket"
"--skip=cli_tests"
];
});
};
});
checkFlags = [
# Does network IO
"--skip=ticket_lookup::test::lookup_ticket"
"--skip=cli_tests"
];
});
};
});
}
Loading