Skip to content

Commit febca08

Browse files
committed
Add newer nixpkgs pin for vulnix patch
1 parent 518fb30 commit febca08

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

.last-exported-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Last exported commit from parent repo: 3aa35de923d0330fdea828dbf7b636f09a8e8832
1+
Last exported commit from parent repo: e9a0e98cdd842807458a0447c1cfb64e52f1f270

flake.lock

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

flake.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
description = "Development infrastructure for nix-bootstrap";
1616
inputs = {
1717
nixpkgs-src.url = "nixpkgs/25.05";
18+
nixpkgs-src-vulnix.url = "nixpkgs/33d83ff29f05f9b2e30cd05b2f60b02a1fbe8a46";
1819
pre-commit-hooks-lib = {
1920
inputs.nixpkgs.follows = "nixpkgs-src";
2021
url = "github:cachix/pre-commit-hooks.nix";
@@ -24,6 +25,7 @@
2425
outputs = {
2526
self,
2627
nixpkgs-src,
28+
nixpkgs-src-vulnix,
2729
pre-commit-hooks-lib,
2830
...
2931
}: let
@@ -34,6 +36,7 @@
3436
systemsHelpers.forEachSystem supportedSystems (
3537
system: let
3638
nixpkgs = nixpkgs-src.legacyPackages.${system};
39+
nixpkgs-vulnix = nixpkgs-src-vulnix.legacyPackages.${system};
3740
inherit
3841
(import nix/haskell-env.nix {inherit nixpkgs;})
3942
baseHaskellPackages
@@ -47,7 +50,8 @@
4750
'';
4851
pre-commit-hooks = import nix/pre-commit-hooks.nix {
4952
inherit nixpkgs pre-commit-hooks-lib system;
50-
inherit (nixpkgs) alejandra vulnix;
53+
inherit (nixpkgs) alejandra;
54+
inherit (nixpkgs-vulnix) vulnix;
5155
src = ./.;
5256
};
5357
extraDevShellArgs = {
@@ -79,7 +83,7 @@
7983
inherit nix-bootstrap;
8084
# To be used as tools in CI
8185
ciPackages_buildBinaryCache = buildBinaryCache;
82-
ciPackages_vulnix = nixpkgs.vulnix;
86+
ciPackages_vulnix = nixpkgs-vulnix.vulnix;
8387
};
8488
}
8589
);

vulnerability-whitelist.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ comment = "One vuln is a DOS; n-b is inherently not vulnerable. The others would
2020
cve = ["CVE-2023-4039"]
2121
comment = "Reasonable worst-case is loss of availability; risk acceptable."
2222

23+
["glibc"]
24+
cve = ["CVE-2025-5702", "CVE-2025-5745"]
25+
comment = "Reasonable worst-case is loss of availability; risk acceptable."
26+
2327
["zlib-1.3.1"]
2428
cve = ["CVE-2023-6992"]
2529
comment = "We do not call the affected code with untrusted data."

0 commit comments

Comments
 (0)