1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Commit graph

52525 commits

Author SHA1 Message Date
Eelco Dolstra 8e9e4b05f7 Fix running preHook
Accidentally (?) lost in e3875297fa.
2014-11-06 11:26:09 +01:00
Eelco Dolstra f01ecbee50 nixBuild: Respect the preHook/postHook of the caller 2014-11-06 11:12:29 +01:00
Eelco Dolstra 7ff232e958 mesa: Don't depend on Wayland
NixOS currently does not have any Wayland support, so it's kinda
pointless ATM to make everything depend on it.
2014-11-06 11:02:02 +01:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Eelco Dolstra 782a12e450 Revert "Update Liberation fonts"
This reverts commit e85f67f215. It makes
NixOS depend on Atlas, gfortran, numpy, etc. In particular nothing
importation should ever gepend on Atlas, because it's prone to random
build failures:

  http://hydra.nixos.org/build/16766850
2014-11-06 10:03:42 +01:00
William A. Kennington III 9a7143918b libu2f-host: 0.0 -> 0.0.1 2014-11-05 22:03:18 -08:00
Vincent Laporte 6e8a9b8145 wxmaxima: update from 13.04.2 to 14.09.0 2014-11-06 01:41:02 +00:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
vbgl d91986c24f Merge pull request #4849 from vbgl/ccache
ccache: update from 3.1.9 to 3.1.10
2014-11-06 00:38:40 +00:00
Vincent Laporte fa09f72162 ccache: update from 3.1.9 to 3.1.10 2014-11-06 00:32:43 +00:00
Vincent Laporte 9ad81702f7 scribus: update from 1.4.3 to 1.4.4 2014-11-05 23:59:11 +00:00
Cillian de Róiste 21f57b8d78 Add tessel: cli tools and node libs for tessel.io devices 2014-11-06 00:54:12 +01:00
Mathijs Kwik d0e0d62e61 add duperemove: btrfs deduplication tool 2014-11-06 00:02:45 +01:00
Mateusz Kowalczyk a94baadb48 Merge pull request #4848 from meditans/add-haskell-unification-fd
Haskell - added package unification-fd
2014-11-05 22:39:44 +00:00
Carlo Nucera 9f338061af Haskell - added package unification-fd 2014-11-05 22:52:47 +01:00
Bjørn Forsman 4f220bd0c3 munin: add missing dependency on 'NetCIDR'
Fixes

  munin-node[30100]: Can't locate Net/CIDR.pm in @INC (@INC contains: [...])

when using the 'cidr_allow' configuration directive.
2014-11-05 22:27:27 +01:00
Bjørn Forsman 4201769344 perl-Net-CIDR: new package
Expression is generated with nix-generate-from-cpan. Then I added
platforms and maintainers.
2014-11-05 22:27:26 +01:00
Michael Raskin aeb032044d Readd BtrFS-progs 3.16 for snapper build 2014-11-06 00:32:31 +03:00
Michael Raskin d66bf89faa Update PhantomJS; should also fix remarkjs 2014-11-06 00:32:31 +03:00
Bjørn Forsman ef321f539d opkg-utils: new package
Helper scripts for use with the opkg package manager.

Upstream doesn't do releases it seems, so I'm packaging the latest git
version.
2014-11-05 21:58:12 +01:00
Rickard Nilsson f2b6b9871f new package: swaks, a command line SMTP tool 2014-11-05 21:43:25 +01:00
Mathijs Kwik 8913f14a5f emacs-idris-mode: upgrade to 0.9.15 2014-11-05 18:28:59 +01:00
Eelco Dolstra c964077200 findTarball: Handle pipefail
It was failing because the bash subshell died with SIGPIPE, which is
no longer ignored.

