3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

490 commits

Author SHA1 Message Date
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
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