Arthur Gautier
202554980a
nix: 2.3.15 -> 2.3.16
...
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2021-10-07 16:17:18 +00:00
Sergei Trofimovich
5323bc0f14
nixUnstable: pre20211001 -> pre20211006
...
The specific reason to update is to pull in logging fix:
c6718a9d950214 "Don't reset the logger in a vfork"
Otherwise 'nix build' does not report build progress correctly.
2021-10-07 12:11:58 +02:00
sternenseemann
25da0b3bbb
nixUnstable: 2.4pre20210922 -> 2.4pre20211001
...
Contains a fix for lowdown 0.9.0.
2021-10-04 21:40:52 +02:00
Maximilian Bosch
615d368aa0
nixUnstable: 2.4pre20210908_3c56f62 -> 2.4pre20210922_bcd73eb
...
Changes: 3c56f62...bcd73eb
I figured that now with an actual 2.4 release around the corner[1] we
could bump it a bit more often considering that it seems to contain
mostly bugfixes, so that upstream receives a bit more feedback.
[1] https://discourse.nixos.org/t/tweag-nix-dev-update-17/15037
2021-09-22 23:43:33 +02:00
Maximilian Bosch
04b552c323
nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210908_3c56f62
...
Main motivation for is the bugfix regarding flake-follows and
path-inputs[1]. An overview over all changes - mostly bugfixes -
can be found on GitHub[2].
[1] https://github.com/NixOS/nix/pull/4641
[2] 47e96bb...3c56f62093
2021-09-08 14:48:31 +02:00
happysalada
83bc698fba
nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb
2021-08-11 15:14:48 +09:00
Ben Siraphob
f47901cb24
Merge pull request #124187 from Mic92/nix
...
nix: enable pie
2021-08-01 01:27:01 +07:00
Vladimír Čunát
9bd0be76b2
nix(Stable): 2.3.14 -> 2.3.15
2021-07-30 11:13:36 +02:00
Sandro
7731e2fe72
Merge pull request #129574 from jonringer/bump-nix-unstable-july
2021-07-20 17:33:36 +02:00
Maximilian Bosch
e66237af15
nixStable: 2.3.12 -> 2.3.14
...
Changes: https://github.com/NixOS/nix/compare/2.3.12...2.3.14
Since this is a bugfix release that wasn't pushed to `nixpkgs`, I
decided to take care of it.
As it's usually done in `upload-release.pl`[1], I updated the
fallback-paths accordingly and used eval `1687468`[2] for this with Nix
2.3.14.
Also added a fallback-path for `aarch64-darwin` as Nix 2.3.14 seems to
support this now[3].
[1] https://github.com/NixOS/nix/blob/2.3-maintenance/maintainers/upload-release.pl
[2] https://hydra.nixos.org/eval/1687468
[3] 14262b86cc
2021-07-20 17:06:51 +02:00
Robert Hensing
2c2e1db91d
boehmgc_{nix,nixUnstable}: Move into {nix,nixUnstable}.passthru
...
Do not pollute top-level, but do provide allow the derivations to
be accessed for debugging and reuse if necessary.
2021-07-19 10:09:53 -07:00
Robert Hensing
596ac242af
nixUnstable: patch boehmgc (nix#4944)
...
As has been done in https://github.com/NixOS/nix/pull/4944
This introduces the boehmgc_nix and boehmgc_nixUnstable attributes
which are useful for external packages that link with Nix and its
boehmgc.
2021-07-19 10:09:52 -07:00
Jonathan Ringer
2d1568561b
nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb
2021-07-19 10:09:52 -07:00
Alyssa Ross
2d641a29ab
nixUnstable: fix cross by disabling documentation
...
The documentation for Nix HEAD now requires running the generated Nix
binary, so we can't cross-build it. :(
https://github.com/NixOS/nix/issues/4622
2021-06-12 10:02:26 +00:00
Alyssa Ross
42b211f175
nix: clarify config.nix hack
...
The comment said that this was needed for Nix <2.3.8, which is wrong
-- it's needed for all 2.3.x. I think this must have been caused by a
nmisreading of the conditional, which applied to all versions _later_
than 2.3.8, not earlier.
But we don't package anything that old any more, so we can remove that
check entirely, in addition to clarifying the comment.
2021-06-04 13:32:02 +00:00
Alyssa Ross
45eeabf3a1
nix: always depend on libsodium
...
Restricting this to Linux and Darwin broke other operating systems,
like NetBSD.
2021-06-04 10:37:34 +00:00
Jonathan Ringer
edb5ff75f2
nix: 2.3.11 -> 2.3.12
2021-06-02 19:15:39 -07:00
Jonathan Ringer
65c897c7c4
nixUnstable: 2.4pre20210503_6d2553a -> 2.4pre20210601_5985b8b5
2021-06-02 19:15:39 -07:00
Jörg Thalheim
5c2a47d5c7
nix: enable pie
2021-05-23 20:59:21 +02:00
Eelco Dolstra
49c22083b9
nixFlakes: Turn into an alias
2021-05-21 15:21:31 +02:00
Eelco Dolstra
21bfd3bbce
Revert nixFlake / nixExperimental ( #120141 )
...
Usage of the nixFlakes attribute obscures the fact that it's an
experimental feature. Providing a nixExperimental attribute (which
people will inevitably start using on their production machines) makes
it too easy to enable all experimental features, when you should
explicitly opt in to the features that you want to try out.
Also, upstream Nix doesn't provide an "enable all experimental
features" patch so neither should Nixpkgs.
2021-05-21 15:16:35 +02:00
Domen Kožar
f5f8f2415e
Merge pull request #122794 from Mic92/nix-hotfix
...
nixUnstable: pre20210503_6d2553a -> pre20210513_340f831
2021-05-15 15:47:41 +02:00
Jörg Thalheim
5e7e70b200
nixUnstable: fix output name tokenizatoin
2021-05-15 07:14:35 +02:00
Eelco Dolstra
b08e223a04
nix: 2.3.10 -> 2.3.11
...
The patch is included in the new release, so can be dropped.
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2021-05-14 12:24:54 +00:00
Alyssa Ross
b4ff1c052c
Revert "nix: Fix version"
...
This reverts commit eac181da5d
.
There is still a patch that doesn't apply.
2021-05-14 11:35:24 +00:00
Alyssa Ross
195d532a63
Revert "Revert "Revert "nix: 2.3.10 -> 2.3.11"""
...
This reverts commit 66fc303070
.
There is still a patch that doesn't apply.
2021-05-14 11:35:18 +00:00
Eelco Dolstra
66fc303070
Revert "Revert "nix: 2.3.10 -> 2.3.11""
...
This reverts commit 1872bbdae5
.
2021-05-14 13:33:05 +02:00
Eelco Dolstra
eac181da5d
nix: Fix version
2021-05-14 13:32:34 +02:00
Alyssa Ross
1872bbdae5
Revert "nix: 2.3.10 -> 2.3.11"
...
This reverts commit 6f6b2cdc98
.
Version wasn't updated, and apparently a patch didn't apply. Let's do
this upgrade properly, in a PR, but for now I'm reverting so we don't
have a broken nix package in master.
2021-05-14 11:30:55 +00:00
Eelco Dolstra
6f6b2cdc98
nix: 2.3.10 -> 2.3.11
2021-05-14 13:11:26 +02:00
Maciej Krüger
9c19ef7cf2
Merge pull request #120141 from DavHau/davhau-nixFlakes-enable-flakes
2021-05-12 02:07:17 +02:00
Silvan Mosberger
08d94fd2b0
Merge pull request #114374 from oxalica/lib/platform-support-check
...
lib.meta: introduce `availableOn` to check package availability on given platform
2021-05-08 03:54:36 +02:00
DavHau
8865881319
nixExperimental: init
2021-05-04 18:15:27 +07:00
DavHau
f94876e77b
nixFlakes: enable flakes,nix-command via patch
2021-05-04 17:43:46 +07:00
DavHau
118ef67e07
nixFlakes: enable flakes
2021-05-04 17:43:45 +07:00
regnat
2994db87fb
nixUnstable: pre20210326_dd77f71 -> pre20210503_6d2553a
...
(amongst other things) several fixes to make the `ca-derivations`
experimental feature usable on a daily basis
2021-05-03 16:51:11 +02:00
sternenseemann
f4e8746cb2
nix{,Unstable}: pass pname, version to mkDerivation
...
This allows stdenv.mkDerivation to append -static to the name for
pkgsStatic.nix / nixStatic which should make nix-env stop thinking
that nixStatic is a newer version of nix.
This change replaces #119310 .
2021-04-13 13:10:56 +02:00
Jan Tojnar
c04a14edd6
Merge branch 'master' into staging-next
2021-04-06 16:01:14 +02:00
Sandro Jäckel
d24e2d1b0b
gmock: deprecate alias
2021-04-04 03:18:59 +02:00
github-actions[bot]
b3a0328b7f
Merge master into staging-next
2021-04-02 18:14:54 +00:00
oxalica
354d262db8
lib.meta: introduce availableOn
2021-04-02 19:20:23 +08:00
Robert Hensing
85ae7d02da
nix: Run sandbox tests
...
on linux.
To find problems like this earlier: https://github.com/NixOS/nix/pull/4659
2021-04-02 10:51:31 +02:00
volth
be6458dce3
nix.perl-bindings: add passthru.perlModule
...
... so it can be used in `perl.withPackages`
2021-03-31 21:35:38 +02:00
Cole Helbling
30050ab2fc
nixUnstable: pre20210317_8a5203d -> pre20210326_dd77f71
...
The flakey test was fixed.
2021-03-26 23:38:43 -07:00
Cole Helbling
1d3f053790
nixUnstable: skip flakey tests/ca/substitute.sh
2021-03-24 13:24:36 -07:00
Cole Helbling
fc3227e698
nixUnstable: add util-linuxMinimal to nativeBuildInputs
...
Fixes an issue in tests where they can fail with `../common.sh: line 92:
unshare: command not found`.
2021-03-24 13:24:36 -07:00
Cole Helbling
370a401ee0
nixUnstable: pre20210308_1c0e3e4 -> pre20210317_8a5203d
2021-03-18 17:26:23 -07:00
Jörg Thalheim
69a3744025
Update pkgs/tools/package-management/nix/default.nix
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-12 12:22:37 +00:00
Jörg Thalheim
b73edccda2
nix: fix aarch64 build
2021-03-12 10:42:57 +01:00
Shea Levy
9c5f8a20b4
nixUnstable: 2.4pre20201205_a5d85d0 -> 2.4pre20210308_1c0e3e4
...
hydra-unstable: 2020-10-20 -> 2021-03-10
2021-03-10 14:13:00 -05:00
Ryan Burns
7db2af0422
Revert "nix: disable aws support on musl"
...
This reverts commit 7426b189b0
.
2021-03-04 18:22:33 -08:00
Ryan Burns
7426b189b0
nix: disable aws support on musl
...
This is just a temporary measure until musl
compatibility is restored to aws-c-common.
2021-02-05 19:58:49 -08:00
Robert Hensing
1d41739764
nixUnstable: patch #4470 (ETag) ( #111005 )
...
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2021-01-28 19:11:48 +00:00
volth
bc0d605cf1
treewide: fix double quoted strings in meta.description
...
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
John Ericson
0ceadf99f2
lowdown: Split out "lib" and "man" outputs
...
Also fix to not always static link
2021-01-23 16:43:35 -05:00
Drew Hess
90888626ba
nix: add Security to build inputs.
...
For some reason, this is required to build nix on Big Sur, even though
it's not needed on earlier macOS versions.
2021-01-22 14:50:16 +00:00
Ben Siraphob
d6aeae8f90
pkgs/tools: pkgconfig -> pkg-config (2)
2021-01-17 23:27:27 +07:00
Ben Siraphob
8c5d37129f
pkgs/tools: stdenv.lib -> lib
2021-01-15 17:12:36 +07:00
Orivej Desh
4e2a4fc133
nixUnstable: 2.4pre20201201_5a6ddb3 -> 2.4pre20201205_a5d85d0
...
It support newer aws-cpp-sdk since https://github.com/NixOS/nix/pull/4316
2021-01-06 06:05:52 +00:00
Orivej Desh
b07089cd1a
nix: patch to support newer aws-sdk-cpp
...
Upstream PR: https://github.com/NixOS/nix/pull/4404
2021-01-06 06:05:52 +00:00
Orivej Desh
4cb0e9e1c4
nix: update aws-sdk-cpp TransferManager ContentEncoding patch for 1.8.113
2021-01-06 06:05:51 +00:00
John Ericson
f52263ced0
treewide: Start to break up static overlay
...
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.
CC @FRidh @matthewbauer
2021-01-03 19:18:16 +00:00
github-actions[bot]
ec161d2240
Merge master into staging-next
2021-01-02 12:24:09 +00:00
Florian Klink
8c657c3576
nix: remove traceVal
...
This slipped through review of
https://github.com/NixOS/nixpkgs/pull/108069 .
2021-01-02 11:09:57 +01:00
Frederik Rietdijk
e48db707e4
Merge master into staging-next
2021-01-02 08:49:09 +01:00
Florian Klink
31999436da
nix: fix closure bloat on nix
...
The conditional preventing closure bloat unfortunately didn't apply for
the `nix` attribute, which is at 2.3.10 (not 2.4.*, what this did check
for).
Due to the somewhat funny 2.4pre* version strings used for nixUnstable
not being understood by lib.versionOlder, we also need to explicitly add
a check for that.
2020-12-31 20:06:34 +01:00
Lucas Ransan
2cb2a5348e
nixUnstable: fix build on gcc10
2020-12-28 08:43:33 +01:00
Eelco Dolstra
a8c49a97a6
nix: 2.3.9 -> 2.3.10
2020-12-18 12:33:49 +01:00
Bruno Bigras
2d1b0c3e88
nixUnstable: pre20201118_79aa7d9 -> pre20201201_5a6ddb3
2020-12-01 14:39:24 -05:00
Robert Hensing
18506b716e
Merge pull request #104289 from hercules-ci/update-nixUnstable-2020-11-19
...
nixUnstable: pre20201102_550e11f -> pre20201118_79aa7d9
2020-11-21 13:00:55 +01:00
Robert Hensing
4dd5da0ad0
nixUnstable: pre20201102_550e11f -> pre20201118_79aa7d9
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2020-11-20 13:11:05 +01:00
Eelco Dolstra
80097e57c9
nix: 2.3.8 -> 2.3.9
2020-11-20 13:03:04 +01:00
Graham Christensen
f4f9f307a4
nixUnstable: 3.0pre20201020_e0ca98c -> 2.4pre20201102_550e11f
2020-11-02 16:53:06 -05:00
Eelco Dolstra
d28565a1c6
nix: 2.3.7 -> 2.3.8
2020-10-22 14:47:55 +02:00
Eelco Dolstra
f25bb567f6
nixUnstable: 3.0pre20200829_f156513 -> 3.0pre20201020_e0ca98c
2020-10-21 12:52:48 +02:00
Andrew Childs
85e0d375cf
nix: build with default stdenv
...
This was required for Nix v2.2.2 which did not build with
libcxx 7. This is no longer required for any current version of Nix.
2020-10-15 16:07:01 +09:00
Konstantin Alekseev
4243ebb07e
nixUnstable: pre20200721_ff314f1 -> pre20200829_f156513
2020-08-30 16:42:00 +03:00
Maximilian Bosch
85819d4bbf
nixUnstable: 2.4pre20200719_a79b6dd -> 2.4pre20200721_ff314f1
...
Fixes errors like this for me:
```
error: --- Error ------------------------------- nix-build
Nix daemon out of memory
(use '--show-trace' to show detailed location information)
```
2020-07-22 14:29:18 +02:00
Eelco Dolstra
38880a5ec2
nixUnstable: 2.4pre7805_984e5213 -> 2.4pre20200719_a79b6dd
2020-07-20 16:06:24 +02:00
Eelco Dolstra
046427570e
nix: 2.3.6 -> 2.3.7
2020-07-08 16:58:54 +02:00
Matthew Bauer
00be3fac9f
nix: gmock is a library
...
https://hydra.nixos.org/build/123111516
2020-07-06 01:46:43 -04:00
Matthew Bauer
01ede8c615
nix: don’t precompile headers on cross compilation
...
avoids this error:
mk/precompiled-headers.mk:38: *** Don't know how to precompile headers on aarch64-unknown-linux-gnu-g++. Stop.
2020-07-06 01:46:10 -04:00
Eelco Dolstra
b505bf202b
Update nixUnstable and nixFlakes
2020-06-22 12:11:49 +02:00
Domen Kožar
c86af902f4
nix: allow static compilation
2020-06-08 17:47:44 -05:00
Eelco Dolstra
aef2bc1330
nix: 2.3.6 -> 2.3.6
2020-06-03 14:57:39 +02:00
Daiderd Jordan
b7ddbd52bd
treewide: replace SRI hashes
2020-06-01 15:24:19 +02:00
Eelco Dolstra
e8896deced
nix: 2.3.4 -> 2.3.5
2020-05-27 16:48:28 +02:00
Eelco Dolstra
fdecd9eeda
nixFlakes: 2.4pre20200501_941f952 -> 2.4pre20200521_00b562c
2020-05-26 11:14:35 +02:00
Antoine Eiche
15d1011615
nixUnstable: pre7346_5e7ccdc9 -> pre7534_b92f58f6
2020-05-12 15:23:52 +02:00
Eelco Dolstra
90b5fe2372
Merge pull request #86819 from eadwu/nixFlakes/2.4pre20200501_941f952
...
nixFlakes: 2.4pre20200403_3473b19 -> 2.4pre20200501_941f952
2020-05-06 14:15:51 +02:00
Edmund Wu
f1e3278849
nixFlakes: 2.4pre20200403_3473b19 -> 2.4pre20200501_941f952
2020-05-04 14:51:04 -04:00
Pavol Rusnak
7b0167204d
treewide: use https for nixos.org and hydra.nixos.org
...
tarballs.nixos.org is omitted from the change because urls from there
are always hashed and checked
2020-05-03 22:14:21 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
Eelco Dolstra
cea352d276
nix: 2.3.3 -> 2.3.4
2020-04-10 17:23:28 +02:00
Eelco Dolstra
b23f697b00
nix: 2.4pre7250_94c93437 -> 2.4pre7346_5e7ccdc9, 2.4pre20200220_4a4521f -> 2.4pre20200403_3473b19
2020-04-04 21:57:16 +02:00
Eelco Dolstra
5d583db5a2
Remove Nix 1.x
2020-04-04 21:57:15 +02:00
Edward Amsden
3b72c55fc5
nix: Drive-by cleanup: replace ifthenelse with lib.optionalString
2020-03-03 18:07:21 -05:00
Edward Amsden
f1415f633c
nix: Patch config.nix.in to reference host platform binaries
2020-03-03 18:07:09 -05:00
Eelco Dolstra
39892985b0
nixFlakes: 2.4pre20200207_d2032ed -> 2.4pre20200220_4a4521f
2020-02-24 10:52:45 +01:00
Eelco Dolstra
3c47f78e82
nix: 2.3.2 -> 2.3.3
2020-02-19 01:54:25 +01:00
Eelco Dolstra
dd7f6b0c6b
nixUnstable, nixFlakes: Update to latest
...
Note that we need to build from a tarball now to get the vendored
crates. A bit ugly to fetch tarballs from Hydra...
2020-02-11 16:36:37 +01:00
Eelco Dolstra
0ec8c3bb12
Revert "nix: build using gcc8"
...
This reverts commit 7ac90533a1
.
2020-01-05 20:42:44 +01:00
Eelco Dolstra
3b15451291
nix: 2.3.1 -> 2.3.2
2020-01-05 20:35:43 +01:00
Daiderd Jordan
7ac90533a1
nix: build using gcc8
...
Workaround for https://github.com/NixOS/nix/issues/3300 .
https://hydra.nixos.org/build/109304568
running tests
checking Nixpkgs on i686-linux
error: stack overflow (possible infinite recursion)
build time elapsed: 0m0.068s 0m0.029s 0m36.549s 0m6.187s
builder for '/nix/store/dr5kd28msqmqk3hkz0ayx10dww6s8dn9-nixpkgs-tarball-20.03pre207974.16c665911fb.drv' failed with exit code 1
2020-01-03 17:04:10 +01:00
Jonathan Ringer
446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next
2019-12-30 10:14:18 -08:00
Andrew Childs
209d700da4
nix: fix build on armv5tel-linux
2019-12-30 17:21:39 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists
2019-12-30 12:58:11 +01:00
Eelco Dolstra
fc2592b2d6
nixFlakes: 2.4pre20190922_382aa05 -> 2.4pre20191022_9cac895
2019-10-23 00:24:25 +02:00
Eelco Dolstra
3ab3614e2b
nix: 2.3 -> 2.3.1
2019-10-10 16:23:33 +02:00
Eelco Dolstra
8109be4859
nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05
2019-09-22 22:01:56 +02:00
Matthew Bauer
2c32f91bfc
nix: mark unix only
...
Nix is only known to work on unix like platforms.
https://hydra.nixos.org/job/nixpkgs/cross-trunk/crossMingw32.nix.x86_64-linux
2019-09-18 12:51:00 -04:00
Eelco Dolstra
b9e81b2138
nixFlakes: 2.3pre20190830_04np4n6 -> 2.4pre20190913_a25c022
2019-09-13 20:13:14 +02:00
Eelco Dolstra
37e333af9a
nix: 2.2.2 -> 2.3
2019-09-04 21:36:49 +02:00
Frederik Rietdijk
fc74ba8291
Merge master into staging-next
2019-08-31 09:50:38 +02:00
Eelco Dolstra
4388f7709a
nixFlakes: 2.3pre20190829_ebc4dae -> 2.3pre20190830_04np4n6
2019-08-30 20:00:16 +02:00
Eelco Dolstra
ebce65658f
nix: Reduce closure size by 48 MiB
2019-08-30 19:35:04 +02:00
Edmund Wu
786804a104
nixFlakes: pre20190712_aa82f8b -> pre20190829_ebc4dae
2019-08-30 08:39:58 -04:00
Edmund Wu
ad530918a5
nixUnstable: 2.3pre6779_324a5dc9 -> 2.3pre6895_84de821
2019-08-30 08:39:49 -04:00
volth
c814d72b51
treewide: name -> pname
2019-08-17 10:54:38 +00:00
Eelco Dolstra
31c38894c9
nixFlakes: 2.3pre20190612_06010ea -> 2.3pre20190712_aa82f8b
2019-07-15 16:19:30 +02:00
Izorkin
6eee555597
nixUnstable: pre6631_e58a7144 -> pre6631_324a5dc9
2019-06-27 13:12:28 +03:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Eelco Dolstra
abd51d042c
nix: Add nixFlakes attribute for the flake branch
2019-06-12 18:23:19 +02:00
Matthew Bauer
c82bb3133c
nix: use llvm6 on clang
...
nix-2.2.2 only works with libcxx 6. We should only set the stdenv to
clang when we are already using clang. Also, nixUnstable does support
libcxx 7.
2019-04-29 21:34:24 -04:00
Matthew Bauer
c72c6a48ca
treewide: use llvm6 in some places
...
Not everything works on llvm7. It’s easiest to just provide the llvm6
as backup in this case.
2019-04-26 21:55:01 -04:00
Eelco Dolstra
5399f34ad9
nix: 2.2 -> 2.2.2
2019-04-15 19:06:57 +02:00
John Ericson
4dfe9f9eb8
Merge remote-tracking branch 'upstream/master' into override-unstable-nix
2019-03-10 13:53:59 -04:00
John Ericson
bfc72142e0
nix*: Make .override work
...
Currently, .override is only on a temporary attrset that is thrown away, now it
is also on the nix derivations we use.
2019-03-10 13:52:55 -04:00
zimbatm
732cbd3be9
nixUnstable: 2.2pre6600_85488a93 -> 2.3pre6631_e58a7144
2019-02-22 19:54:36 +01:00
Maximilian Bosch
8092ca8312
nix1: fix perl-bindings
build
...
Nix 1.11 builds perl-bindings by default, `nix1.perl-bindings` fails
with the following error:
```
building
no Makefile, doing nothing
installing
install flags: install
make: *** No rule to make target 'install'. Stop.
```
This is probably due to #47316 . Previously the `perl-bindings` were
referenced to `nix1` instead of the `perl-bindings` function as Nix 1.11
built those during its build process.
2019-02-08 19:02:28 +01:00
Alyssa Ross
33036ac5d4
nix: move perl-bindings inside common function
...
It looks like originally not all Nix packages had perl bindings, but now
that they do, it seems pretty redundant to add them seperately for each
package.
2019-01-25 17:40:32 +00:00
Eelco Dolstra
c1a13108e2
nix: Add editline dependency
...
Also fix incorrect hash for nixUnstable.
2019-01-11 15:05:17 +01:00
Eelco Dolstra
94ea1c2d83
nix: 2.1.3 -> 2.2
2019-01-11 12:47:06 +01:00
Eelco Dolstra
5d09620d83
nixUnstable: 2.2pre6526_9f99d624 -> 2.2pre6600_85488a93
2019-01-10 15:05:53 +01:00
Orivej Desh
830599debe
nix1: fix build with boehmgc 7.6.8
...
It needs -lgc and -lgccpp, but boehmgc pkgconfig file specifies only -lgc.
Broken in https://hydra.nixos.org/build/82223544
2018-12-27 17:53:29 +00:00
Eelco Dolstra
81b2bfaf36
nixUnstable: 2.2pre6520_18b4c53f -> 2.2pre6526_9f99d624
2018-10-30 16:01:49 +01:00
Shea Levy
bd7e0aec71
nixUnstable: 2.1pre6377_954d1f4d -> 2.2pre6520_18b4c53f
2018-10-28 00:01:27 -04:00
Eelco Dolstra
2c9265c950
nix: 2.1.2 -> 2.1.3
2018-10-02 11:07:48 +02:00
Tuomas Tynkkynen
cdeafe7cdf
nix: Replace meta.available checks
...
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
Eelco Dolstra
869f615ff4
nix: 2.1.1 -> 2.1.2
2018-09-20 00:17:45 +02:00
Eelco Dolstra
1510f324a3
nix: 2.1 -> 2.1.1
2018-09-06 01:12:03 +02:00
Jan Malakhovski
4e735835e0
nix: make AWS support optional
2018-09-05 14:35:15 +00:00
Jan Malakhovski
c9fcabcf4b
nix: fix a tiny option bug
2018-09-05 14:34:58 +00:00
Eelco Dolstra
b06ad6199f
nix.perl-bindings: Fix build
2018-09-03 17:35:39 +02:00
Eelco Dolstra
347638ccfe
nix: 2.0.4 -> 2.1
2018-09-03 01:37:55 +02:00
John Ericson
0828e2d8c3
treewide: Remove usage of remaining redundant platform compatability stuff
...
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Eelco Dolstra
4c6aa54f86
nixUnstable: Include a copy of libboost_context
...
This shaves 47 MiB off the closure size. (libboost_context.so is only
19 KiB.)
2018-08-22 13:22:19 +02:00
Eelco Dolstra
c26c7f931a
nixUnstable: 2.1pre6338_45bcf541 -> 2.1pre6377_954d1f4d
2018-08-22 13:22:18 +02:00
Maximilian Bosch
a7685f7697
nix1: don't deliver perl-bindings of nixStable (a.k.a nix2)
...
This causes collisions between the build outputs of `nix` when building
in an environment with `nix1.perl-bindings` and `nix`:
```
collision between `/nix/store/aa4rrcj7dg2xj4rfkiclcmp745ibqng0-nix-2.0.4/lib/libnixstore.so' and `/nix/store/sp0sdi4bll80h58big1iy8kkh3qqxpw2-nix-1.11.16/lib/libnixstore.so'
builder for '/nix/store/wgbccin107lhm8cv9imnnvkx1j2pgibc-hydra-perl-deps.drv' failed with exit code 25
```
2018-08-09 22:31:18 +02:00
Eelco Dolstra
7bc2778ebb
nixUnstable: 2.1pre6148_a4aac7f -> 2.1pre6338_45bcf541
2018-07-31 21:17:10 +02:00