3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

22863 commits

Author SHA1 Message Date
aszlig d1a2853933
pinentry: Fix .override for pinentry_*
When you evaluate nixos/tests/simple.nix, you'll run into an infinite
recursion since 41b140cb25.

The reason is that udisks2 now pulls in gnupg because it now depends on
libblockdev, which in turn depends on volume_key and that depends on
gnupg.

Nevertheless, it's not the real reason, because this only means, that
since gnupg is now pulled into the closure of a basic nixos
configuration the real problem becomes visible:

In nixos/modules/config/no-x-libs.nix there is an overlay which does
something like this:

  nixpkgs.overlays = singleton (const (super: {
    pinentry = super.pinentry_ncurses;
  }));

Now since pinentry_ncurses is already using pinentry.override we get an
infinite recursion because now the pinentry attribute refers to
pinentry_ncurses, which by itself is again referring to pinentry.

This is solved by using the self.pinentry.override instead, so that the
override used by pinentry_ncurses doesn't use the attribute from the
overlay.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel
Signed-off-by: aszlig <aszlig@nix.build>
2018-06-11 20:58:58 +02:00
Matthew Bauer 1b46c4b2a4 click: fix locale in darwin
unixtools.locale is used
2018-06-11 14:47:48 -04:00
Izorkin 1705428cf9 mariadb galera: fix build (#41813) 2018-06-11 20:42:53 +02:00
Orivej Desh fd97db43bc
pruneLibtoolFiles: init setup hook (#41819)
A .la file specifies linker flags to link with the library it describes. Its
"dependency_libs" field lists the libraries that this library depends upon.
This list often contains "-l" flags without corresponding "-L" flags. Many
packages in Nixpkgs deal with this in one of these ways:
- delete .la file [1]
- clear dependency_libs [2]
- add -L flags to dependency_libs [3]
- propagate dependencies [4]

Sometimes "dependency_libs" contain wrong "-L" flags pointing to the "dev"
output with headers rather than to the main output with libraries. They have to
be edited or deleted to reduce closure size [5].

Deleting .la files is often but not always safe [6].  Atomatically deleting as
many of them as possible is complex [7].  Deleting .la files that describe
shared rather than static libraries is probably safe; but clearing their
"dependency_libs" field achieves the same effect with less potential for
unintended consequences.  This is the approach that may be enabled for all
Nixpkgs.

[1] 2a79d296d3
[2] c83a530985
[3] 9e0dcf3bd9
[4] 01134e698f
[5] f6c73f1e37
[6] https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Handling_Libtool_Archives
[7] https://github.com/gentoo/gentoo/blob/fb1f2435/eclass/ltprune.eclass
2018-06-11 18:11:02 +00:00
Izorkin 2f73a373db asio: add old version 1.10.8 (#41822) 2018-06-11 20:03:09 +02:00
xeji 25398a90b1
Merge pull request #41723 from flokli/udisks-2.7.6
udisks 2.1.6 -> 2.7.6
2018-06-11 18:29:42 +02:00
Matthew Bauer 69f832d2ee llvm: fix darwin cross bootstrapping cmake
Cmake needs to be listed as a build package for cross splicing to
work correctly.
2018-06-11 12:24:47 -04:00
Jan Tojnar 058b0e7a47 libblockdev: init at 2.17 2018-06-11 18:13:32 +02:00
Florian Klink 1034ef2193 libndctl: init at 60.3 2018-06-11 18:13:31 +02:00
Jan Tojnar f78ca4715b volume_key: init at 0.3.9 2018-06-11 18:13:31 +02:00
Jan Tojnar 6d4069964f libbytesize: init at 1.3 2018-06-11 18:13:31 +02:00
Frank Doepper ed657a98c7 nwipe: init at 0.24 (#41664)
* nwipe: init at 0.24

* nwipe: cleanup deps
2018-06-11 11:41:59 +02:00
Orivej Desh 63a5b85b2a cctz: init at 2.2 2018-06-11 09:26:07 +00:00
Matthew Bauer eca521aea7 libcanberra: supports darwin 2018-06-10 22:45:40 -04:00
Tim Steinbach a444dcad03
linux-copperhead: LTS based on regular 4.14 2018-06-10 21:00:47 -04:00
Matthew Bauer 4b213588f9 ffmpeg: needs gcc
https://hydra.nixos.org/build/75640051/nixlog/2
2018-06-10 20:29:40 -04:00
Matthew Justin Bauer 83be4ee318
Merge pull request #41747 from MarcFontaine/unixcw
unixcw : init at 3.5.1
2018-06-10 19:07:17 -04:00
Tobias Happ 895e4c2687 dwm-status: init at 0.4.0 (#41726) 2018-06-11 00:24:13 +02:00
jraygauthier 1ef6d3fe62 tiscamera: Init at 0.9.1 (#41738) 2018-06-10 23:57:42 +02:00
Matthew Justin Bauer 01e165d073
Merge pull request #41788 from LumiGuide/fix-override-haskellPackages
haskell: fix overriding haskellPackages using haskell.packageOverrides
2018-06-10 17:35:55 -04:00
Izorkin 35ce5c1c8e maxscale: init at 2.1.17 (#33835) 2018-06-10 22:50:36 +02:00
Ryan Mulligan 2c89b0585d ssl-cert-check: init at 3.31 (#41734) 2018-06-10 22:06:27 +02:00
xeji e76388a0ab
Merge pull request #41674 from woffs/loadwatch
loadwatch: init at 1.1
2018-06-10 20:54:00 +02:00
MarcFontaine d2ea91a3db unixcw : init at 3.5.1 2018-06-10 19:02:29 +02:00
Matthew Justin Bauer 7996889cf0
Merge branch 'master' into nixos-evaluate 2018-06-10 11:10:11 -04:00
Bas van Dijk a601787e55 haskell: fix overriding haskellPackages using haskell.packageOverrides
Tested using:

$ nix-build -E '(import ./. { overlays = [(final : previous : { haskell = previous.haskell // { packageOverrides = self : super : {blablabla = super.scientific;};};})];}).haskellPackages.blablabla'
/nix/store/s75xbfhn88187jk8238h4ii2ap9kg4m2-scientific-0.3.6.2
2018-06-10 12:32:20 +02:00
Matthew Bauer 86e5595dda spidermonkey: fix i686 error on 38
spidermonkey doesn’t compile correctly on i686 linux & gcc7. It gives
the error:

  with gcc-7: undefined reference to `__divmoddi4'
2018-06-09 20:21:45 -04:00
Mario Rodas d5ca8dea78 synapse-bt: fix darwin build 2018-06-09 17:14:38 -05:00
Matthew Justin Bauer e8072de87e
Merge pull request #41354 from mulderr/master
odpic: init at 2.3.2
2018-06-09 17:07:06 -04:00
Jan Malakhovski ee1550b763 hello-unfree: init at 1.0 (#41763)
Also add `version` attribute to GNU `hello` while we are at it.
2018-06-09 22:14:36 +02:00
Matthew Justin Bauer 622c997ffd
Merge pull request #41517 from alexfmpe/init-dylibbundler
dylibbundler: init
2018-06-08 10:03:48 -04:00
Jörg Thalheim 7212a6c130
Merge pull request #41194 from uri-canva/bazel-buildtools
Add Bazel buildtools
2018-06-08 13:55:51 +01:00
Alexandre Esteves c7520b6670
dylibbundler: init 2018-06-08 13:37:53 +01:00
Frank Doepper 943625a62b loadwatch: init at 1.1 2018-06-08 12:45:15 +02:00
Frederik Rietdijk 4dc7cc8cc7
Merge pull request #41259 from jyp/tf-1.7.1-bin
python.pkgs.tensorflow: wheel version
2018-06-07 11:27:39 +02:00
Peter Hoeg b48af23d16
Merge pull request #41617 from peterhoeg/p/mssql
check-mssql-health: init at 2.6.4.14
2018-06-07 14:55:59 +08:00
Peter Hoeg d5f37d1f2e check-mssql-health: init at 2.6.4.14 2018-06-07 14:21:18 +08:00
Matthew Justin Bauer ddd400baee
Merge pull request #41498 from tadfisher/docker-machine-kvm2
docker-machine-kvm2: init at 0.27.0
2018-06-06 21:28:44 -04:00
Matthew Justin Bauer 6dcef7ab46
Merge pull request #41568 from linc01n/fcitx-table-extra
fcitx-table-extra: init at 0.3.8
2018-06-06 21:27:34 -04:00
Matthew Justin Bauer d6a97a524a
Merge pull request #41576 from MarcFontaine/xearth
xearth : init at 1.1
2018-06-06 21:27:09 -04:00
Matthew Justin Bauer dc82e3efc5
Merge pull request #41190 from puffnfresh/package/obs-linuxbrowser
obs-linuxbrowser: init at 0.3.1
2018-06-06 21:24:03 -04:00
xeji 0c9ec4dfcf
Merge pull request #41578 from akru/master
parity: 1.9.7 -> 1.10.6 [SECURITY UPDATES]
2018-06-06 21:54:16 +02:00
lewo 2c3e53287d
Merge pull request #40666 from magnetophon/M32edit
m32edit and x32edit: init at 3.2
2018-06-06 21:12:13 +02:00
Alexander Krupenkin c36101eac1
parity-beta: deinit 2018-06-06 15:43:48 +03:00
MarcFontaine 220d2637c1 xearth : init at 1.1 2018-06-06 14:34:00 +02:00
Lincoln Lee be170030b9 fcitx-table-extra: init at 0.3.8 2018-06-06 18:10:19 +08:00
Orivej Desh 05fedecad9 Revert "libbsd: replace with nbcompat"
This reverts commit 480434f7ee.

netbsd.compat does not provide include files that are provided by libbsd [1], and it
encumbers its transitive dependents with an obligatory include file that setups
BSD-compatible C environment [2].

[1] https://github.com/NixOS/nixpkgs/pull/41320#issuecomment-394922277
[2] https://github.com/NixOS/nixpkgs/pull/41320#issuecomment-394928845
2018-06-06 04:09:15 +00:00
Orivej Desh f2682af9c9 Revert "opendkim: fix libbsd dependency"
This reverts commit b529dda3a1.
2018-06-06 04:09:14 +00:00
Orivej Desh 13170a9694 Revert "libbsd-freedesktop: re-init at 0.9.1, use for samba"
This reverts commit 8b5ed12952.
2018-06-06 04:09:11 +00:00
Tad Fisher 0ef083c020 docker-machine-kvm2: init at 0.27.0 2018-06-05 14:06:56 -07:00