3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

858 commits

Author SHA1 Message Date
Michael Raskin 546315d933 Update/fix merkaartor to 0.18.1 2014-02-02 12:54:46 +04:00
Rob Vermaas d5b2ea44f3 Merge pull request #1622 from urv/master
calibre: upgrade from 1.20.0 to 1.21.0
2014-01-31 01:46:36 -08:00
Petr Rockai 2062abfd4f Merge branch 'yubikey' of git://github.com/Calrama/nixpkgs 2014-01-29 18:54:07 +01:00
Moritz Maxeiner b0d2f0e3f0 Add myself as a maintainer for ykpers and libyubikey 2014-01-29 18:05:17 +01:00
Eelco Dolstra 91ab556236 amdadl-sdk: Don't build on Hydra
Since it uses requireFile, it won't build.  Likewise for cgminer which
depends on amdadl-sdk.
2014-01-29 11:53:39 +01:00
Arvin Moezzi 03857fe2ec calibre: upgrade from 1.20.0 to 1.21.0 2014-01-29 02:26:11 +01:00
Petr Rockai 4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Rob Vermaas 3f56d9f4b4 Add keepassx 2.0alpha5, contributed by Thomas Tuegel. 2014-01-27 21:55:04 +01:00
Vladimír Čunát bf8b81f538 lyx: bugfix update 2.0.6 -> .7 2014-01-26 00:59:59 +01:00
Moritz Maxeiner 8f9300fb0e Add ykpers (aka yubikey-personalization) package 2014-01-25 03:17:06 +01:00
Aristid Breitkreuz 5acc2fef25 fix keepassx under gcc 4.8 2014-01-21 22:20:21 +01:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Arvin Moezzi da4dbbfd11 calibre: upgrade from 1.17.0 to 1.20.0 2014-01-19 22:04:41 +01:00
Vladimír Čunát 83a2e8554b spacefm: fix schema-crash (in preferences), nitpicks
I also did some style changes to be closer to most in nixpkgs.
2014-01-19 12:11:19 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons 2719254e46 ikiwiki: update to version 3.20140102 2014-01-13 17:05:45 +01:00
Peter Simons 7148f50ef3 fetchmail: update to version 6.3.26 2014-01-13 17:05:45 +01:00
Vladimír Čunát a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Arseniy Seroka 32e08f53ce spaceFM: add package 2014-01-11 19:25:23 +01:00
Peter Simons 066abcc047 xmobar: re-generate with cabal2nix 2014-01-11 14:52:13 +01:00
Arseniy Seroka 8b95f0ed78 xmobar alsa support 2014-01-11 14:52:13 +01:00
Vladimír Čunát 80396084b9 kde.krusader: fix build with newer gcc versions (-fpermissive) 2014-01-05 11:48:09 +01:00
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
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Marius Rejdak 2da33b4ecf tint2 nixpkg 2013-12-29 23:35:46 +01:00
Michael Raskin c356b67ce7 Merge pull request #1414 from coroa/gammu
Add gammu version 1.33.0 - a library and command line utility for interfacing phones
2013-12-29 07:02:35 -08:00
Jonas Hoersch 4418c1e1d7 Add gammu version 1.33.0 - a library and command line utility for interfacing phones 2013-12-29 15:13:23 +01: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
Arvin Moezzi 8fc2319320 calibre: upgrade from 1.15.0 to 1.17.0 2013-12-25 14:51:08 +01:00
Mathijs Kwik 82131d5013 clucene_core: switch to versioning scheme to make overriding easier 2013-12-23 15:48:35 +01:00
Mathijs Kwik c5d05a5652 jigdo: depend on db4 instead of db45 2013-12-23 10:25:15 +01:00
Nixpkgs Monitor c23bf0548e xterm: update from 281 to 300 2013-12-23 03:27:46 +02:00
Nixpkgs Monitor bb1b1bb1a5 xchm: update from 1.18 to 1.23 2013-12-21 02:28:27 +02:00
Nixpkgs Monitor 3e2fc2338c xfontsel: update from 1.0.2 to 1.0.5 2013-12-21 02:28:27 +02:00
Evgeny Egorochkin c857d90619 nut: update from 2.6.5 to 2.7.1; fix nut-scanner 2013-12-21 02:28:24 +02:00
Nixpkgs Monitor c7a7cfc9d2 calibre: update from 1.14.0 to 1.15.0 2013-12-18 18:18:20 +02:00
Nixpkgs Monitor e66756f350 bitcoin: update from 0.8.5 to 0.8.6 2013-12-18 18:18:19 +02:00
Nixpkgs Monitor b07899be32 bibletime: update from 2.9.1 to 2.9.2 2013-12-18 18:18:19 +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 a49d2ee8b5 hello: update from 2.8 to 2.9 2013-12-15 13:05:36 +02:00
Michael Raskin fc3a316d55 Merge pull request #1361 from iyzsong/ranger
add ranger 1.6.1
2013-12-14 22:51:15 -08:00
Nixpkgs Monitor 48949544e5 xlsfonts: update from 1.0.2 to 1.0.4 2013-12-14 00:44:09 +02:00
Jaka Hudoklin faf82de7d2 cgminer: update to 3.7.2 2013-12-13 10:16:16 +01:00
Song Wenwu 85372d5fba add ranger 1.6.1 2013-12-12 11:04:38 +08:00
Nixpkgs Monitor b35d255286 gkrellm: update from 2.3.4 to 2.3.5 2013-12-12 03:11:34 +02:00
Peter Simons 2bc29e4e6d Merge branch 'master' into stdenv-updates. 2013-12-10 22:29:20 +01:00
Arvin Moezzi 36cb2af057 calibre: upgrade 1.13.0 -> 1.14.0
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-10 16:45:49 +00: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
Andrew Morsillo 3814415be4 Add robomongo, a GUI for exploring mongodb data and building queries. 2013-12-06 19:40:40 +01:00
Lluís Batlle i Rossell e5b0867492 Updating zathura to 0.2.6 2013-12-05 10:44:49 +01:00