Commit graph

653 commits

Author SHA1 Message Date
Sander van der Burg
792f50fe7c nixui: migrate to node2nix 2016-09-01 12:14:20 +00: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
Vladimír Čunát
3996aa8953 nix: maintenance 1.11.2 -> 1.11.3
Fixes #17804.
2016-08-29 22:44:01 +02:00
Tuomas Tynkkynen
b2e701cb1d nix-repl: Use 'dev' output of nix 2016-08-29 21:30:52 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03: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
Jaka Hudoklin
869cfddcfc Merge pull request #17888 from peterhoeg/fpm_162
fpm: 1.4.0 -> 1.6.2
2016-08-24 23:39:51 +02:00
Robin Gloster
8cd050f6ba rpm: remove hack
elfutils now adds a eu- prefix to avoid collisions
2016-08-24 19:23:42 +00: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
Ram Kromberg
1730151d97 packagekit: vala -> vala_0_23 2016-08-21 20:18:21 +03:00
Peter Hoeg
9aa2515d14 fpm: 1.4.0 -> 1.6.2 2016-08-21 20:28:39 +08:00
Aneesh Agrawal
e2ddcc938f nix: remove unused unstable.nix file 2016-08-18 23:14:07 -04:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Domen Kožar
49222660fc Merge pull request #17256 from matthewbauer/patch-4
Travis fixes
2016-08-13 14:17:59 +02:00
Luca Bruno
a10886dfdc Merge pull request #17514 from matthewbauer/packagekit-1.1.3
packagekit: git -> 1.1.3
2016-08-12 22:03:55 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Matthew
1c870804d1 opkg: add libxml2 as input
This caused the failures seen here:

http://hydra.nixos.org/build/38313838/nixlog/1
2016-08-09 21:24:59 +00:00
Matthew Bauer
bc49483bab packagekit: git -> 1.1.3
Update packagekit to a real release instead of just a random commit.
2016-08-04 18:05:31 +00:00
Tobias Geerinckx-Rice
80cae1f055
dpkg: 1.18.9 -> 1.18.10 2016-08-04 00:25:20 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
db35d7b8ab koji, opensp: Some meta fixes 2016-08-02 21:17:44 +03:00
Matthew Justin Bauer
a30a34b6f3 nox: add git as build input
also: add nox as separate target to make build log more quiet
2016-07-29 20:54:02 -05:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Rob Vermaas
48c32dc0b7 nixops: update to 1.4
(cherry picked from commit 9909d31602f6242259bcf7d31e88107fa5f1fb5f)
2016-07-19 14:33:52 +00:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Joachim F
ed50ef318b Merge pull request #15848 from matthewbauer/packagekit
Add in PackageKit
2016-07-16 13:29:08 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Domen Kožar
5789f5875f nix-repl: 2015-09-07 -> 2016-02-28 2016-07-11 14:00:28 +02:00
Tobias Geerinckx-Rice
ce5c51b406
dpkg: 1.18.8 -> 1.18.9 2016-07-06 19:42:45 +02:00
Tobias Geerinckx-Rice
12c055240d
dpkg: 1.18.7 -> 1.18.8 2016-07-06 15:56:33 +02:00
Matthew Bauer
10fb846989 packagekit: add myself as maintainer 2016-07-05 20:27:28 +00:00
Matthew Bauer
4e50880c82 packagekit: add latest from hughsie's github repo
- currently pulled in from Git until the next release of PackageKit
  has Nix support
- also: add in a service module to start packagekit properly
- nixos service can be enabled via services.packagekit.enable
- packagekit requires nixunstable to build properly
2016-07-05 20:26:59 +00:00
Georges Dubus
a865e34f51 nox: update to 0.0.4 2016-07-04 13:40:40 +02:00
William Casarin
c81b4cde58 clib: 1.4.2 -> 1.7.0 (#16656) 2016-07-02 12:46:57 +02:00
zimbatm
da253439ed gx: add missing meta 2016-06-19 13:45:16 +01:00
Aristid Breitkreuz
6163428316 Merge pull request #16271 from zimbatm/gx
Gx
2016-06-18 20:30:03 +02:00
Sander van der Burg
fcf72b82ae DisnixWebService: 0.5 -> 0.6 2016-06-17 08:15:32 +00:00
Sander van der Burg
16bbfe893b disnixos: 0.4.1 -> 0.5 2016-06-16 22:16:55 +00:00
Sander van der Burg
b4315e523f disnix: 0.5 -> 0.6 2016-06-16 21:01:45 +00:00
Sander van der Burg
c5faa7c83d dysnomia: 0.5.1 -> 0.6 2016-06-16 15:45:50 +00:00
Joachim Fasting
c05271adf9
nix-serve: fix meta eval
Introduced in d20a8ddea8
2016-06-16 15:54:29 +02:00
Allen Nelson
d20a8ddea8
nix-serve: set PATH
joachifm: also set `dontBuild = true`; `false` doesn't make any sense if
the intent is to skip the build phase.

Closes #16221
2016-06-16 15:00:04 +02:00
zimbatm
996a2b54c4 gx-go: init at 20160611 2016-06-15 22:41:29 +01:00
zimbatm
e1a487fa8f gx: init at 20160601 2016-06-12 23:14:42 +01:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Frederik Rietdijk
47d220818c Merge pull request #15503 from madjar/master
nox: update to 0.0.3
2016-05-16 21:34:14 +02:00