JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
fecd326399
nixpkgs/pkgs/servers
History
aszlig 19e83bc2ba
Merge autoPatchelfHook improvements (#47222) 
This includes the initialy commit was done by @Mic92 plus a few fixes
from my side. So essentially this avoids patching statically linked
executables and also speeds up searching for ELF files altogether.

I've tested this by comparing the outputs of all the derivations which
make use of this hook using the following Nix expression:

  let
    getPackagesForRev = rev: with import (builtins.fetchGit {
      url = ./.;
      inherit rev;
    }) { config.allowUnfree = true; }; [
      cups-kyodialog3 elasticsearch franz gurobi javacard-devkit
      masterpdfeditor maxx oracle-instantclient powershell reaper
      teamviewer unixODBCDrivers.msodbcsql17 virtlyst wavebox zoom-us
    ];

    pkgs = import <nixpkgs> {};
    baseRev = "ef764eb0d8314b81a012dae04642b4766199956d";

  in pkgs.runCommand "diff-contents" {
    chset = pkgs.lib.zipListsWith (old: new: pkgs.runCommand "diff" {
      inherit old new;
      nativeBuildInputs = [ pkgs.nukeReferences ];
    } ''
      mkdir -p "''${NIX_STORE#/}"
      cp --no-preserve=all -r "$old" "''${NIX_STORE#/}"
      cp --no-preserve=all -r "$new" "''${NIX_STORE#/}"
      find "''${old#/}" "''${new#/}" \
        \( -type f -exec nuke-refs {} + \) -o \( -type l -delete \)
      mkdir "$out"
      echo "$old" > "$out/old-path"
      echo "$new" > "$out/new-path"
      diff -Nur "''${old#/}" "''${new#/}" > "$out/diff" || :
    '') (getPackagesForRev baseRev) (getPackagesForRev "");
  } ''
    err=0
    for c in $chset; do
      if [ -s "$c/diff" ]; then
        echo "$(< "$c/old-path") -> $(< "$c/new-path")" \
             "differs, report: $c/diff" >&2
        err=1
      fi
    done
    [ $err -eq 0 ] && touch "$out"
  ''

With these changes there is only one derivation which has altered
contents, which is "franz". However the reason why it has differing
contents is not directly because of the autoPatchelfHook changes, but
because the "env-vars" file from the builder is in
"$out/opt/franz/env-vars" (Cc: @gnidorah) and we now have different
contents for NIX_CFLAGS_COMPILE and other environment variables.

I also tested this against a random static binary and the hook no longer
tries to patch it.

Merges: #47222
2018-09-25 05:21:01 +02:00
..
amqp pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
apache-kafka apacheKafka_0_10: 0.10.2.1 -> 0.10.2.2 2018-09-15 10:09:21 -04:00
apcupsd treewide: replace utillinux refs of {u,}mount 2018-03-27 18:17:46 -05:00
asterisk pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
atlassian atlassian-jira: 7.12.0 -> 7.12.1 2018-09-13 19:32:33 +02:00
beanstalkd
bird Merge branch 'no-toPath' 2018-09-06 08:09:53 -04:00
brickd
caddy pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
cayley
clickhouse clickhouse: 18.5.1 -> 18.10.3 2018-08-24 15:25:00 +02:00
cloud-print-connector
computing slurm: 17.11.9-2 -> 18.08.0-1 2018-09-08 23:14:54 +02:00
confluent confluent: init at 4.1.1-2.11 (#43137) 2018-08-01 21:35:42 +02:00
consul pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
corosync corosync: 2.4.2 -> 2.4.3 2018-02-25 17:41:52 -08:00
coturn [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
couchpotato
dante dante: add extra build inputs 2018-04-26 13:57:11 +03:00
dex
dgraph
dico dico: mark linux only. 2018-09-20 22:19:56 +02:00
dict treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
diod diod: add license 2018-08-05 16:26:02 +02:00
dns pdns-recursor: 4.1.3 -> 4.1.4 (#45984) 2018-09-03 22:15:11 +02:00
elasticmq
emby emby: 3.4.1.0 -> 3.5.2.0 2018-09-17 09:41:16 -04:00
etcd pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
exhibitor pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
fcgiwrap fcgiwrap: don't error on implicit fallthrough 2018-03-11 15:58:26 +01:00
felix
fingerd/bsd-fingerd bsd_fingerd: add license 2018-08-30 22:29:17 +02:00
firebird pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
foswiki treewide: fix build with disallowed aliases (#43872) 2018-07-21 22:03:24 -04:00
foundationdb foundationdb60: 6.0.4pre2497_73d64cb2 -> 6.0.11pre2716_9e8c1941e 2018-09-17 17:49:09 -05:00
freeradius freeradius: add rest module and multiple outputs 2018-08-01 22:24:47 +02:00
ftp vsftpd: add license 2018-08-04 16:09:40 +02:00
gnatsd gnatsd: init at 1.2.0 2018-08-19 11:48:27 -07:00
gopher/gofish
gotty pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
gpm gpm: patch to fix w/musl, good for general use 2018-07-18 22:17:44 -05:00
gpsd pps-tools: init at 1.0.2, enable for chrony, gpsd, ntp (#42889) 2018-07-04 11:28:07 +00:00
h2 pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
hbase pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
hitch hitch: init at 1.4.8 + service + test (#39358) 2018-05-01 10:36:36 +01:00
holochain-go Add: GoEndian dependancy 2018-07-06 14:00:22 +01:00
home-assistant home-assistant: 0.77.2 -> 0.77.3 2018-09-06 20:22:56 +02:00
http nginxMainline: 1.15.2 -> 1.15.3 2018-08-31 14:42:14 +02:00
hydron hydron: 2018-08-15 -> 2018-08-18 2018-08-18 21:31:27 -05:00
hylafaxplus hylafaxplus: 5.6.0 -> 5.6.1 (#47045) 2018-09-22 18:25:44 +02:00
icecast
identd nullidentdmod: Init at 1.3 (#46040) 2018-09-05 11:09:55 +02:00
interlock pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
irc charybdis: 4.1 -> 4.1.1 2018-08-24 12:54:44 -07:00
irker irker: cleanup manual setting of XML_CATALOG_FILES, no longer needed 2018-01-02 22:40:39 +01:00
isso pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
jackett jackett: 0.10.160 -> 0.10.198 2018-09-24 20:40:29 +02:00
jetbrains youtrack: 2018.1.41051 -> 2018.2.44329 2018-08-09 21:46:21 +03:00
kippo kippo: mark as broken 2018-09-13 00:58:57 +02:00
kwakd
ldap/389 pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
limesurvey
livepeer treewide: http -> https 2018-07-19 18:12:04 -07:00
mail exim: enable LMTP support 2018-09-17 22:01:11 +02:00
matrix-synapse matrix-synapse: 0.33.3.1 -> 0.33.5 2018-09-24 16:57:37 +02:00
matterbridge matterbridge: 1.7.1 -> 1.11.0 2018-08-06 12:25:25 +02:00
mattermost mattermost: 5.1.0 -> 5.3.0 2018-09-17 13:01:12 -07:00
mediatomb
meguca meguca: 2018-08-02 -> 2018-08-13 2018-08-15 22:22:11 -05:00
memcached memcached: 1.5.9 -> 1.5.10 2018-08-16 22:24:47 -07:00
mesos-dns pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
metabase metabase: 0.30.1 -> 0.30.3 2018-09-20 18:50:03 +02:00
meteor
minio minio: 2018-05-11T00-29-24Z -> 2018-07-31T02-11-47Z 2018-08-01 00:36:44 +02:00
mirrorbits pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
misc airsonic: 10.1.1 -> 10.1.2 2018-08-08 20:15:42 -07:00
monitoring prometheus-json-exporter: add patch to support bool parsing 2018-09-18 18:21:00 +02:00
mpd mpd: 0.20.20 -> 0.20.21 2018-08-20 14:06:27 +02:00
mqtt/mosquitto mosquitto: 1.4.14 -> 1.4.15 2018-03-09 01:01:28 -08:00
nas
nats-streaming-server nats-streaming-server: init at 0.11.0 2018-09-08 23:11:24 +00:00
neard neard: 0.15-post-git-20510929 -> 0.16 2017-12-05 22:05:59 +00:00
news/leafnode treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
nextcloud nextcloud: 13.0.5 -> 13.0.6 (#46236) 2018-09-09 14:16:41 +02:00
nosql influxdb: 1.4.1 -> 1.6.3 (#47186) 2018-09-23 12:00:52 +02:00
nsq pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
oauth2_proxy oauth2_proxy: 20160120 -> 20180325 2018-04-12 17:47:00 +02:00
openafs Merge pull request #45411 from alyssais/linux-libre 2018-08-30 09:01:00 +02:00
openxpki openxpki: fix build, use current python3Packages (#46860) 2018-09-19 16:16:19 +02:00
osrm-backend osrm-backend: 5.17.2 -> 5.18.0 2018-05-13 23:03:52 -07:00
owncloud [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
p910nd Remove nckx as a maintainer for all packages 2018-01-16 23:00:49 +01:00
pies treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux 2018-04-30 18:12:10 -05:00
plex Plex: 1.13.4 -> 1.13.5 (#45578) 2018-08-24 18:36:32 +02:00
plexpy PlexPy: init at 1.4.25 2017-10-29 19:28:16 -05:00
polipo polipo: mark as vulnerable (close #33709) 2018-02-08 18:50:41 +01:00
prayer prayer: use correct include directory for c-client aka uwimap 2017-12-10 12:12:46 +01:00
ps3netsrv
pulseaudio Merge pull request #43160 from jtojnar/pulseaudio-12 2018-07-29 22:40:54 +02:00
quagga quagga: 1.2.2 -> 1.2.4 2018-02-28 07:06:49 +00:00
radarr radarr: 0.2.0.995 -> 0.2.0.1120 (#46185) 2018-09-12 22:52:09 +02:00
radicale radicale: 2.1.9 -> 2.1.10 2018-08-23 15:43:34 +02:00
rainloop rainloop: Init at 1.12.1 2018-08-07 19:01:39 +02:00
rippled pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
rpcbind rpcbind: switch to upstream git repo, drop patch 2018-08-31 00:04:15 +02:00
rt rt: 4.4.2 -> 4.4.3 (#44685) 2018-08-08 15:33:41 +02:00
sabnzbd sabnzbd: add sabyenc to python env 2018-07-27 19:02:11 +01:00
samba samba: 4.7.6 -> 4.7.9 2018-08-15 23:39:16 +02:00
search elasticsearch: Add zlib to buildInputs for unfree 2018-09-25 05:09:37 +02:00
serf
serviio Update license to unfree 2018-02-07 20:45:30 +01:00
shairplay shairplay: fix darwin build 2018-03-25 15:34:59 +02:00
shairport-sync Merge branch 'master' into staging-next 2018-08-17 13:45:21 +02:00
shellinabox treewide: abandon Google Code homepages 2017-11-03 18:52:28 +00:00
shishi treewide: Make shouldUsePackages copypasta use meta.available 2018-03-12 18:55:41 -04:00
silc-server
simplehttp2server simplehttp2server: init at 3.1.3 2018-02-17 06:35:35 +07:00
sip Take me (viric) out of most maintenance 2018-07-22 21:50:19 +02:00
sks sks: Adapt the package to NixOS (pkgs.db provides only "db_stat") 2018-09-08 16:24:05 +02:00
skydns skydns: add license 2018-08-04 18:34:51 +02:00
slimserver treewide: fix build with disallowed aliases (#43872) 2018-07-21 22:03:24 -04:00
smcroute smcroute: 2.4.1 -> 2.4.2 2018-09-20 16:42:09 +00:00
softether softether: blacklist aarch64-linux platform 2018-02-23 15:23:50 +03:00
sonarr sonarr: 2.0.0.5163 -> 2.0.0.5228 2018-07-03 15:09:56 -07:00
sql pgtap: 0.98.0 -> 0.99.0 (#46980) 2018-09-23 15:09:37 +02:00
squid squid4: 4.0.23 -> 4.0.24 2018-03-22 01:05:31 +01:00
sslh treewide: http -> https sources (#42676) 2018-06-28 20:43:35 +02:00
teleport teleport: 2.4.0 -> 2.4.1 2018-02-27 17:15:21 -08:00
traefik traefik: 1.6.2 -> 1.6.5 2018-07-24 03:00:58 +02:00
trezord trezord: 2.0.14 -> 2.0.19 2018-09-24 19:25:21 +02:00
tt-rss tt-rss-theme-feedly: Init at 1.4.0 (#44634) 2018-08-07 23:33:15 +02:00
tvheadend tvheadend: 4.2.5 -> 4.2.6 2018-03-27 22:40:31 -07:00
u9fs
udpt
uftp uftp: 4.9.7 -> 4.9.8 (#46175) 2018-09-12 22:48:50 +02:00
uhub treewide: http -> https sources (#42676) 2018-06-28 20:43:35 +02:00
ums
unfs3
unifi unifiTesting: 5.8.14 -> 5.9.22 2018-08-21 09:34:52 +08:00
uwsgi uwsgi: 2.0.17 -> 2.0.17.1 2018-07-10 21:21:55 -07:00
varnish varnish6: 6.0.0 -> 6.0.1 (#46170) 2018-09-18 17:57:10 +02:00
web-apps codimd: init at 1.2.0 2018-09-17 15:18:52 +02:00
webmetro webmetro: init => unstable-20180426 (#39673) 2018-05-20 23:27:34 +02:00
x11 xf86-input-libinput: 0.26.0 -> 0.28.0 2018-09-21 07:58:57 -05:00
xinetd
xmpp ejabberd: 18.01 -> 18.06 (#44158) 2018-08-05 18:02:40 +02:00
zookeeper zookeeper: 3.4.12 -> 3.4.13 2018-08-07 20:39:57 -07:00