Commit Graph

517 Commits

Author SHA1 Message Date
Maximilian Bosch 9e29f211ba 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

(cherry picked from commit 615d368aa000279f1c63d9c5521859181b5fbfe3)
2021-09-25 15:32:55 +00:00
Maximilian Bosch 21c1c063da 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

(cherry picked from commit 04b552c32312e8067ab5e3948513ce4624f35c4d)
2021-09-11 17:07:42 +00:00
happysalada 1d182a795d nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb
(cherry picked from commit f578589a2ba19a17f468dba84a7b2e14b91d3a6e)
2021-08-11 15:35:11 +00:00
Vladimír Čunát de3a57327f nix(Stable): 2.3.14 -> 2.3.15
(cherry picked from commit 9bd0be76b2219e8984566340e26a0f85caeb89cd)
2021-07-30 13:17:54 +00:00
Robert Hensing 648f26faa4 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.

(cherry picked from commit 2c2e1db91db465d7a83593d9322aa204c0fa4b43)
2021-07-21 16:07:46 +00:00
Robert Hensing 60370d7133 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.

(cherry picked from commit 596ac242af767b38e48af9076887b206dc72e472)
2021-07-21 16:07:45 +00:00
Jonathan Ringer 12e0c5c76c nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb
(cherry picked from commit 2d1568561b80205b89a5b47e892e636441c26720)
2021-07-21 16:07:45 +00:00
Maximilian Bosch 792c0160c6 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

(cherry picked from commit e66237af154f63998eaf45233763b2e535b78b95)
2021-07-20 15:13:18 +00:00
Jonathan Ringer 592df52aa1 nix: 2.3.11 -> 2.3.12
(cherry picked from commit ff50095bd4121f35e1ca73b4df68912db1bff2a4)
2021-06-03 08:11:52 -07:00
Jonathan Ringer b78bd862e3 nixUnstable: 2.4pre20210503_6d2553a -> 2.4pre20210601_5985b8b5
(cherry picked from commit f7fe3008d106b8b8834a4f64868ae386a9b26e08)
2021-06-03 08:11:52 -07: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