Commit Graph

2303 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Profpatsch
e1e96a8210 youtube-dl: wrap with atomicparsley (#18066)
Otherwise --embed-thumbnail will crash youtube-dl while running.
Rewrite the module arguments to be semantic and not fail with null
pointer errors.
2016-08-30 14:36:16 +02:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
Tuomas Tynkkynen
048a30e4e4 treewide: Fix dev references to libxml2 2016-08-30 03:02:32 +03:00
Vladimír Čunát
3f80ecfc79 fontforge: build the non-gui version without fontconfig
(in build-time closure)
2016-08-29 22:27:34 +02:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Frederik Rietdijk
9d25dc12d9 Revert "hdf5: 1.8.16 -> 1.10.0-patch1"
This reverts commit 1c1a03f0d3.

hdf5 1.10 is not yet supported by all tools/libraries (e.g pytables, a dependency of pandas, requires hdf5 1.8).
2016-08-28 19:28:31 +02:00
obadz
57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
David Guibert
1c1a03f0d3 hdf5: 1.8.16 -> 1.10.0-patch1 2016-08-28 11:42:21 +02:00
Graham Christensen
a29eb6bfe7 Merge pull request #18024 from cransom/blink1tool
blink1-tool: init at 1.98
2016-08-27 21:43:21 -04:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Robin Gloster
d80ad66701
svtplay-dl: fix path to test runner 2016-08-27 21:55:37 +00:00
Joachim F
c82d9e9fae Merge pull request #17884 from garrison/vmtouch-1.1.0
vmtouch: 1.0.2 -> 1.1.0
2016-08-27 21:38:48 +02:00
Casey Ransom
59b32b92e0 blink1-tool: init at 1.98
The command line tool for the blink(1) notification light.
2016-08-26 19:36:14 -04:00
Bjørn Forsman
90de10b3ee system-config-printer: fix "Print Test Page"
Wrap s-c-p with CUPS_DATADIR=${cups-filters}/share/cups so that it finds
the "testprint" file needed for "Print Test Page" functionality.

Without this change, s-c-p tries to open /usr/share/cups/data/testprint
(fails).
2016-08-26 21:11:36 +02:00
Moritz Ulrich
78305bc5a1 Merge pull request #17944 from steveeJ/racerd-bump
rust: bump registry and racerd
2016-08-26 00:03:34 +02:00
Bjørn Forsman
8f6a8f0757 system-config-printer: fix expansion of $(out) in .service file
Allows the configure-printer@.service to find the udev-configure-printer
program (correct ExecStart path).
2016-08-25 17:37:50 +02:00
Robin Gloster
ad10bf6309
yad: 0.25.1 -> 0.37.0 and fixup icons 2016-08-25 00:00:48 +00:00
Stefan Junker
117a6d10bb exa: fix depshash 2016-08-25 00:33:15 +02:00
Jaka Hudoklin
dcebe6f8cc Merge pull request #17712 from mbrock/unclutter-xfixes
unclutter-xfixes: init at 1.2
2016-08-24 23:46:08 +02:00
Robin Gloster
4370f487fa ddccontrol: use autoreconfHook and fix for newer automake 2016-08-24 21:06:43 +00:00
Franz Pletz
15a1c8a6a8 sam-ba: disable build for i686-linux 2016-08-24 21:31:02 +02:00
Franz Pletz
06a5aaacab ttyrec: fix build 2016-08-24 21:31:02 +02:00
Franz Pletz
e74edb35a9 mstflint: 3.7.0-1.18 -> 4.4.0-1.12 2016-08-24 21:31:02 +02:00
Robin Gloster
b59df0f871 rpm: remove hack
elfutils now adds a eu- prefix to avoid collisions and has now therefore
been added to rpm as propagatedBuildInput
2016-08-24 19:26:55 +00:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
Mikael Brockman
ffb3f0396c unclutter-xfixes: init at 1.2 2016-08-24 11:24:00 +03:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
f064bfe803 treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Jim Garrison
8cacdaec4b vmtouch: 1.0.2 -> 1.1.0 2016-08-21 02:20:12 -04:00
Frederik Rietdijk
8c1a1a11bf asciinema: 20160520 -> 1.3.0
See https://github.com/NixOS/nixpkgs/pull/17807
2016-08-19 12:32:22 +02:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Matthew Bauer
bb245a5b1e unclutter: fix darwin build 2016-08-16 19:25:46 +00:00
Matthew Bauer
94ad63a1aa sl: fix darwin build 2016-08-16 19:25:45 +00:00
Matthew Bauer
07ca8027d9 fontforge-gtk: fix darwin build 2016-08-16 19:25:41 +00:00
Matthew Bauer
f8f4da3561 dumbtorrent: fix darwin build 2016-08-16 19:25:41 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00: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
Frederik Rietdijk
e4b47de694 Remove top-level pycrypto
See #11567.
2016-08-14 14:28:26 +02:00
Frederik Rietdijk
eb3e23c49e Remove top-level setuptools
See #11567.
2016-08-14 13:07:26 +02:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02: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
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00: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
Michael Raskin
d9e64c830c ised: 2.7.0 -> 2.7.1 2016-08-11 17:57:35 +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