3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

158671 commits

Author SHA1 Message Date
Patrick Hilhorst 320c9c10de
make-derivation: use pname-version as default name if both are present 2018-11-06 00:04:21 +01:00
John Ericson 48caae5045 Merge remote-tracking branch 'upstream/master' into HEAD 2018-11-05 15:19:33 -05:00
John Ericson a054d74507
Merge pull request #48244 from volth/patch-257
meson: fix cross compilation of systemd
2018-11-05 15:09:32 -05:00
volth 9e1b883144 meson: fix cross compilation of systemd
Co-authored-by: Robin Gloster <mail@glob.in>
2018-11-05 14:39:30 -05:00
Michael Weiss 7eaba9af5e scdoc: Use $SOURCE_DATE_EPOCH to produce reproducible man pages
Use this patch until something like it is in the upstream repository.
Without it, the current date is used for the man pages, which makes them
non-reproducible.
2018-11-05 20:37:01 +01:00
Matthew Bauer a35dae70c3 notmuch: cleanup 2018-11-05 13:30:43 -06:00
Matthew Bauer ada49ba736 talloc: use fixDarwinDylibNames
The makefile isn’t setting install_name properly causing issues on
macOS. fixDarwinDylibNames seems to fix this.
2018-11-05 13:30:43 -06:00
Matthew Bauer 21eeb00a08 treewide: get rid of osx cmake flags
Flags that we now set globally:

- CMAKE_OSX_SYSROOT
- CMAKE_OSX_DEPLOYMENT_TARGET

can now be removed.

(cherry picked from commit 8742d5de30dfe2447c0fb56a2e7410b402effc80)
2018-11-05 13:30:42 -06:00
John Ericson d94d220b84
Merge pull request #49795 from obsidiansystems/fix-pkgsFor
release-lib: Fix `pkgsFor`
2018-11-05 14:18:16 -05:00
Yegor Timoshenko 77dad17ab6
Merge pull request #49725 from pbogdan/chrootenv-strip
chrootenv: strip the binary
2018-11-05 18:57:28 +00:00
John Ericson 8d99a3455b release-lib: Fix pkgsFor 2018-11-05 11:27:50 -05:00
Jörg Thalheim 5c63ee6216
Merge pull request #49104 from zarelit/mailcatcher_rework
mailcatcher: repackage using bundlerApp
2018-11-05 16:12:09 +00:00
aszlig b162b40007
ip2unix: init at 1.0.0
This tool was initially built specifically for nixcloud to prevent a few
annoying programs from binding to IP sockets.

While initially only accepting a JSON file as input, the tool now has a
proper command line interface and it's also generally usable to turn IP
sockets of any program into Unix sockets.

