Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: de4f6d153029
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e36df1524ed8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 7, 2019

  1. nspr: make reproducible

    @grahamc
    grahamc committed Mar 7, 2019
    Copy the full SHA
    885d1df View commit details

  2. Merge pull request #57021 from grahamc/nspr-repro 

    nspr: make reproducible
    @grahamc
    grahamc authored Mar 7, 2019
    Copy the full SHA
    e36df15 View commit details
84 changes: 84 additions & 0 deletions .../development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 7 Mar 2019 08:11:32 -0500
Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility

---
nspr/lib/ds/Makefile.in | 4 ++--
nspr/lib/libc/src/Makefile.in | 4 ++--
nspr/lib/prstreams/Makefile.in | 4 ++--
nspr/pr/src/Makefile.in | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in
index e737791..d56b0a7 100644
--- a/nspr/lib/ds/Makefile.in
+++ b/nspr/lib/ds/Makefile.in
@@ -101,8 +101,8 @@ ECHO = echo
TINC = $(OBJDIR)/_pl_bld.h
PROD = $(notdir $(SHARED_LIBRARY))
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000

ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
SUF = i64
diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in
index e8a6d9f..0485737 100644
--- a/nspr/lib/libc/src/Makefile.in
+++ b/nspr/lib/libc/src/Makefile.in
@@ -103,8 +103,8 @@ ECHO = echo
TINC = $(OBJDIR)/_pl_bld.h
PROD = $(notdir $(SHARED_LIBRARY))
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000

ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
SUF = i64
diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in
index aeb2944..83ae423 100644
--- a/nspr/lib/prstreams/Makefile.in
+++ b/nspr/lib/prstreams/Makefile.in
@@ -105,8 +105,8 @@ ECHO = echo
TINC = $(OBJDIR)/_pl_bld.h
PROD = $(notdir $(SHARED_LIBRARY))
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000

ifeq ($(OS_ARCH), WINNT)
SUF = i64
diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
index 19c5a69..989cc8c 100644
--- a/nspr/pr/src/Makefile.in
+++ b/nspr/pr/src/Makefile.in
@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE)
endif
#
# In Solaris 2.6 or earlier, -lrt is called -lposix4.
-#
+#
LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE)))
ifeq (5.7, $(LIBRT_TEST))
LIBRT=-lrt
@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY))
endif

NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000

ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
SUF = i64
--
2.19.2

4 changes: 4 additions & 0 deletions pkgs/development/libraries/nspr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@ stdenv.mkDerivation {
sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c";
};

patches = [
./0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
];

outputs = [ "out" "dev" ];
outputBin = "dev";