Commit Graph

9657 Commits

Author SHA1 Message Date
Shea Levy
9adad8612b Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing
changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
2016-08-15 19:05:52 -04:00
Shea Levy
57b2d1e9b0 Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs 2016-08-15 19:01:44 -04:00
Nikolay Amiantov
b067b53011 networkmanager098: fix binary paths 2016-08-16 00:19:26 +03:00
Nikolay Amiantov
cd05a8ed00 networkmanager: point to kmod's modprobe 2016-08-16 00:19:26 +03:00
Nikolay Amiantov
1afd250676 treewide: replace several /sbin paths by /bin 2016-08-16 00:19:25 +03:00
Daniel Peebles
65ed79a1e8 Merge pull request #17642 from svend/gnupg21-fix-gpgsm-linking
gnupg: Fix gpgsm linking for gnupg 2.1.14
2016-08-15 14:19:19 -04:00
Svend Sorensen
ac2836610d gnupg: Add comment about when to drop fix-gpgsm-linking.patch 2016-08-15 11:16:55 -07:00
Nikolay Amiantov
5b296a1470 Merge branch 'master' into staging 2016-08-15 10:34:28 +03:00
Robin Gloster
3fa7ef49d5 gnupg21: remove unnecessary substituteInPlace
`substituteInPlace` was operating on a non-existant file.
2016-08-14 22:55:21 +00:00
Robin Gloster
afbeda22d5 fail2ban: remove unnecessary substituteInPlace
`substituteInPlace` was operating on non-existant files.
2016-08-14 22:55:21 +00:00
Nikolay Amiantov
fc7e8bd96e networkmanager: fix ExecReload in the service 2016-08-14 22:38:50 +03:00
Nikolay Amiantov
4fb1f1ff6e bcache-tools: remove kmod from arguments 2016-08-14 22:38:27 +03:00
Nikolay Amiantov
49fe339b09 update-resolv-conf: 20141003 -> 2016-04-24 2016-08-14 22:37:11 +03:00
Nikolay Amiantov
bdc700c23a grub4dos: 0.4.6a-2016-04-26 -> 0.4.6a-2016-08-06 2016-08-14 22:37:10 +03:00
Nikolay Amiantov
6086328b2d primusLib: fix version, quote homepage for better clickability 2016-08-14 22:37:10 +03:00
Nikolay Amiantov
c60deb0266 quote homepages for better clickability
Done while I was traversing packages which I maintain to save extra clicks on
urxvt (it captures semicolon as a part of URL).
2016-08-14 22:37:10 +03:00
Nikolay Amiantov
bd8217a2bc logmein-hamachi: 2.1.0.139 -> 2.1.0.165 2016-08-14 22:37:06 +03:00
Frederik Rietdijk
e4b47de694 Remove top-level pycrypto
See #11567.
2016-08-14 14:28:26 +02:00
Frederik Rietdijk
7986b718f3 Remove pycairo from top-level
See #11567.
2016-08-14 13:52:42 +02:00
Robin Gloster
064b878793 Revert "fcitx-engines.table-other: fix build for cmake 3.6 (#17721)"
This reverts commit 4271b6d510193240a8bdebc606bbeab757c32822.

Patch hash is wrong and doesn't build.
2016-08-14 11:27:28 +00:00
Eric Sagnes
4271b6d510 fcitx-engines.table-other: fix build for cmake 3.6 (#17721) 2016-08-14 11:19:15 +00:00
Frederik Rietdijk
eb3e23c49e Remove top-level setuptools
See #11567.
2016-08-14 13:07:26 +02:00
Vladimír Čunát
4b2120f5b8 Merge #17347: texlive: fix xdvi md5.run 2016-08-14 12:22:50 +02:00
Vladimír Čunát
4fbb37c517 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1287298
2016-08-14 12:02:28 +02:00
Frederik Rietdijk
11d1fdfd8b Remove top-level cython and cython3
See #11567.
2016-08-14 12:01:09 +02:00
Domen Kožar
49222660fc Merge pull request #17256 from matthewbauer/patch-4
Travis fixes
2016-08-13 14:17:59 +02:00
Luca Bruno
909b036b47 Merge pull request #16610 from leenaars/datefudge
Datefudge
2016-08-12 22:10:59 +01:00
Luca Bruno
a10886dfdc Merge pull request #17514 from matthewbauer/packagekit-1.1.3
packagekit: git -> 1.1.3
2016-08-12 22:03:55 +01:00
Luca Bruno
e36c239897 Merge pull request #17669 from cheecheeo/shc
shc: init at 3.9.3
2016-08-12 21:51:47 +01:00
Luca Bruno
e54bda6198 Merge pull request #17698 from DamienCassou/offlineimap-7.0.5
offlineimap: 7.0.4 -> 7.0.5
2016-08-12 21:45:30 +01:00
zimbatm
c2302f2f45 Merge pull request #17677 from kamilchm/no-go-libs-json
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
Damien Cassou
017e368036 offlineimap: 7.0.4 -> 7.0.5 2016-08-12 18:23:05 +02:00
Hoàng Minh Thắng
8669d688c7 fcitx-unikey: init at 0.2.5 2016-08-12 14:36:36 +07:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
John Chee
17a9109b34 shc: init at 3.9.3 2016-08-11 20:56:11 +00:00
Vladimír Čunát
b523c1deb9 thc-hydra: fix the tarball job
Darwin has no `stdenv.glibc`.
2016-08-11 19:16:45 +02:00
Robin Gloster
40d217b90e Merge pull request #17657 from matthewbauer/darwin-misc
Darwin misc. fixes
2016-08-11 16:41:34 +00:00
Michael Raskin
beaee69795 freeipmi: 1.5.2 -> 1.5.3 2016-08-11 17:57:35 +02:00
Michael Raskin
978dac9dee getmail: 4.49.0 -> 4.50.0 2016-08-11 17:57:35 +02:00
Michael Raskin
d9e64c830c ised: 2.7.0 -> 2.7.1 2016-08-11 17:57:35 +02:00
Michael Raskin
c27ea9bb6b glusterfs: 3.7.11 -> 3.8.1 2016-08-11 17:57:35 +02:00
Nikolay Amiantov
1d726ace0c thc-hydra: 7.5 -> 8.2 2016-08-11 13:49:25 +03:00
Jean-Luc Jox
526291231b par: init at 1.5.2
Issue #17521
2016-08-11 12:48:41 +02:00
Frederik Rietdijk
05a81335cf Merge pull request #17658 from siddharthist/fasd/update
fasd: 2015-03-29 -> 2016-08-11
2016-08-11 09:16:53 +02:00
Langston Barrett
76160b73ec fasd: 2015-03-29 -> 2016-08-11
change "git" to "unstable" (recommended by @FRidh)
2016-08-11 07:14:35 +00:00
Matthew Bauer
0a1cb79908 atomicparsley: fix darwin build 2016-08-10 22:42:51 -05:00
Matthew Bauer
93d0d6f25f atomicparsley: lowercase derivation name 2016-08-10 22:42:32 -05:00
Tuomas Tynkkynen
1713255827 ceph: Add xfsprogs 4.5.0 compat patch 2016-08-11 00:50:16 +03:00
Tuomas Tynkkynen
ab8b78f6a3 xfstests: 2016-01-11 -> 2016-08-06 2016-08-11 00:50:16 +03:00
Tuomas Tynkkynen
0da53ba08c xfstests: Remove 'su' from PATH
This needs to be coming from the setuid wrapper to work correctly.
2016-08-11 00:50:16 +03:00