Another thing that might be even useful for NixOS modules is the
possibility to bend programs into using systemd socket activation.

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-05 16:39:42 +01:00
Vincent Laporte cd05d5a112
coqPackages.autosubst: fix build 2018-11-05 14:53:19 +00:00
Peter Simons 2b9916c715 haskell-pandoc: update overrides for the new version 2018-11-05 14:06:29 +01:00
Peter Simons 90acab51fe haskell-vty: update overrides for the new version 2018-11-05 14:06:29 +01:00
Peter Simons 0a74322a5d haskell-hspec: update overrides for the new version some more 2018-11-05 14:06:29 +01:00
Peter Simons 72825b5e39 haskell-hspec-discover: update overrides for the new version 2018-11-05 14:06:29 +01:00
Peter Simons 627624f5cd haskell-hspec-core: update overrides for the new version 2018-11-05 14:06:28 +01:00
Peter Simons 748ea69fab haskell-hspec: update overrides for the new version 2018-11-05 14:06:28 +01:00
Peter Simons db203c84e3 haskell-hpack: update overrides for the new version 2018-11-05 14:06:28 +01:00
Peter Simons d15d64352a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1-3-gc8d18e2 from Hackage revision
01afc16a43.
2018-11-05 14:06:24 +01:00
Peter Simons 68b1d626fb hackage2nix: disable failing Hydra builds 2018-11-05 14:06:23 +01:00
Renato Alves 3bcdb3945a ghc-8.2.1-binary: Patch shebang causing failures in Centos 6 2018-11-05 14:05:50 +01:00
Peter Simons ff060e74b8 haskell-cpython: don't bind the obsolete name "python34"
Fixes the evaluation error introduced by 4f45edbd9a.
2018-11-05 14:03:43 +01:00
Tim Steinbach 4745250bd3
linux: 4.19-rc8 -> 4.20-rc1 2018-11-05 07:09:41 -05:00
Gabriel Ebner 57dd484333
Merge pull request #49778 from gebner/rngd-version
nixos/rngd: do not pass --version flag
2018-11-05 12:23:37 +01:00
Jörg Thalheim 31112358db
Merge pull request #49777 from srhb/restore-test-timeout
Revert "NixOS tests: Wait for shell for 10x longer (50m)"
2018-11-05 11:16:42 +00:00
Gabriel Ebner 20078fd5b2 nixos/rngd: do not pass --version flag 2018-11-05 10:41:38 +01:00
Peter Simons b854f78991 ghc-8.4.4: disable integer-simple variant build
The build fails: https://hydra.nixos.org/build/83750830
2018-11-05 10:27:57 +01:00
Peter Simons 4f45edbd9a haskell-cpython: revert "set to null"
This reverts commit 6a0b1b13b6. Please don't null
out the entire package just because its build is broken at the moment. If you
want to prevent users from compiling cpython, then haskell.lib.markBroken (or,
even better: markBrokenVersion) are the way to do it.
2018-11-05 10:06:26 +01:00
Sarah Brofeldt 95486ca306 Revert "NixOS tests: Wait for shell for 10x longer (50m)"
This reverts commit 9bc10e1291.
2018-11-05 08:58:08 +00:00
Pascal Wittmann c7a5b771df
Merge pull request #49751 from woffs/phototonic-2.1
phototonic: 1.7.1 -> 2.1
2018-11-05 09:51:16 +01:00
Matthew Bauer 4056c436c9 http-parser: cleanup 2018-11-04 20:03:53 -06:00
Robert Helgesson 69522a0acf
svtplay-dl: 1.9.11 -> 2.1 2018-11-05 00:21:08 +01:00
Jan Tojnar 1d077e6286
remmina: fix version 2018-11-05 00:09:22 +01:00
Matthew Bauer d3c2247b77
Merge pull request #47679 from NixOS/docs-make-channel
Document make-channel.nix
2018-11-04 16:51:28 -06:00
Robert Helgesson fa30c8cfca
lombok: 1.16.22 -> 1.18.4 2018-11-04 22:36:45 +01:00
Vincent Laporte e338d801e2 mkCoqPackages: look for “dontFilter” in coq derivation 2018-11-04 20:49:38 +00:00
Vincent Laporte b3f6840d8e coqPackages.ssreflect: refactor 2018-11-04 20:49:38 +00:00
Vincent Laporte d2c38d1eef coqPackages.mathcomp: refactor 2018-11-04 20:49:38 +00:00
Robert Hensing 17e863d017 Remove incorrect sentence from make-channel comment
Besides being incorrect, claims like these tend to stick around
after they become incorrect.
2018-11-04 20:45:49 +01:00
Robert Hensing 14a9365952
Merge pull request #49462 from roberth/pkgs-nixos-example
pkgs.nixos: Add example to inline documentation
2018-11-04 20:35:03 +01:00
Jörg Thalheim 98063b86b1
Merge pull request #49664 from dtzWill/update/bup-0.29.2
bup: 0.29.1 -> 0.29.2
2018-11-04 19:20:23 +00:00
Jörg Thalheim 1252aa5c73
Merge pull request #49628 from lopsided98/raspberrypi-wireless-firmware-update
raspberrypiWirelessFirmware: 2018-05-30 -> 2018-08-20
2018-11-04 19:15:56 +00:00
Matthew Bauer 2b604c2836
Merge pull request #49670 from matthewbauer/pkgs-i686-remove
Fix pkgsi686Linux assertion
2018-11-04 12:49:09 -06:00
Jörg Thalheim dc0af4d7b6
Merge pull request #49632 from enumatech/fastlane-2.107.0
fastlane: 2.105.2 -> 2.107.0
2018-11-04 18:37:17 +00:00
Silvan Mosberger 1dd6445252
Merge pull request #49758 from LumiGuide/fix-shellhook-ignore-haskell
haskellPackages.*.env: Fixed shellHook being ignored
2018-11-04 19:07:40 +01:00
Jörg Thalheim 22472dbe77
Merge pull request #49635 from vbgl/coq-contribs-zfc-8.8
coqPackages.contribs.zfc: enable for Coq 8.8
2018-11-04 18:00:38 +00:00
Michael Raskin 6b8252d367
Merge pull request #44303 from pvgoran/tomcat-clean-basedir
nixos/tomcat: add purifyOnStart option
2018-11-04 17:50:38 +00:00