nix: Update nixpkgs and static-haskell-nix
This commit is contained in:
monacoremo
committed by
Remo Rechkemmer
Remo Rechkemmer
parent
6fe88ef53c
commit
9568c4605a
@@ -21,16 +21,4 @@
|
||||
# See: https://github.com/NixOS/nixpkgs/pull/87879
|
||||
nixpkgs-openssl-split-runtime-dependencies-of-static-builds =
|
||||
./nixpkgs-openssl-split-runtime-dependencies-of-static-builds.patch;
|
||||
|
||||
# See: https://github.com/NixOS/nixpkgs/issues/104133
|
||||
nixpkgs-gdb-fix-libintl =
|
||||
./nixpkgs-gdb-fix-libintl.patch;
|
||||
|
||||
# Fix how openssl is linked on static builds, see:
|
||||
# https://github.com/nh2/static-haskell-nix/pull/91
|
||||
static-haskell-nix-postgrest-openssl-linking-fix =
|
||||
./static-haskell-nix-postgrest-openssl-linking-fix.patch;
|
||||
|
||||
static-haskell-nix-hasql-notifications-openssl-linking-fix =
|
||||
./static-haskell-nix-hasql-notifications-openssl-linking-fix.patch;
|
||||
}
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 37cafab49907880838f777b068e9634d5206f61f Mon Sep 17 00:00:00 2001
|
||||
From: monacoremo <59358383+monacoremo@users.noreply.github.com>
|
||||
Date: Tue, 22 Dec 2020 14:43:41 +0100
|
||||
Subject: [PATCH] Revert "gdb: 9.2 -> 10.1"
|
||||
|
||||
This reverts commit 6d2cad8a4ed76e42407546bc6b4c717fd9e1a535.
|
||||
---
|
||||
pkgs/development/tools/misc/gdb/default.nix | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
|
||||
index d9bac6e3c83..a4806634432 100644
|
||||
--- a/pkgs/development/tools/misc/gdb/default.nix
|
||||
+++ b/pkgs/development/tools/misc/gdb/default.nix
|
||||
@@ -26,11 +26,11 @@ assert pythonSupport -> python3 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = targetPrefix + basename;
|
||||
- version = "10.1";
|
||||
+ version = "9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gdb/${basename}-${version}.tar.xz";
|
||||
- sha256 = "1h32dckz1y8fnyxh22iyw8h3hnhxr79v1ng85px3ljn1xv71wbzq";
|
||||
+ sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n";
|
||||
};
|
||||
|
||||
postPatch = if stdenv.isDarwin then ''
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -1,18 +1,8 @@
|
||||
From 2aabdaca408d22ce2b6aa078ba58a115f5bd7fe4 Mon Sep 17 00:00:00 2001
|
||||
From: Remo <remo>
|
||||
Date: Fri, 15 May 2020 10:13:43 +0200
|
||||
Subject: [PATCH] openssl: split runtime dependencies of static builds into a
|
||||
separate output
|
||||
|
||||
---
|
||||
.../development/libraries/openssl/default.nix | 38 ++++++++++++++++---
|
||||
1 file changed, 32 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
|
||||
index 43170f25d38..6336a060911 100644
|
||||
index d4be8cc2428..3979698711f 100644
|
||||
--- a/pkgs/development/libraries/openssl/default.nix
|
||||
+++ b/pkgs/development/libraries/openssl/default.nix
|
||||
@@ -34,9 +34,22 @@ let
|
||||
@@ -50,9 +50,21 @@ let
|
||||
substituteInPlace crypto/async/arch/async_posix.h \
|
||||
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
|
||||
'!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
|
||||
@@ -28,15 +18,14 @@ index 43170f25d38..6336a060911 100644
|
||||
'';
|
||||
|
||||
- outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
|
||||
+ outputs =
|
||||
+ [ "bin" "dev" "out" "man" ]
|
||||
+ outputs = [ "bin" "dev" "out" "man" ]
|
||||
+ ++ optional withDocs "doc"
|
||||
+ # Separate output for the runtime dependencies of the static build.
|
||||
+ ++ optional static "etc";
|
||||
setOutputFlags = false;
|
||||
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
|
||||
|
||||
@@ -72,7 +85,17 @@ let
|
||||
separateDebugInfo =
|
||||
!stdenv.hostPlatform.isDarwin &&
|
||||
@@ -101,7 +113,17 @@ let
|
||||
configureFlags = [
|
||||
"shared" # "shared" builds both shared and static libraries
|
||||
"--libdir=lib"
|
||||
@@ -52,19 +41,20 @@ index 43170f25d38..6336a060911 100644
|
||||
+ # prepended to it otherwise.
|
||||
+ "--openssldir=/.$(etc)/etc/ssl"
|
||||
+ )
|
||||
] ++ stdenv.lib.optionals withCryptodev [
|
||||
] ++ lib.optionals withCryptodev [
|
||||
"-DHAVE_CRYPTODEV"
|
||||
"-DUSE_CRYPTODEV_DIGESTS"
|
||||
@@ -103,6 +126,8 @@ let
|
||||
@@ -131,6 +153,9 @@ let
|
||||
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
|
||||
rm "$out/lib/"*.a
|
||||
fi
|
||||
|
||||
+
|
||||
+ # 'etc' is a separate output on static builds only.
|
||||
+ etc=$out
|
||||
'' +
|
||||
''
|
||||
mkdir -p $bin
|
||||
@@ -117,14 +142,15 @@ let
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.isWindows)
|
||||
# Fix bin/c_rehash's perl interpreter line
|
||||
#
|
||||
@@ -152,14 +177,15 @@ let
|
||||
mv $out/include $dev/
|
||||
|
||||
# remove dependency on Perl at runtime
|
||||
@@ -75,7 +65,7 @@ index 43170f25d38..6336a060911 100644
|
||||
+ rmdir $etc/etc/ssl/{certs,private}
|
||||
'';
|
||||
|
||||
postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
- # Check to make sure the main output doesn't depend on perl
|
||||
- if grep -r '${buildPackages.perl}' $out; then
|
||||
+ # Check to make sure the main output and the static runtime dependencies
|
||||
@@ -84,6 +74,3 @@ index 43170f25d38..6336a060911 100644
|
||||
echo "Found an erroneous dependency on perl ^^^" >&2
|
||||
exit 1
|
||||
fi
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From 49ecb703d9d0bfd38eb69ba5cb63a8262bd03f96 Mon Sep 17 00:00:00 2001
|
||||
From: steve-chavez <stevechavezast@gmail.com>
|
||||
Date: Thu, 11 Jun 2020 13:18:07 -0500
|
||||
Subject: [PATCH] Add hasql-notifications openssl linking fix
|
||||
|
||||
---
|
||||
survey/default.nix | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/survey/default.nix b/survey/default.nix
|
||||
index 828beaa..9c2d5f6 100644
|
||||
--- a/survey/default.nix
|
||||
+++ b/survey/default.nix
|
||||
@@ -1054,6 +1054,11 @@ let
|
||||
super.squeal-postgresql
|
||||
[ final.openssl ]
|
||||
"--libs openssl";
|
||||
+ hasql-notifications =
|
||||
+ addStaticLinkerFlagsWithPkgconfig
|
||||
+ super.hasql-notifications
|
||||
+ [ final.openssl ]
|
||||
+ "--libs openssl";
|
||||
|
||||
xml-to-json =
|
||||
addStaticLinkerFlagsWithPkgconfig
|
||||
--
|
||||
2.19.3
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From bb4c1e27e391eff01591fe60830ff68a9ada41ef Mon Sep 17 00:00:00 2001
|
||||
From: Remo <remo>
|
||||
Date: Wed, 22 Apr 2020 11:58:07 +0200
|
||||
Subject: [PATCH] Add postgrest libpq linking fix
|
||||
|
||||
---
|
||||
survey/default.nix | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/survey/default.nix b/survey/default.nix
|
||||
index b28606c..fd7cde7 100644
|
||||
--- a/survey/default.nix
|
||||
+++ b/survey/default.nix
|
||||
@@ -1052,6 +1052,11 @@ let
|
||||
super.squeal-postgresql
|
||||
[ final.openssl ]
|
||||
"--libs openssl";
|
||||
+ postgrest =
|
||||
+ addStaticLinkerFlagsWithPkgconfig
|
||||
+ super.postgrest
|
||||
+ [ final.openssl ]
|
||||
+ "--libs openssl";
|
||||
|
||||
xml-to-json =
|
||||
addStaticLinkerFlagsWithPkgconfig
|
||||
Reference in New Issue
Block a user