[packages/nix] - up to 2.3.15

qboosh qboosh at pld-linux.org
Sat Aug 21 20:06:23 CEST 2021


commit 76c7825814925be8c8d03e4b69acaa305b958e5a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Aug 21 20:10:43 2021 +0200

    - up to 2.3.15

 nix-sh.patch | 8 +++++---
 nix.spec     | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/nix.spec b/nix.spec
index 907a0e0..c4f6e32 100644
--- a/nix.spec
+++ b/nix.spec
@@ -5,13 +5,13 @@
 Summary:	A purely functional package manager
 Summary(pl.UTF-8):	Czysto funkcyjny zarządca pakietów
 Name:		nix
-Version:	2.3.10
+Version:	2.3.15
 Release:	0.1
 License:	LGPL v2.1+
 Group:		Applications/System
 #Source0Download: https://nixos.org/download.html
 Source0:	https://nixos.org/releases/nix/%{name}-%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	116a603858b2a31f847033cdb4f40249
+# Source0-md5:	d5b5036347c4c1c7ddc738606703aee9
 Patch0:		%{name}-sh.patch
 Patch1:		%{name}-paths.patch
 Patch2:		%{name}-ldflags.patch
diff --git a/nix-sh.patch b/nix-sh.patch
index ca458ac..5ff1bad 100644
--- a/nix-sh.patch
+++ b/nix-sh.patch
@@ -1,15 +1,17 @@
---- nix-2.3.4/configure.ac.orig	1970-01-01 01:00:01.000000000 +0100
-+++ nix-2.3.4/configure.ac	2020-04-21 12:04:21.564576870 +0200
-@@ -235,9 +235,9 @@
+--- nix-2.3.15/configure.ac.orig	2021-08-21 19:53:43.033960617 +0200
++++ nix-2.3.15/configure.ac	2021-08-21 19:57:30.176063416 +0200
+@@ -259,10 +259,10 @@ AC_SUBST(ENABLE_S3, [$enable_s3])
  AC_LANG_POP(C++)
  
  if test -n "$enable_s3"; then
 -  declare -a aws_version_tokens=($(printf '#include <aws/core/VersionConfig.h>\nAWS_SDK_VERSION_STRING' | $CPP $CPPFLAGS - | grep -v '^#.*' | sed 's/"//g' | tr '.' ' '))
 -  AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], ${aws_version_tokens@<:@0@:>@}, [Major version of aws-sdk-cpp.])
 -  AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], ${aws_version_tokens@<:@1@:>@}, [Minor version of aws-sdk-cpp.])
+-  AC_DEFINE_UNQUOTED([AWS_VERSION_PATCH], ${aws_version_tokens@<:@2@:>@}, [Patch version of aws-sdk-cpp.])
 +  aws_version="$(printf '#include <aws/core/VersionConfig.h>\nAWS_SDK_VERSION_STRING' | $CPP $CPPFLAGS - | grep -v '^#.*' | sed 's/"//g')"
 +  AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], $(echo "$aws_version" | cut -d. -f1), [Major version of aws-sdk-cpp.])
 +  AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], $(echo "$aws_version" | cut -d. -f2), [Minor version of aws-sdk-cpp.])
++  AC_DEFINE_UNQUOTED([AWS_VERSION_PATCH], $(echo "$aws_version" | cut -d. -f3), [Patch version of aws-sdk-cpp.])
  fi
  
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nix.git/commitdiff/76c7825814925be8c8d03e4b69acaa305b958e5a



More information about the pld-cvs-commit mailing list