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: df48cb7aa298
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: edd5babb31ef
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 20, 2016

  1. multipath-tools: ensure gzip does not capture timestamp 

    gzip is originally called as 'gzip -9 -c'

This is a port of
a8e7ddd

Note that it does not seem to make a difference to `nix-build --check`.
    @joachifm
    joachifm committed Dec 20, 2016

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 7544761007FE4E08
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6758d15 View commit details

  2. zerotierone: gzip -9 -> gzip -9n 

    Note that it does not seem to make a difference to `nix-build --check`.
    @joachifm
    joachifm committed Dec 20, 2016

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 7544761007FE4E08
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8246a84 View commit details

  3. stun: gzip -9 -> gzip -9n 

    Note that it does not seem to make a difference to `nix-build --check`.
    @joachifm
    joachifm committed Dec 20, 2016

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 7544761007FE4E08
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a34eae0 View commit details

  4. Merge pull request #21306 from joachifm/gzip-9n 

    Remove uses of gzip that might capture build time
    @edolstra
    edolstra authored Dec 20, 2016
    Copy the full SHA
    edd5bab View commit details
Showing with 5 additions and 3 deletions.
  1. +2 −0 pkgs/os-specific/linux/multipath-tools/default.nix
  2. +2 −2 pkgs/tools/networking/stun/default.nix
  3. +1 −1 pkgs/tools/networking/zerotierone/default.nix
2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/multipath-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
' libmultipath/defaults.h
sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \
kpartx/Makefile libmpathpersist/Makefile
sed -i -e "s,GZIP = .*, GZIP = gzip -9n -c," \
Makefile.inc
'';

nativeBuildInputs = [ gzip ];
4 changes: 2 additions & 2 deletions pkgs/tools/networking/stun/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {

preBuild = ''
tar Jxvf ${srcManpages} debian/manpages
gzip -9 debian/manpages/stun.1
gzip -9 debian/manpages/stund.8
gzip -9n debian/manpages/stun.1
gzip -9n debian/manpages/stund.8
'';

installPhase = ''
2 changes: 1 addition & 1 deletion pkgs/tools/networking/zerotierone/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
mkdir -p $man/share/man/man8
for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do
cat doc/$cmd | gzip -9 > $man/share/man/man8/$cmd.gz
cat doc/$cmd | gzip -9n > $man/share/man/man8/$cmd.gz
done
'';