Commit graph

366 commits

Author SHA1 Message Date
Shea Levy 26e8d58cb5
libseccomp: Disable only on RISC-V if Linux.
The isSeccomputable flag treated Linux without seccomp as just a
normal variant, when it really should be treated as a special case
incurring complexity debt to support.
2018-03-27 08:16:24 -04:00
Tuomas Tynkkynen 22df741045 nix: Fix build on ARMv6 2018-03-11 19:44:44 +02:00
Eelco Dolstra 1deb779a7a nixUnstable: Point to Nix 2.0 2018-03-07 10:31:09 +01:00
Will Dietz 7dafa09ed9 nix: fix conditional so brotli is used w/2.0 builds, needed for logs!
cc https://github.com/NixOS/nix/issues/1951
2018-03-05 17:23:47 -06:00
Vladimír Čunát b70c93f211
Merge branch 'master' into nix-2.0 2018-03-03 18:02:35 +01:00
Shea Levy 3c57e770cf
Only build libseccomp on supported systems 2018-02-24 23:05:08 -05:00
Eelco Dolstra d12c9911df
Merge remote-tracking branch 'origin/master' into nix-2.0 2018-02-22 17:28:51 +01:00
Eelco Dolstra fab12188b8
Doh 2018-02-22 17:26:52 +01:00
Eelco Dolstra bae19ef9f6
Doh 2018-02-22 17:20:59 +01:00
Eelco Dolstra 32af695a22
nix: 1.11.16 -> 2.0 2018-02-22 17:03:27 +01:00
Will Dietz cbae401982 nixUnstable: bump for minor fix to unbreak seccomp builds 2018-02-19 12:28:09 -06:00
Shea Levy d1cb2ee899
nixUnstable: 2.0pre5951_690ac7c9 -> 2.0pre5967_623fcb07.
Important security patch for no-seccomp systems.
2018-02-19 12:10:28 -05:00
Shea Levy 765194d7ab
nixUnstable: Disable seccomp support on RISC-V. 2018-02-18 09:02:10 -05:00
Shea Levy 5a0eec1de1
nixUnstable: 2.0pre5950_3a5a241b -> 2.0pre5951_690ac7c9. 2018-02-18 09:02:10 -05:00
Vladimír Čunát 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
Shea Levy ce35114ee4
nixUnstable: 2.0pre5943_52c777a7 -> 2.0pre5950_3a5a241b 2018-02-15 16:22:21 -05:00
Frederik Rietdijk 672bb6b4ab Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
Shea Levy f73b358842
nixUnstable: Bump 2018-02-13 12:18:50 -05:00
Will Dietz 5a802afb75 nix: doInstallCheck is disabled on cross already. 2018-02-13 09:44:59 -06:00
Ben Gamari 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
Will Dietz 3aa61e33be nix: simplify bzip2 dependency, this is handled properly now 2018-02-13 09:44:30 -06:00
Will Dietz afe517acd5 nix: 1.11 needs 'curl' on PATH so provide as nativeBuildInput. 2018-02-13 09:44:30 -06:00
Eelco Dolstra e76849dca2
nixUnstable: 2.0pre5889_c287d731 -> 2.0pre5914_48c192ca 2018-02-07 19:32:12 +01:00
Will Dietz 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
Will Dietz 74d928cf8b nix: enable more features in busybox shell to resolve build failures 2018-02-05 09:19:54 -06:00
Will Dietz 4faac207bc nix: fix config for echo/test on newer busybox
Matches
2f1a1c5a49
2018-02-05 09:18:39 -06:00
Eelco Dolstra 294a4e6ea5
Use nixUnstable as the default temporarily 2018-02-05 13:49:24 +01:00
Eelco Dolstra 75a20284f4 nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731 2018-01-31 22:24:50 +01:00
Eelco Dolstra ef351646ba Revert "Restore "nixUnstable: rename to nix-unstable""
This reverts commit 695027f61c.

We really can't have "nix-env -i nix" *not* upgrade nixUnstable to a
newer nixStable. For instance, it would cause "nix upgrade-nix" to
produce a user environment with collisions.
2018-01-31 22:24:24 +01:00
Dan Peebles 533cc72d4d nixUnstable: pre5849_74f75c85 -> pre5873_b76e282d 2018-01-23 16:07:25 -05:00
Dan Peebles 4c96412189 nixUnstable: pre5810_5d5b931f -> pre5849_74f75c85 2018-01-12 14:19:24 -05:00
Orivej Desh 137bf46ee7 nixUnstable: 1.12pre5788_e3013543 -> 1.12pre5810_5d5b931f
Fixes build after 3430b0e859 with
5d5b931fb1
2017-12-14 18:34:36 +00:00
Eelco Dolstra 875eaf0821
nix: 1.11.15 -> 1.11.16 2017-12-12 17:46:21 +01:00
Eelco Dolstra 0e58684c41
nixUnstable: Remove unused dependencies 2017-12-08 16:01:06 +01:00
Orivej Desh 695027f61c Restore "nixUnstable: rename to nix-unstable"
as discussed in bed3695848

Different names make it easier for the users to notice updates to Nix stable,
and to have Nix stable and unstable simultaneously.

This reverts commit bed3695848.
2017-12-08 11:17:33 +00:00
Shea Levy 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
Shea Levy 0235f1249e
nixUnstable: Bump to pre5788_e3013543 for fetchGit bug fix 2017-12-07 14:02:03 -05:00
Vladimír Čunát 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
Eelco Dolstra d2df286df7
nixUnstable: nix-1.12pre5663_c7af84ce -> nix-1.12pre5732_fd10f6f2 2017-11-07 12:25:17 +01:00
Orivej Desh 9711aac642 nixUnstable: rename to nix-unstable 2017-10-27 23:05:12 +00:00
Shea Levy 5da5af56e1
nixUnstable: Bump for nix-shell interpreter bugfix 2017-10-19 19:25:08 -04:00
Shea Levy 69607d7662
nixUnstable: Bump for fetchgit fixes 2017-10-17 13:59:44 -04:00
Shea Levy 8efe90a3f4
nixUnstable: bump 2017-10-13 11:05:57 -04:00
Eelco Dolstra db8a4a4ef5
nixUnstable: 1.12pre5619_346aeee1 -> 1.12pre5639_fda7b95c 2017-10-11 14:18:05 +02:00
Eelco Dolstra 6dad1f70ce
nix: 1.11.14 -> 1.11.15 2017-09-15 16:38:33 +02:00
Eelco Dolstra b86fd340f0
nixUnstable: 1.12pre5511_c94f3d55 -> 1.12pre5619_346aeee1 2017-09-15 11:27:32 +02:00
Eelco Dolstra 79954b9d1f
nix: 1.11.13 -> 1.11.14 2017-08-31 11:00:09 +02:00
Matthew Justin Bauer 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
Eelco Dolstra 8a31137441
nixUnstable: 1.12pre5506_3162ad5f -> 1.12pre5511_c94f3d55 2017-07-21 12:52:57 +02:00
zimbatm 2780e2a780 nixUnstable: pre5413_b4b1f452 -> pre5506_3162ad5f 2017-07-19 11:06:06 +01:00