3c57e770cf
Only build libseccomp on supported systems
2018-02-24 23:05:08 -05:00
d12c9911df
Merge remote-tracking branch 'origin/master' into nix-2.0
2018-02-22 17:28:51 +01:00
fab12188b8
Doh
2018-02-22 17:26:52 +01:00
bae19ef9f6
Doh
2018-02-22 17:20:59 +01:00
32af695a22
nix: 1.11.16 -> 2.0
2018-02-22 17:03:27 +01:00
cbae401982
nixUnstable: bump for minor fix to unbreak seccomp builds
2018-02-19 12:28:09 -06:00
d1cb2ee899
nixUnstable: 2.0pre5951_690ac7c9 -> 2.0pre5967_623fcb07.
...
Important security patch for no-seccomp systems.
2018-02-19 12:10:28 -05:00
765194d7ab
nixUnstable: Disable seccomp support on RISC-V.
2018-02-18 09:02:10 -05:00
5a0eec1de1
nixUnstable: 2.0pre5950_3a5a241b -> 2.0pre5951_690ac7c9.
2018-02-18 09:02:10 -05:00
b5aaaf87a7
Merge staging and PR #35021
...
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
2018-02-16 09:13:12 +01:00
ce35114ee4
nixUnstable: 2.0pre5943_52c777a7 -> 2.0pre5950_3a5a241b
2018-02-15 16:22:21 -05:00
672bb6b4ab
Merge remote-tracking branch 'upstream/master' into HEAD
2018-02-14 21:30:08 +01:00
f73b358842
nixUnstable: Bump
2018-02-13 12:18:50 -05:00
5a802afb75
nix: doInstallCheck is disabled on cross already.
2018-02-13 09:44:59 -06:00
5d6e229ec0
nixUnstable: Enable cross-compilation
...
Older nix versions likely aren't feasible due to the perl dependency.
2018-02-13 09:44:58 -06:00
3aa61e33be
nix: simplify bzip2 dependency, this is handled properly now
2018-02-13 09:44:30 -06:00
afe517acd5
nix: 1.11 needs 'curl' on PATH so provide as nativeBuildInput.
2018-02-13 09:44:30 -06:00
e76849dca2
nixUnstable: 2.0pre5889_c287d731 -> 2.0pre5914_48c192ca
2018-02-07 19:32:12 +01:00
6ec60e8c44
busybox-sandbox-shell: extract basic shell to new attribute
...
Nix will use this shell if the attribute is present,
avoiding duplicating changes in the future.
2018-02-05 11:26:01 -06:00
74d928cf8b
nix: enable more features in busybox shell to resolve build failures
2018-02-05 09:19:54 -06:00
4faac207bc
nix: fix config for echo/test on newer busybox
...
Matches
2f1a1c5a49
2018-02-05 09:18:39 -06:00
294a4e6ea5
Use nixUnstable as the default temporarily
2018-02-05 13:49:24 +01:00
75a20284f4
nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731
2018-01-31 22:24:50 +01:00
ef351646ba
Revert "Restore "nixUnstable: rename to nix-unstable""
...
This reverts commit 695027f61c
2018-01-31 22:24:24 +01:00
533cc72d4d
nixUnstable: pre5849_74f75c85 -> pre5873_b76e282d
2018-01-23 16:07:25 -05:00
4c96412189
nixUnstable: pre5810_5d5b931f -> pre5849_74f75c85
2018-01-12 14:19:24 -05:00
137bf46ee7
nixUnstable: 1.12pre5788_e3013543 -> 1.12pre5810_5d5b931f
...
Fixes build after 3430b0e8595d5b931fb1
2017-12-14 18:34:36 +00:00
875eaf0821
nix: 1.11.15 -> 1.11.16
2017-12-12 17:46:21 +01:00
0e58684c41
nixUnstable: Remove unused dependencies
2017-12-08 16:01:06 +01:00
695027f61c
Restore "nixUnstable: rename to nix-unstable"
...
as discussed in bed3695848bed3695848
2017-12-08 11:17:33 +00:00
bed3695848
Revert "nixUnstable: rename to nix-unstable"
...
This commit effectively makes it impossible to upgrade to nixUnstable
with nix-env without mucking about with priorities, as you can't
uninstall the old nix transactionally with the new nix and if you
uninstall the old one first you no longer have nix at your disposal to
install the new one.
This reverts commit 9711aac642
2017-12-07 14:17:53 -05:00
0235f1249e
nixUnstable: Bump to pre5788_e3013543 for fetchGit bug fix
2017-12-07 14:02:03 -05:00
6ffafc78fb
Merge branch 'staging'
...
Main change: glibc: 2.25-x -> 2.26-y, containing security fixes,
and various features and deprecations. Unfortunately, some of the
latter still cause (transitively) a couple hundred newly failing jobs.
I'm not delaying anymore, so that we have the security fix on master.
I mainly patched gcc, llvm and icu, but I can't fix everything...
2017-11-07 16:00:35 +01:00
d2df286df7
nixUnstable: nix-1.12pre5663_c7af84ce -> nix-1.12pre5732_fd10f6f2
2017-11-07 12:25:17 +01:00
9711aac642
nixUnstable: rename to nix-unstable
2017-10-27 23:05:12 +00:00
5da5af56e1
nixUnstable: Bump for nix-shell interpreter bugfix
2017-10-19 19:25:08 -04:00
69607d7662
nixUnstable: Bump for fetchgit fixes
2017-10-17 13:59:44 -04:00
8efe90a3f4
nixUnstable: bump
2017-10-13 11:05:57 -04:00
db8a4a4ef5
nixUnstable: 1.12pre5619_346aeee1 -> 1.12pre5639_fda7b95c
2017-10-11 14:18:05 +02:00
6dad1f70ce
nix: 1.11.14 -> 1.11.15
2017-09-15 16:38:33 +02:00
b86fd340f0
nixUnstable: 1.12pre5511_c94f3d55 -> 1.12pre5619_346aeee1
2017-09-15 11:27:32 +02:00
79954b9d1f
nix: 1.11.13 -> 1.11.14
2017-08-31 11:00:09 +02:00
2eacddf0dc
treewide: homepage URL fixes ( #28475 )
...
* pgadmin: use https homepage
* msn-pecan: move homepage to github
google code is now unavailable
* pidgin-latex: use https for homepage
* pidgin-opensteamworks: use github for homepage
google code is unavailable
* putty: use https for homepage
* ponylang: use https for homepage
* picolisp: use https for homepage
* phonon: use https for homepage
* pugixml: use https for homepage
* pioneer: use https for homepage
* packer: use https for homepage
* pokerth: usee https for homepage
* procps-ng: use https for homepage
* pycaml: use https for homepage
* proot: move homepage to .github.io
* pius: use https for homepage
* pdfread: use https for homepage
* postgresql: use https for homepage
* ponysay: move homepage to new site
* prometheus: use https for homepage
* powerdns: use https for homepage
* pm-utils: use https for homepage
* patchelf: move homepage to https
* tesseract: move homepage to github
* quodlibet: move homepage from google code
* jbrout: move homepage from google code
* eiskaltdcpp: move homepage to github
* nodejs: use https to homepage
* nix: use https for homepage
* pdf2djvu: move homepage from google code
* game-music-emu: move homepage from google code
* vacuum: move homepae from google code
2017-08-22 20:50:04 +02:00
8a31137441
nixUnstable: 1.12pre5506_3162ad5f -> 1.12pre5511_c94f3d55
2017-07-21 12:52:57 +02:00
2780e2a780
nixUnstable: pre5413_b4b1f452 -> pre5506_3162ad5f
2017-07-19 11:06:06 +01:00
17642b5fd0
nix: 1.11.12 -> 1.11.13
2017-07-18 10:54:01 +02:00
40cf34aaae
nix: 1.11.11 -> 1.11.12
2017-07-13 16:37:11 +02:00
57a0224a42
nix: short TMPDIR for tests on Darwin
...
This fixes test failures due to overly long nix-daemon socket paths.
2017-07-04 21:48:59 +02:00
40be9738ab
nix: Don't use stdenv.cross
2017-06-28 21:29:07 -04:00
5446934b41
nix: 1.11.10 -> 1.11.11
...
(cherry picked from commit 7b1e936b24ca60810cdb6d46b68300cd179836f1)
2017-06-19 19:03:39 +02:00
0bffe03828
nix: 1.11.9 -> 1.11.10
2017-06-12 20:13:27 +02:00
3d4a8e1f84
nixUnstable: 1.12pre5350_7689181e -> 1.12pre5413_b4b1f452
2017-06-06 15:06:42 +02:00
a114eaaec7
nix: add "man" to meta.outputsToInstall
2017-05-25 06:34:31 -04:00
467a91d9ee
nixStable: remove old patches
...
773313591fad9e6037a4
2017-05-23 17:32:30 -04:00
234cdc02eb
nixUnstable: 1.12pre5344_eba840c8 -> 1.12pre5350_7689181e
2017-05-08 16:50:58 +02:00
d53540dd32
nixUnstable: 1.12pre5308_2f21d522 -> 1.12pre5344_eba840c8
2017-05-04 20:45:20 +02:00
f556d94527
Merge pull request #25484 from l2dy/nix-confdir
...
nix: add confDir argument
2017-05-03 21:52:01 +01:00
20d846bcdd
nixUnstable.perlBindings: Fix Nix::Config generation
...
The configure script calls nix-instantiate, which fails if /nix/var
doesn't exist (e.g. in a sandbox). This caused a bogus Nix::Config
module to be generated, causing issues in Hydra.
2017-05-03 17:39:43 +02:00
8bb7328300
nix: add confDir argument
2017-05-03 13:04:52 +00:00
e042db5e41
nixUnstable: 1.12pre5152_915f62fa -> 1.12pre5308_2f21d522
2017-04-28 17:55:53 +02:00
5aa936d0ee
nix perl-bindings: Fix Config.pm
2017-04-25 20:36:04 -04:00
e4190943c8
nix: 1.11.8 -> 1.11.9
2017-04-25 17:19:10 +02:00
d990aa7163
Refactor nixos-install to separate out filesystem build logic
...
The key distinction I'm drawing is that there's a component that deals
with the store of the machine being built, and another component for
the store building it. The inner part of it assumes nothing from the
builder (doesn't need chroot or root powers) so it can run comfortably
inside a Nix build, as well as nixos-rebuild. I have some upcoming work
that will use that to significantly speed up and streamline image builds
for NixOS, especially on virtualized hosts like EC2, but it's also a
reasonable speedup on native hosts.
2017-04-16 16:09:41 +00:00
29b415dcdb
Add nixUnstable.perl-bindings
2017-04-11 15:36:51 +02:00
3dd66ec6e9
nix: 1.12pre5122_c60715e -> 1.12pre152_915f62fa
2017-04-11 15:02:45 +02:00
ec674a6372
nix: fix evaluation
...
Sorry!
2017-04-08 21:15:21 -04:00
fbdc4616ab
nix: fix on LLVM 4.0
2017-04-08 16:54:16 -04:00
3139993740
nixUnstable: update to 1.12pre5122_c60715e
...
(cherry picked from commit 4da11d7c9b7ed59b5acb19dd6ba335aef113db94)
2017-03-28 11:32:17 +00:00
99632d5466
Nix, Hydra: bump to 2017-03-21
2017-03-25 13:00:49 +01:00
2cb25f8b59
nix: 1.11.7 -> 1.11.8
2017-03-21 14:49:23 +01:00
8784b0582e
Update nixUnstable
...
(cherry picked from commit fce036d16443b8b9f5f02a9d2bcadc5976044dbc)
2017-03-06 13:32:56 +00:00
4da420709d
nixUnstable: Add s3 support on darwin
2017-03-05 07:39:23 -05:00
f5e53aea5d
nixUnstable: 1.12pre4997_1351b0d -> 1.12pre5060_fa125b9
2017-03-01 18:04:18 +01:00
8e1fa01f3a
nix: 1.11.6 -> 1.11.7
2017-02-24 12:53:53 +01:00
dea81956fc
nixUnstable: 1.12pre4911_b30d1e7 -> 1.12pre4997_1351b0d
2017-02-03 14:47:05 +01:00
96b6968950
nix: 1.11.5 -> 1.11.6
2017-01-13 11:38:09 +01:00
0108c31e22
nix: 1.11.4 -> 1.11.5
2017-01-03 11:25:38 +01:00
c94454a45a
nixUnstable: 1.12pre4523_3b81b26 -> 1.12pre4911_b30d1e7
2016-12-09 11:21:06 +01:00
6a9fb8b9e0
nix: Enable install check
...
Looks like this got disabled accidentally in
ec5b66eb4a
2016-09-12 23:34:08 +02:00
f2ddf2a9be
nix: 1.11.3 -> 1.11.4
2016-09-06 16:15:22 +02:00
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
3996aa8953
nix: maintenance 1.11.2 -> 1.11.3
...
Fixes #17804 .
2016-08-29 22:44:01 +02:00
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
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
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
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
8e398a88a1
nixUnstable: point to latest 1.12pre
2016-03-17 13:03:36 +00:00
2cbe6bb3f0
nix: split man output from doc
2016-03-08 09:59:31 +01:00
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
e674356c46
nix: Fix indentation
2016-02-12 16:10:59 +01:00
aa31d99d29
nix: 1.11.1 -> 1.11.2
2016-02-12 15:20:27 +01:00
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
42e53ba62c
nix: 1.10 -> 1.11.1
2016-01-26 17:00:15 +01:00
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
320f1b4e3c
nix: 1.11pre4345_b8258a4 -> 1.11pre4379_786046c
2016-01-14 13:20:49 +01:00
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
63bf2a551e
nixUnstable: 1.11pre4334_7431932 -> 1.11pre4345_b8258a4
2015-12-29 17:54:58 +01:00
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
2de76b2753
nixUnstable: 1.11pre4273_71039be -> 1.11pre4334_7431932
2015-12-10 15:25:48 +01:00
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
58f9896a43
nixUnstable: Update to 1.11pre4273_71039be
2015-10-31 00:22:32 +01:00
d9d5c98c56
Add option environment.enableDebugInfo
...
This makes the debug outputs of packages that have them available to
programs like gdb.
2015-10-30 15:21:16 +01:00
1286435499
nixUnstable: Update to 1.11pre4244_133a421
2015-10-09 14:44:27 +02:00
24483ebe47
nixUnstable: Update to 1.11pre4243_2075ec8
2015-10-08 15:57:29 +02:00
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
2a28bc6691
separateDebugInfo: Assert Linux
...
Also remove some unintended setting of separateDebugInfo.
2015-09-22 20:21:10 +02:00
ec5b66eb4a
Enable separate debug info
...
You can now pass
separateDebugInfo = true;
to mkDerivation. This causes debug info to be separated from ELF
binaries and stored in the "debug" output. The advantage is that it
enables installing lean binaries, while still having the ability to
make sense of core dumps, etc.
2015-09-17 15:56:33 +02:00
1d5a96c3c6
Merge pull request #9309 from acowley/nix-darwin
...
nix: use libsodium on darwin
2015-09-14 15:12:33 -07:00
86eaeb4c0a
Nix: Update to 1.10
2015-09-04 10:40:08 +02:00
fa67a2d301
nixUnstable: Update
2015-08-24 18:58:45 +02:00
7dbea7aa78
Nix darwin use libsodium
2015-08-17 18:09:19 -04:00
8a5000cc78
nixUnstable: Update to 1.10pre4200_76cc8e9
...
Also unify the nixStable and nixUnstable expressions.
2015-07-30 12:08:20 +02:00
f98c7f2976
More docs in separate outputs
2015-07-26 22:46:45 +02:00
192d20e820
nix: Update to 1.9
2015-06-12 13:19:48 +02:00
e36dd5acf8
nix: fix paths to bzip outputs
2015-04-18 21:37:00 +02:00
d6c88eaeb8
Apply upstream fix for Nix on XFS
...
Fixes #6424 .
2015-02-18 10:41:39 +01:00
e115bdecd8
nix: Update to 1.8
2014-12-14 05:29:24 +01:00
ee7a54df0c
nix: Revert meta attribute removal
2014-09-24 19:00:35 +02:00
6f949b2e87
get rid of nasty CC stuff
2014-09-09 13:54:26 -07:00
7da056233f
wip libc++
2014-09-09 13:54:25 -07:00
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
2da09363bf
nix: Update to 1.7
2014-04-11 12:24:48 +02:00
b9dbfe7feb
nix: Backport bug fix to check NAR integrity
2014-01-09 13:07:57 +01:00
60f1afe199
nix: Update to 1.6.1
2013-10-29 11:30:36 +01:00
095fc0ebaa
nix-repl: Add
2013-09-17 11:26:12 +02:00
b73deae714
nix: Update to 1.6
2013-09-10 17:53:29 +02:00
5bc8275075
nix: Update to 1.5.3
2013-06-18 00:56:00 +02:00
fdd06dc094
nix: Update to 1.5.2
2013-05-14 00:01:38 +02:00
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
1166b82fca
nix: Update to 1.5.1
2013-03-01 02:03:09 +01:00
adef38370c
nix: Update to 1.5
2013-02-28 01:20:39 +01:00
5847037d84
nix: Update to 1.4
2013-02-26 14:41:02 +01:00
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
e2d6154fff
nix: Update to 1.3
...
Also, use /etc/nix as the default configuration directory. This way
$NIX_CONF_DIR no longer needs to be set in most cases.
2013-01-05 18:57:33 +01:00
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
5be0a9acd7
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
...
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
1c24391251
nix: Update to 1.2
2012-12-07 13:46:07 +01:00
d077a98e77
nix: Update to 1.1
2012-07-18 21:50:41 -04:00
8a5d68220a
* Nix 1.0.
...
svn path=/nixpkgs/trunk/; revision=34068
2012-05-12 04:20:26 +00:00
3ac44bde79
* Disable make check because it fails randomly due to a race.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31790
2012-01-23 12:34:07 +00:00
f5f32a5b4b
* Nix 0.16.
...
svn path=/nixpkgs/trunk/; revision=23208
2010-08-17 15:21:42 +00:00
7cdad55164
* Use OpenSSL's implementation of MD5, SHA-1 and SHA-256, as they're
...
a bit faster.
svn path=/nixpkgs/trunk/; revision=21218
2010-04-21 20:07:26 +00:00
8396168276
* Updated Nix to 0.15.
...
svn path=/nixpkgs/trunk/; revision=20697
2010-03-17 12:16:03 +00:00
874b4869a3
* Nix stable updated to 0.14.
...
svn path=/nixpkgs/trunk/; revision=19830
2010-02-05 10:41:24 +00:00
ade60645af
* Nix 0.13.
...
svn path=/nixpkgs/trunk/; revision=18175
2009-11-05 23:47:53 +00:00
a4a95f2962
* Latest stable, unstable releases.
...
svn path=/nixpkgs/trunk/; revision=13365
2008-11-21 17:06:49 +00:00
b81415699f
* Updated nixUnstable to the latest version. This is the first no-bdb
...
version, so if you use it, it will convert /nix/var/nix/db to the
new schema.
svn path=/nixpkgs/trunk/; revision=12181
2008-06-24 09:39:19 +00:00
5a870b6ea9
* Nix 0.11.
...
svn path=/nixpkgs/trunk/; revision=10036
2008-01-01 11:30:41 +00:00
623437eaa2
* Latest version.
...
svn path=/nixpkgs/trunk/; revision=9584
2007-11-05 11:22:37 +00:00
dc49f13eef
* Latest version.
...
svn path=/nixpkgs/trunk/; revision=9479
2007-10-19 11:38:58 +00:00
a7d27b2201
* Move nix to tools/package-management, and use the latest unstable
...
release.
svn path=/nixpkgs/trunk/; revision=8477
2007-03-29 09:24:14 +00:00
Shea Levy