Frederik Rietdijk
e56832d730
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-22 17:23:24 +02:00
Kirill Boltaev
0c34b202e3
nixops: explicitly specify python2
2016-10-19 18:51:44 +03:00
Frederik Rietdijk
582ab2cf4e
koji: use python2
2016-10-18 23:16:07 +02:00
Vladimír Čunát
061758490f
Merge branch 'master' into staging
...
... to get the openssl mass rebuild: 942dbf89c
.
2016-10-14 13:16:11 +02:00
zimbatm
6351c4d24b
Merge pull request #19180 from zimbatm/bundler-env-bins
...
Bundler env bins
2016-10-14 11:51:23 +01:00
Vladimír Čunát
6eeea6effd
Python: more evaluation fixups.
2016-10-14 00:03:12 +02:00
Dan Peebles
f35ab9c2f8
rpm-ostree: 2016.1 -> 2016.10
...
This also updates a bunch of its dependencies to enable the update,
and gets rid of libhif because upstream stopped maintaining it as
such, instead using it internally in other projects until they can
agree on an interface for it. Nothing seemed to be using libhif so
I'm not too concerned about removing it.
2016-10-12 20:31:02 +00:00
zimbatm
16cf3cf687
fpm: simplify
2016-10-08 22:38:57 +01:00
Robert Helgesson
e8817a2d20
bash-completion: change attribute name
...
This changes the attribute name of bash-completion from `bashCompletion`
to `bash-completion`. Keeps `bashCompletion` as an alias for the new
name.
2016-09-28 17:46:29 +02:00
Graham Christensen
dad5651bd4
rpm: 4.12.0 -> 4.13.0-rc1 for CVEs
...
Null pointer deref & out of bound reads. See: https://lwn.net/Vulnerabilities/685287/
Fedora is shipping the rc1 as well.
re: https://github.com/NixOS/nixpkgs/pull/18975
2016-09-27 21:07:35 -04:00
Tuomas Tynkkynen
bb19e17d14
rpm: Split into multiple outputs
...
Patch away two things:
- %_includedir, %_oldincludedir, %_mandir, %_infodir macros from
lib/rpm/platform/*/macros to avoid cycles between outputs. Hopefully
anything doesn't really need those.
- Change %__ld, %__nm, %__objcopy, %__objdump in lib/rpm/macros to
refer to the commands in PATH. Should be safe as %__cc for instance is
already like that.
2016-09-19 16:09:34 +03:00
Tuomas Tynkkynen
48d7948808
rpm: Use list for configureFlags
2016-09-19 16:09:34 +03:00
Kamil Chmielewski
914e0e594c
buildGoPackage: deps.json -> deps.nix in NIXON
...
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541
* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Sander van der Burg
77b9abf78c
disnix: 0.6 -> 0.6.1
2016-09-13 19:47:19 +00:00
Sander van der Burg
2edb28ffc5
dysnomia: bump to version 0.6.1
2016-09-13 19:41:54 +00:00
Eelco Dolstra
6a9fb8b9e0
nix: Enable install check
...
Looks like this got disabled accidentally in
ec5b66eb4a
.
2016-09-12 23:34:08 +02:00
Eelco Dolstra
f2ddf2a9be
nix: 1.11.3 -> 1.11.4
2016-09-06 16:15:22 +02:00
Benjamin Staffin
2e88851c61
dpkg: Fix the build on Darwin
...
There are still some bugs and quirks, but this gets dpkg building at
least, and some parts of it are useful.
2016-09-05 01:14:36 -04:00
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