Commit graph

859 commits

Author SHA1 Message Date
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Domen Kožar f9ad40a39b Merge pull request #1443 from ttuegel/kde-gtk-config
add kde-gtk-config-2.2.1
2014-01-02 12:29:06 -08:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Thomas Tuegel 8d381dd586 add kde-gtk-config-2.2.1 2014-01-01 09:47:16 -06:00
Song Wenwu b8917d548e add dvtm 0.10 2014-01-01 21:55:49 +08:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát 34a7256820 coreutils: fix build (race condition) 2013-12-27 20:53:53 +01:00
Vladimir Still b345bdf5d2 tmpwatch: Add platforms to meta (unix).
According to web pages of tmpwatch it seems that it can be build on
unixes (Mac OS X, solaris). Not much information is here though.
2013-12-26 10:56:00 +01:00
Vladimír Čunát 50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Mathijs Kwik c9cf6ecd40 bogofilter: get rid of bdb alias 2013-12-23 10:25:16 +01:00
Nixpkgs Monitor f9c701a2b8 youtubeDL: update from 2013.12.17.2 to 2013.12.20 2013-12-22 14:49:41 +02:00
Vladimír Čunát 2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Nixpkgs Monitor 22fb324c23 multitail: update from 5.2.12 to 5.2.13 2013-12-21 04:03:39 +02:00
Nixpkgs Monitor 7c3b70a2ff parcellite: update from 1.1.6 to 1.1.7 2013-12-21 02:28:28 +02:00
Nixpkgs Monitor d5bc459fe2 youtubeDL: update from 2013.12.11.2 to 2013.12.17.2 2013-12-21 02:28:26 +02:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor 46a632eef3 figlet: update from 2.2.4 to 2.2.5 2013-12-18 18:18:27 +02:00
Nixpkgs Monitor 8d2853102b ethtool: update from 3.10 to 3.11 2013-12-18 18:18:26 +02:00
Nixpkgs Monitor a699697f14 disper: update from 0.3.0 to 0.3.1 2013-12-18 18:18:24 +02:00
Nixpkgs Monitor a2b26be374 byobu: update from 5.37 to 5.68 2013-12-18 18:18:20 +02:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor 2e43a29ec8 less: update from 436 to 462 2013-12-16 01:36:19 +02:00
Nixpkgs Monitor e54c26a65c xdaliclock: update from 2.35 to 2.40 2013-12-16 01:36:18 +02:00
Nixpkgs Monitor f90e505d50 units: update from 1.86 to 2.02 2013-12-16 01:36:17 +02:00
Nixpkgs Monitor 8a0a1b7768 pg_top: update from 3.6.2 to 3.7.0 2013-12-16 01:36:17 +02:00
Nixpkgs Monitor d7a82dfe6f lockfileProgs: update from 0.1.16 to 0.1.17 2013-12-15 13:21:56 +02:00
Nixpkgs Monitor f95db595e7 ised: update from 2.2.2 to 2.5.0 2013-12-15 13:11:20 +02:00
Nixpkgs Monitor 17588191ec dmg2img: update from 1.6.4 to 1.6.5 2013-12-15 11:40:25 +02:00
Nixpkgs Monitor 186f5f5f05 convmv: update from 1.14 to 1.15 2013-12-15 10:46:53 +02:00
Nixpkgs Monitor f7b64d0e66 testdisk: update from 6.13 to 6.14 2013-12-14 21:23:23 +02:00
Nixpkgs Monitor 0be455e0e4 youtubeDL: update from 2013.12.08.1 to 2013.12.11.2 2013-12-13 20:56:36 +02:00
Vladimir Still 6ffa9261f9 tmpwatch: Add package. 2013-12-13 20:56:35 +02:00
Nixpkgs Monitor aef9ae72d0 bogofilter: update from 1.1.7 to 1.2.4, potentially fixes CVE-2012-5468 2013-12-12 23:50:47 +02:00
Nixpkgs Monitor f453b1fd03 gnuvd: update from 1.0.10 to 1.0.12 2013-12-12 03:11:35 +02:00
Peter Simons 900786ab37 Fix more evaluation errors on Hydra. 2013-12-11 12:08:19 +01:00
Vladimír Čunát 089da3ee5c Merge master into x-updates
Conflicts (simple):
	pkgs/top-level/all-packages.nix
2013-12-10 13:00:02 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Evgeny Egorochkin 328d59eab6 add meta.repositories.git to several packages 2013-12-10 01:07:30 +02:00
Nixpkgs Monitor d79177cc20 youtubeDL: update from 2013.10.23.2 to 2013.12.08.1 2013-12-09 10:42:07 +02:00
Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01:00
Peter Simons 125bf9e488 aescrypt: limit meta.hydraPlatforms to Linux
Builds on other platforms such as FreeBSD fail.
2013-12-06 19:29:22 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Nixpkgs Monitor 090d51cb37 bogofilter: update from 1.1.6 to 1.1.7, potentially fixes CVE-2012-5468 2013-12-04 06:12:46 +02:00
Vladimír Čunát d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00
Moritz Ulrich c71d6f3b1a g500-control: Add myself as maintainer
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-29 11:47:00 +01:00
Rickard Nilsson e5f631883e keychain: Add missing binaries to PATH 2013-11-28 12:52:32 +01:00
Domen Kožar 945bcfad30 add ldapvi: interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor. 2013-11-28 00:15:14 +01:00
Vladimír Čunát b5fba47147 Merge branch master into x-updates
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
Bjørn Forsman 325894eb1b smc: new package
SMC is a state machine compiler. It generates state machine code from
text input files (state diagrams).

Homepage: http://smc.sourceforge.net/
2013-11-23 00:11:23 +01:00
Jason "Don" O'Conal c987f5c14c ttmkfdir: update URL (close #1244) 2013-11-20 22:48:12 +01:00