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
Tobias Geerinckx-Rice
a4e9662297
packagekit: 1.1.0 -> 1.1.1
2016-05-16 20:27:31 +02:00
Georges Dubus
7747d535b1
nox: update to 0.0.3
2016-05-16 19:45:51 +02:00
Tuomas Tynkkynen
d359ce90e8
nix-prefetch-scripts: Use correct output of 'nix'
2016-05-14 21:10:23 +03:00
Tobias Geerinckx-Rice
2cf6c67d15
dpkg: 1.18.6 -> 1.18.7
2016-05-14 16:01:33 +02:00
Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Tuomas Tynkkynen
24b046ce05
rpm: Fix python3 detection hack
...
Commit 5dff3c4b68
made rpm use autoreconfHook, so the patch that we
are making to `configure` gets lost when the file is regenerated.
To fix this, just patch the equivalent string in the `configure.ac` file
instead.
Fixes #15287
2016-05-07 17:55:32 +03:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
Tobias Geerinckx-Rice
e58cd82e87
dpkg: 1.18.5 -> 1.18.6
2016-05-05 02:16:56 +02:00
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tobias Geerinckx-Rice
6b6463dbd2
dpkg: 1.18.4 -> 1.18.5
2016-05-03 02:01:12 +02:00
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Dan Peebles
5dff3c4b68
rpm: stop build from trying to create /var/tmp, which breaks in sandboxed builds
2016-05-01 18:09:30 +00:00
Dan Peebles
6af34124a4
libhif, rpm-ostree: fix broken meta
...
Forgot to add stdenv.lib to scope!
2016-04-30 16:23:53 +00:00
Dan Peebles
c9be29c5fb
libhif: add meta and add myself as a maintainer
2016-04-30 16:03:47 +00:00
Dan Peebles
df8971ba40
librepo: add meta and add myself as a maintainer
2016-04-30 16:01:26 +00:00
Dan Peebles
48fb16ffbf
createrepo_c: add meta and myself as a maintainer
2016-04-30 02:15:04 +00:00
Dan Peebles
c048f7db7b
rpm: fix state directory in build
...
Prior to this change, it was was defaulting to storing its state in
its store path, which didn't make any sense.
Also added myself as a maintainer
2016-04-30 02:07:50 +00:00
Tobias Geerinckx-Rice
88f9f8b9ce
packagekit: 1.0.8 -> 1.1.0
2016-04-29 21:42:35 +02:00
Dan Peebles
d70752cce9
libhif: init at 87e4cb24
...
The latest released version is too old for my needs, so I'm picking
a git commit that works. I'll update it when they release a new one.
2016-04-29 03:06:02 +00:00
Dan Peebles
fcf37351bd
librepo: init at 1.7.18
2016-04-29 02:46:16 +00:00
Dan Peebles
bd8a1258bf
createrepo_c: init at 0.10.0
2016-04-29 02:40:51 +00:00
Dan Peebles
fbbf910e23
rpm: add lua support and a few propagatedBuildInputs
...
It turns out that a surprising number of common packages use lua
scripts in RPM files, and not having lua can lead to obscure failures.
The propagatedBuildInputs stuff makes the librpm stuff more useful,
since some of its headers didn't work without extra buildInputs before.
2016-04-29 02:29:02 +00:00
Frederik Rietdijk
d5e6a4494a
Python: use PyPI mirror ( #15001 )
...
* mirrors: add pypi
* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Eelco Dolstra
21a2f2ba3b
nix: Add a "dev" output
...
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
2016-04-18 21:13:18 +02:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00:00
Domen Kožar
d7034e6d5f
nixUnstable: bump
...
(cherry picked from commit bb6d3c16d3a851c646c0d1fc6976b546c766a227)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-27 20:24:43 +01:00
Tobias Geerinckx-Rice
99c4f143d9
debian-devscripts: rename from deprecated debian_devscripts
2016-03-24 20:24:00 +01:00
Ludovic Courtès
5dab370d77
Remove Guix.
2016-03-23 13:33:29 +01:00
Sander van der Burg
7ed3dc6cfc
dysnomia: bump to version 0.5.1
2016-03-20 15:21:42 +00:00
Vladimír Čunát
f9cae4f6dc
fpm: init at 1.4.0
...
/cc #14061 .
2016-03-20 11:56:07 +01:00
Domen Kožar
8e398a88a1
nixUnstable: point to latest 1.12pre
2016-03-17 13:03:36 +00:00
Sander van der Burg
0f46200f26
disnixos: bump to version 0.4.1
2016-03-16 13:27:54 +00:00
Vladimír Čunát
2cbe6bb3f0
nix: split man output from doc
2016-03-08 09:59:31 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
cb3d27df93
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Valérian Galliat
269d0864b5
nix-prefetch-scripts: explicitly depend on Nix
...
Otherwise, a call to, for example, nix-prefetch-git, in a nix-shell --pure or
nix-build phase would result in an error such as:
Switched to a new branch 'fetchgit'
removing `.git'...
/nix/store/7qvjji7kbd033nsyxlpiiiam61a44yz9-nix-prefetch-git/bin/.nix-prefetch-git-wrapped: line 374: nix-hash: command not found
2016-02-29 18:38:59 -05:00
Robin Gloster
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
Robin Gloster
ea84b3a915
clib: turn off fortify hardening
2016-02-19 21:15:59 +00:00
Frederik Rietdijk
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
Franz Pletz
41698c9efa
Merge branch 'master' into hardened-stdenv
2016-02-15 20:05:29 +01:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Eelco Dolstra
e674356c46
nix: Fix indentation
2016-02-12 16:10:59 +01:00
Eelco Dolstra
aa31d99d29
nix: 1.11.1 -> 1.11.2
2016-02-12 15:20:27 +01:00
Robin Gloster
6be9164b97
checkinstall: turn off fortify
2016-02-09 01:03:24 +00:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Sander van der Burg
a6bda1a62a
disnix: bump to version 0.5
2016-01-27 22:32:34 +00:00
Eelco Dolstra
42e53ba62c
nix: 1.10 -> 1.11.1
2016-01-26 17:00:15 +01:00
Tobias Geerinckx-Rice
9fb8020e4e
Add version attribute where maintainers |= nckx
...
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00