Skip to content

Commit 5b5f069

Browse files
tools: bump nixpkgs-unstable pin to e38213b91d3786389a446dfce4ff5a8aaf6
PR-URL: #62052 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 724ef8e commit 5b5f069

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ let
7272
]) (builtins.attrNames sharedLibDeps);
7373
in
7474
pkgs.mkShell {
75-
inherit (pkgs.nodejs_latest) nativeBuildInputs;
75+
inherit (pkgs.nodejs-slim_latest) nativeBuildInputs;
7676

7777
buildInputs =
7878
buildInputs

tools/nix/pkgs.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
arg:
22
let
33
repo = "https://github.com/NixOS/nixpkgs";
4-
rev = "d1c15b7d5806069da59e819999d70e1cec0760bf";
4+
rev = "e38213b91d3786389a446dfce4ff5a8aaf6012f2";
55
nixpkgs = import (builtins.fetchTarball {
66
url = "${repo}/archive/${rev}.tar.gz";
7-
sha256 = "08f0iv9rn4d9ha35kblqpkrgbbnfby87bj8fx1839l3r4grqdnvg";
7+
sha256 = "0nrbkm95nl6y96l0f95hraapp7zx10c01b8m95zj8056z57dlv65";
88
}) arg;
99
in
1010
nixpkgs

tools/nix/sharedLibDeps.nix

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,9 @@
4949
// (pkgs.lib.optionalAttrs withSSL (
5050
let
5151
version = "3.5.5";
52-
opensslSrc = "/pkgs/development/libraries/openssl/";
53-
inherit
54-
(pkgs.callPackage "${
55-
pkgs.fetchgit {
56-
url = "https://github.com/NixOS/nixpkgs.git";
57-
rev = "a5b50d31e0fd60227495ad2b2760cbda3581ec77";
58-
sparseCheckout = [ opensslSrc ];
59-
nonConeMode = true;
60-
hash = "sha256-Qo3IoUeccGO2GxFSYufyYjZmN5LGSek0z82pN73YXic=";
61-
}
62-
}${opensslSrc}" { })
63-
openssl_3_6
64-
;
6552
in
6653
{
67-
openssl = openssl_3_6.overrideAttrs (old: {
54+
openssl = pkgs.openssl_3_6.overrideAttrs (old: {
6855
inherit version;
6956
src = pkgs.fetchurl {
7057
url = builtins.replaceStrings [ old.version ] [ version ] old.src.url;

0 commit comments

Comments
 (0)