3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

537 commits

Author SHA1 Message Date
Artturin c192da17cc nixUnstable: 2.5pre20211007 -> 2.5pre20211126 2021-11-28 07:03:29 +02:00
Robert Hensing 2d1be9cd9a nix: Install nlohmann_json headers 2021-11-11 11:45:26 +01:00
Bernardo Meurer 8cc4d533ef
nix: add lovesegfault to maintainers 2021-11-09 11:26:11 -08:00
Bernardo Meurer e912008eef
nixStable: 2.3.16 -> 2.4 2021-11-09 10:47:07 -08:00
Bernardo Meurer 372a7456a8
nix: disable separateDebugInfo for nix_2_4 static 2021-11-07 18:09:23 -08:00
Bernardo Meurer 0d6fec737a
nix_2_4: fix NIX_LDFLAGS 2021-11-07 18:09:22 -08:00
Bernardo Meurer 971f4a097c
nix_2_3: init @ 2.3.16 2021-11-07 18:09:20 -08:00
Bernardo Meurer 93e7820449
nix_2_4: 2.4pre-rc1 -> 2.4 2021-11-07 18:09:19 -08:00
Dominik Xaver Hörl ea8f2f937c treewide: allow eval with no-url-literals 2021-10-26 09:01:11 +02:00
Bernardo Meurer f7a1df9555
nix_2_4: init at 2.4pre-rc1 2021-10-07 16:04:10 -07:00
Bernardo Meurer f4cc15d072
nixUnstable: 2.4pre20211106 -> 2.5pre20211107 2021-10-07 16:04:09 -07:00
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