http://hydra.nixos.org/build/16766452
2014-11-05 18:24:16 +01:00
Eelco Dolstra 83758d2b26 Die tabs die 2014-11-05 18:12:21 +01:00
Eelco Dolstra 2d498a3c1c findTarballs: Take nullglob into account 2014-11-05 18:12:07 +01:00
宋文武 9b014b3642 gst-plugins-bad: enable gl plugin (close #4763) 2014-11-05 16:19:07 +01:00
Peter Simons 02c37c1027 Merge pull request #4838 from abbradar/ssmtp-root
Add 'root' option to ssmtp
2014-11-05 15:45:47 +01:00
Eelco Dolstra 4e7a5aca2b Provide more SPDX IDs 2014-11-05 15:33:11 +01:00
Eelco Dolstra d43846a0d8 Make the license shortName attribute equal to the license attribute name
I.e. lib.licenses.<foo>.shortName == "<foo>". The SPDX identifier (if
known) is kept in lib.licenses.<license>.spdxId.
2014-11-05 15:26:45 +01:00
Eelco Dolstra af0557cf82 Allow marking licenses as unfree
This allows licenses like the Amazon Software License to be identified
properly while still preventing packages with those licenses from
being distributed in the Nixpkgs/NixOS channels.
2014-11-05 15:15:00 +01:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Eelco Dolstra 858cfbc993 licenses.publicDomain: Fix typo 2014-11-05 14:52:05 +01:00
Eelco Dolstra ebfdfdb7e4 geeqie: Disable libchamplain dependency for now
It causes Geeqie to depend on both GTK+ 2 and 3, which is undesirable.
2014-11-05 14:45:52 +01:00
Eelco Dolstra 4942acc0d9 geeqie: Don't use fetchgit
Fetchgit considered harmful.
2014-11-05 14:45:49 +01:00
Eelco Dolstra 1aafb0a700 Revert "geeqie: xxd is required as build dependency"
This reverts commit 852f0bf2d4. Geeqie
builds fine without vim.
2014-11-05 14:45:20 +01:00
Rob Vermaas af2a19426b Merge pull request #4845 from proger/ec2-ami-tools-1.5.6
ec2-ami-tools -> 1.5.6, updated license & homepage
2014-11-05 14:30:45 +01:00
Vladimir Kirillov e10a8b7318 ec2-ami-tools -> 1.5.6, updated license & homepage 2014-11-05 15:28:52 +02:00
Rob Vermaas a1fd333816 Add locustio, msgpack-python. Upgraded requests2. 2014-11-05 14:27:38 +01:00
Pascal Wittmann 852f0bf2d4 geeqie: xxd is required as build dependency 2014-11-05 13:52:58 +01:00
wmertens e13f15b43a Merge pull request #4839 from cdepillabout/fcitx-with-plugins-2
Create wrapper package for fcitx with plugins.
2014-11-05 13:44:44 +01:00
Vladimír Čunát 66ae2a5322 Revert "syslinux: disable parallel building"
The change fixed nothing. I'm sorry, I confused the platforms when testing.
The actual problem was fixed by peti.
This reverts commit e682e8018c.
2014-11-05 13:24:01 +01:00
Domen Kožar 50ad7c2125 Merge pull request #4843 from offlinehacker/pkgs/selenium/update_chrome_opera
selenium-server-standalone: update -> 2.44, fix opera, create binary, chrome support
2014-11-05 13:15:54 +01:00
Jaka Hudoklin 511a101030 pythonPackages.selenium: update 2.39 -> 2.44 2014-11-05 13:05:02 +01:00
Jaka Hudoklin 9fffaf43ba selenium-server-standalone: update -> 2.44, fix opera, create binary, chrome support 2014-11-05 13:02:59 +01:00
Eelco Dolstra 876fa6a6a6 Fix unstable job evaluation 2014-11-05 13:00:26 +01:00
Mateusz Kowalczyk 6e726e1348 sxiv: use https 2014-11-05 11:33:45 +00:00
Vladimír Čunát c0e2aceef4 fontconfig: patch and document 2014-11-05 12:12:30 +01:00
Mateusz Kowalczyk a8e2e80bcd xsokoban: fix eval 2014-11-05 09:49:37 +00:00
Mateusz Kowalczyk 7e4e091e0b Merge pull request #4841 from AndersonTorres/master
Youtube-dl: upgrade to 2014.11.04
2014-11-05 09:39:04 +00:00
Evgeny Egorochkin ac8c944332 add myself as a maintainer 2014-11-05 11:35:32 +02:00