nix: bump nixpkgs version
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@ let
|
|||||||
"postgrest";
|
"postgrest";
|
||||||
|
|
||||||
compiler =
|
compiler =
|
||||||
"ghc922";
|
"ghc923";
|
||||||
|
|
||||||
# PostgREST source files, filtered based on the rules in the .gitignore files
|
# PostgREST source files, filtered based on the rules in the .gitignore files
|
||||||
# and file extensions. We want to include as litte as possible, as the files
|
# and file extensions. We want to include as litte as possible, as the files
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Pinned version of Nixpkgs, generated with postgrest-nixpkgs-upgrade.
|
# Pinned version of Nixpkgs, generated with postgrest-nixpkgs-upgrade.
|
||||||
{
|
{
|
||||||
date = "2022-03-30";
|
date = "2022-07-14";
|
||||||
rev = "9a5aa75d56ad4163521f1692469e6dc54b90068c";
|
rev = "8eb14e7e79d6c34a9cce146182bfc8c820d527c2";
|
||||||
tarballHash = "1f3wyldcx1zpyk2q6122mkg16chf9j7swwx1v6f1dg126xz1238f";
|
tarballHash = "063g7vyyyfhacsi3272k76cq5b03xgl6dza9xzx5g62x6qyzn2i5";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,64 +31,6 @@ let
|
|||||||
#
|
#
|
||||||
# To get the sha256:
|
# To get the sha256:
|
||||||
# nix-prefetch-url --unpack https://github.com/<owner>/<repo>/archive/<commit>.tar.gz
|
# nix-prefetch-url --unpack https://github.com/<owner>/<repo>/archive/<commit>.tar.gz
|
||||||
|
|
||||||
protolude =
|
|
||||||
prev.callHackageDirect
|
|
||||||
{
|
|
||||||
pkg = "protolude";
|
|
||||||
ver = "0.3.1";
|
|
||||||
sha256 = "0gf0mn1ycllr69kdq1p07qf7935s10jz0nnhynwqy3d6nmycxr5j";
|
|
||||||
}
|
|
||||||
{ };
|
|
||||||
|
|
||||||
configurator-pg =
|
|
||||||
prev.callHackageDirect
|
|
||||||
{
|
|
||||||
pkg = "configurator-pg";
|
|
||||||
ver = "0.2.6";
|
|
||||||
sha256 = "sha256-nkamTOpP/w0vQfOXsoQKEstW3n9qyRsv0TocrEerKlU=";
|
|
||||||
}
|
|
||||||
{ };
|
|
||||||
|
|
||||||
hasql-dynamic-statements =
|
|
||||||
lib.dontCheck (prev.callHackageDirect
|
|
||||||
{
|
|
||||||
pkg = "hasql-dynamic-statements";
|
|
||||||
ver = "0.3.1.1";
|
|
||||||
sha256 = "sha256-jF50GcCtEUV3TN1UsD4LaSBH6arcqfKhxOk+b+c8Bl8=";
|
|
||||||
}
|
|
||||||
{ });
|
|
||||||
|
|
||||||
hasql-implicits =
|
|
||||||
lib.dontCheck (prev.callHackageDirect
|
|
||||||
{
|
|
||||||
pkg = "hasql-implicits";
|
|
||||||
ver = "0.1.0.3";
|
|
||||||
sha256 = "sha256-IpAOVHNdXJ53B/fmo+DeNUKiBSS6Bo7Uha/krpMt64g=";
|
|
||||||
}
|
|
||||||
{ });
|
|
||||||
|
|
||||||
hspec-wai-json =
|
|
||||||
lib.dontCheck (lib.unmarkBroken prev.hspec-wai-json);
|
|
||||||
|
|
||||||
ptr =
|
|
||||||
prev.callHackageDirect
|
|
||||||
{
|
|
||||||
pkg = "ptr";
|
|
||||||
ver = "0.16.8.2";
|
|
||||||
sha256 = "sha256-Ei2GeQ0AjoxvsvmWbdPELPLtSaowoaj9IzsIiySgkAQ=";
|
|
||||||
}
|
|
||||||
{ };
|
|
||||||
|
|
||||||
weeder =
|
|
||||||
lib.dontCheck (prev.callHackageDirect
|
|
||||||
{
|
|
||||||
pkg = "weeder";
|
|
||||||
ver = "2.4.0";
|
|
||||||
sha256 = "sha256-Nhp8EogHJ5SIr67060TPEvQbN/ECg3cRJFQnUtJUyC0=";
|
|
||||||
}
|
|
||||||
{ });
|
|
||||||
|
|
||||||
} // extraOverrides final prev;
|
} // extraOverrides final prev;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
|
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
|
||||||
index d4be8cc2428..3979698711f 100644
|
index db6e0101fec..108527df50c 100644
|
||||||
--- a/pkgs/development/libraries/openssl/default.nix
|
--- a/pkgs/development/libraries/openssl/default.nix
|
||||||
+++ b/pkgs/development/libraries/openssl/default.nix
|
+++ b/pkgs/development/libraries/openssl/default.nix
|
||||||
@@ -43,9 +43,21 @@ let
|
@@ -44,9 +44,21 @@ let
|
||||||
substituteInPlace crypto/async/arch/async_posix.h \
|
substituteInPlace crypto/async/arch/async_posix.h \
|
||||||
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
|
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
|
||||||
'!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
|
'!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
|
||||||
@@ -25,7 +25,7 @@ index d4be8cc2428..3979698711f 100644
|
|||||||
setOutputFlags = false;
|
setOutputFlags = false;
|
||||||
separateDebugInfo =
|
separateDebugInfo =
|
||||||
!stdenv.hostPlatform.isDarwin &&
|
!stdenv.hostPlatform.isDarwin &&
|
||||||
@@ -95,7 +107,17 @@ let
|
@@ -102,7 +114,17 @@ let
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"shared" # "shared" builds both shared and static libraries
|
"shared" # "shared" builds both shared and static libraries
|
||||||
"--libdir=lib"
|
"--libdir=lib"
|
||||||
@@ -44,17 +44,17 @@ index d4be8cc2428..3979698711f 100644
|
|||||||
] ++ lib.optionals withCryptodev [
|
] ++ lib.optionals withCryptodev [
|
||||||
"-DHAVE_CRYPTODEV"
|
"-DHAVE_CRYPTODEV"
|
||||||
"-DUSE_CRYPTODEV_DIGESTS"
|
"-DUSE_CRYPTODEV_DIGESTS"
|
||||||
@@ -126,6 +148,9 @@ let
|
@@ -140,6 +162,9 @@ let
|
||||||
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
|
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
|
||||||
rm "$out/lib/"*.a
|
rm "$out/lib/"*.a
|
||||||
fi
|
fi
|
||||||
+
|
+
|
||||||
+ # 'etc' is a separate output on static builds only.
|
+ # 'etc' is a separate output on static builds only.
|
||||||
+ etc=$out
|
+ etc=$out
|
||||||
'' + lib.optionalString (!stdenv.hostPlatform.isWindows)
|
'') + lib.optionalString (!stdenv.hostPlatform.isWindows)
|
||||||
# Fix bin/c_rehash's perl interpreter line
|
# Fix bin/c_rehash's perl interpreter line
|
||||||
#
|
#
|
||||||
@@ -147,14 +172,15 @@ let
|
@@ -161,14 +186,15 @@ let
|
||||||
mv $out/include $dev/
|
mv $out/include $dev/
|
||||||
|
|
||||||
# remove dependency on Perl at runtime
|
# remove dependency on Perl at runtime
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ let
|
|||||||
defaultCabalPackageVersionComingWithGhc =
|
defaultCabalPackageVersionComingWithGhc =
|
||||||
{
|
{
|
||||||
ghc8107 = "Cabal_3_2_1_0";
|
ghc8107 = "Cabal_3_2_1_0";
|
||||||
ghc922 = "Cabal_3_6_3_0";
|
ghc923 = "Cabal_3_6_3_0";
|
||||||
}."${compiler}";
|
}."${compiler}";
|
||||||
|
|
||||||
# The static-haskell-nix 'survey' derives a full static set of Haskell
|
# The static-haskell-nix 'survey' derives a full static set of Haskell
|
||||||
|
|||||||
Reference in New Issue
Block a user