Commit graph

14766 commits

Author SHA1 Message Date
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
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
s1lvester 0b22104c1d keepassx2-http: init at 2.0.2 (#18039) 2016-08-29 00:02:19 +00:00
Jörg Thalheim a141f15f46 gimp: fix python plugins (#18061) 2016-08-28 23:41:17 +00:00
Joachim Fasting 20e228a1e1
oneteam: port to stdenv.mkDerivation
https://github.com/NixOS/nixpkgs/issues/4210
2016-08-29 01:10:01 +02:00
obadz 92d929c884 Merge branch 'master' into staging 2016-08-28 14:48:02 +01:00
Graham Christensen 1a64734bc6 Merge pull request #18031 from ambrop72/kdevelop5.0
kdevelop: Init at 5.0
2016-08-28 08:58:21 -04:00
obadz c7142c1aa3 Merge branch 'master' into staging 2016-08-28 13:33:13 +01:00
Ambroz Bizjak 529fbe05a3 kdevelop: Init at 5.0
Doesn't use Okteta yet.
2016-08-28 14:15:54 +02:00
David Guibert 21f2f30740 virtualbox: 5.0.20 -> 5.0.26 2016-08-28 13:45:49 +02:00
obadz 57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
Gabriel Ebner 497b3cabcc libqalculate, qalculate-gtk: 0.9.8 -> 0.9.9 2016-08-28 10:40:33 +02: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
Nikolay Amiantov df27c35e9a navit: fix build 2016-08-28 01:04:18 +03:00
Nikolay Amiantov 5eaacbb981 xsw: fix build 2016-08-28 01:04:18 +03:00
Nikolay Amiantov 1db4cb750c gravit: fix build 2016-08-28 01:04:18 +03:00
Robin Gloster 29c5ccea4a
xen: remove obsolete substituteInPlace 2016-08-27 21:54:30 +00:00
Robin Gloster 9f80e55428
openmodelica: disable format hardening 2016-08-27 21:54:17 +00:00
Robin Gloster 191896e63a
qfsm: disable format hardening 2016-08-27 21:53:49 +00:00
Robin Gloster c0e42fe741
imv: add fontconfig dependency 2016-08-27 21:53:27 +00:00
Robin Gloster a2a337c562
gksu: disable format hardening 2016-08-27 21:13:03 +00:00
Gabriel Ebner 5f0db537df Merge pull request #18037 from patjouk/update-jabref
jabref: 3.5 -> 3.6
2016-08-27 17:48:33 +02:00
Rok Garbas 1102352a79 Merge pull request #17906 from garbas/neovim-0.1.5-update
neovim: 0.1.4 -> 0.1.5 (and related dependencies)
2016-08-27 17:44:34 +02:00
Vladimír Čunát f86392bfbe chromium: fixup share/share
Reported on https://github.com/NixOS/nixpkgs/issues/11501#issuecomment-164383204
2016-08-27 17:38:25 +02:00
Vladimír Čunát 069120110d Merge #18013: gnumeric: 1.12.26 -> 1.12.32
It seems fine on Linux, except for gtk3 theming problems but that looks
the same as before the update.
2016-08-27 17:18:05 +02:00
patjouk b2295f70db jabref: 3.5 -> 3.6 2016-08-27 16:28:55 +02:00
Lluís Batlle i Rossell 8d4de4fe4f Updating mumble to 1.2.16. 2016-08-27 15:46:33 +02:00
Joachim F 739261f3bc Merge pull request #18028 from rnhmjoj/imv
imv: fix failing build
2016-08-27 12:23:45 +02:00
Robin Gloster e49117c5ef Merge pull request #18032 from erikryb/master
neomutt: 20160723 -> 20160827
2016-08-27 09:26:00 +00:00
Joachim F cb2bb72de5 Merge pull request #17996 from Ptival/vscode-1.4.0
vscode: 1.2.1 -> 1.4.0
2016-08-27 10:51:54 +02:00
Erik Rybakken 5212eb3882 neomutt: 20160723 -> 20160827 2016-08-27 10:37:53 +02:00
rnhmjoj f0daeb575a
imv: fix failing build 2016-08-27 06:42:44 +02:00
Frederik Rietdijk cbd8d138bd kdeconnect: 0.9g -> 1.0 2016-08-26 21:35:30 +02:00
Robin Gloster e0deed0110
ghc: add comment to relocation patch 2016-08-26 15:19:37 +00:00
Eelco Dolstra c2fb3490c9 firefox: 48.0.1 -> 48.0.2 2016-08-26 16:46:34 +02:00
Joachim F 9f01bb755f Merge pull request #17987 from taku0/firefox-bin-48.0.2
firefox-bin: 48.0.1 -> 48.0.2
2016-08-26 15:44:04 +02:00
Franz Pletz d70f83e7e9
gitlab: 8.10.6 -> 8.11.2 2016-08-26 15:03:19 +02:00
Vincent Laporte 3a710c068f gnumeric: 1.12.26 -> 1.12.32
goffice: 0.10.26 -> 0.10.32
2016-08-26 13:36:58 +02:00
Vincent Laporte 94b245138d gnumeric: fix on darwin 2016-08-26 13:36:58 +02:00
Domen Kožar 9d22624eb0 Merge pull request #17976 from despairblue/patch-1
atom: 1.9.6 -> 1.9.9
2016-08-26 12:05:41 +02:00
Michael Raskin b83dee4a6c libreoffice: comment out a fragile test; the problem it checks for does not seem to appear in the built binary 2016-08-26 10:35:52 +02:00
Nikolay Amiantov 211adbeb38 zathura: cleanup and hide zathuraCollection
Fixes #17787.
2016-08-26 03:45:58 +03:00
Graham Christensen 355cc31229 Merge pull request #17962 from vbgl/inkscape-darwin
inkscape: fix on darwin (fixes #15768)
2016-08-25 18:14:42 -04:00
Valentin Robert 4370f2583f vscode: 1.2.1 -> 1.4.0 2016-08-25 13:16:51 -07:00
Lluís Batlle i Rossell 3aa8f23aec fossil: update to 1.35 2016-08-25 17:27:55 +02:00
Vincent Laporte 42701ee33e inkscape: fix on darwin 2016-08-25 15:39:53 +02:00
Graham Christensen 8512747ca5 Merge pull request #17980 from puffnfresh/package/hipchat
hipchat: 4.26.0.1655 -> 4.26.0.1657
2016-08-25 08:16:10 -04:00
Graham Christensen be29e814c1 Merge pull request #17981 from phanimahesh/realpine
realpine: allow using passfile
2016-08-25 08:09:27 -04:00