Commit graph

2543 commits

Author SHA1 Message Date
Joachim F c2841f1c1d Merge pull request #18175 from ebzzry/emem-0.2.28
emem: 0.2.27 -> 0.2.28
2016-09-01 15:50:52 +02:00
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
Rommel M. Martinez b5872b13f5 emem: 0.2.27 -> 0.2.28 2016-09-01 13:08:35 +08:00
Tuomas Tynkkynen b691bc22ef golden-cheetah: Use 'dev' output of qttools 2016-08-31 19:37:05 +03:00
Tuomas Tynkkynen 6086142ece mupdf: Split 'dev' output 2016-08-31 13:12:11 +03:00
Tuomas Tynkkynen 96dae0f286 xxkb: Fix 'lib.optional' use 2016-08-31 12:54:28 +03:00
Matthias Beyer 87cecbeba6 timewarrior: 1.0.0.beta1 -> 1.0.0 (#18120) 2016-08-30 14:19:19 +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
Luca Bruno 5c5fd1cb60 Merge pull request #18096 from leenaars/wavrsocvt
wavrsocvt: init at 1.0.2.0
2016-08-30 11:41:08 +02:00
Luca Bruno cca72718b3 Merge pull request #18095 from Mic92/valauncher
valauncher: init at 1.2
2016-08-30 11:36:42 +02:00
Jörg Thalheim 2de7e30c0f valauncher: init at 1.2 2016-08-30 10:04:43 +02:00
Tuomas Tynkkynen aef35c52f0 treewide: Fix output references to libX11 2016-08-30 03:40:23 +03:00
Tuomas Tynkkynen 048a30e4e4 treewide: Fix dev references to libxml2 2016-08-30 03:02:32 +03:00
Michiel Leenaars fe87145c58 wavrsocvt: init at 1.0.2.0 2016-08-29 22:57:14 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz b74793bd1c Merge branch 'master' into staging
Conflicts:
	pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
Kranium Gikos Mendoza 1cabee5973 gpxsee: 2.16 -> 2.17 (#18075) 2016-08-29 01:38:12 +00: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
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
Robin Gloster a2a337c562
gksu: disable format hardening 2016-08-27 21:13:03 +00:00
Frederik Rietdijk cbd8d138bd kdeconnect: 0.9g -> 1.0 2016-08-26 21:35:30 +02:00
Nikolay Amiantov 211adbeb38 zathura: cleanup and hide zathuraCollection
Fixes #17787.
2016-08-26 03:45:58 +03:00
Thomas Tuegel df8dd670b5 keybase: replace obsolete client
Fixes #17755.

As noted in the issue tracker, we have been carrying two versions of the
keybase client: the old node.js client and the new Go client. The old
client is unusable, but takes up the valuable `keybase` name. This
revision removes the old client entirely and replaces it with the new one.
2016-08-24 17:21:36 -05: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
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Rommel M. Martinez a01d77b864 emem: 0.2.26 -> 0.2.27 2016-08-23 11:02:36 +08:00
Tuomas Tynkkynen 07491d68c3 treewide: Fix output references to ncurses 2016-08-23 04:53:24 +03:00
Tuomas Tynkkynen df4ebf5f1a treewide: Fix output references to gnome3.gtk 2016-08-23 04:53:01 +03:00
Tuomas Tynkkynen 005b644b30 translate-shell: Fix curl reference 2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen a18ee4acb7 treewide: Make explicit that 'dev' output of boost is used
Also fix one incorrect output in geant.
2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen a6f6b30851 treewide: Make explicit that 'dev' output of libxslt is used 2016-08-23 03:52:06 +03:00
Tuomas Tynkkynen 463b0a181e treewide: Make explicit that 'dev' output of freetype is used 2016-08-23 03:52:05 +03:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Nikolay Amiantov 5041e0eea9 blender: fix build, don't install builtin Python 2016-08-22 16:39:33 +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
obadz ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Luca Bruno 4916c11ec2 Merge pull request #17898 from RamKromberg/fix/vala_namespace
remove vala namespace
2016-08-21 20:31:44 +01:00
Joachim F b374239e20 Merge pull request #17874 from acowley/with
with: init at 0.0.1
2016-08-21 20:57:08 +02:00
Joachim F 1a09bfa75c Merge pull request #17894 from ebzzry/emem-0.2.26
emem: 0.2.25 -> 0.2.26
2016-08-21 20:47:24 +02:00
Markus Hauck 7e797d072b urxvt-theme-switch: Add description and homepage 2016-08-21 19:47:42 +02:00
Ram Kromberg 214824b99b synapse: vala -> vala_0_23 2016-08-21 20:02:08 +03:00
Ram Kromberg 8dad55a70a finalterm: vala -> vala_0_23 2016-08-21 20:02:07 +03:00
Ram Kromberg 98b087e413 font-manager: vala -> vala_0_32 2016-08-21 20:02:06 +03:00
Ram Kromberg a57cd70a11 pdfpc: vala -> vala_0_26 2016-08-21 20:02:05 +03:00
Rommel M. Martinez 2818b34537 emem: 0.2.25 -> 0.2.26 2016-08-21 23:30:43 +08:00
obadz 68936edfb3 Merge branch 'master' into staging 2016-08-21 12:03:41 +01:00