1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Commit graph

65 commits

Author SHA1 Message Date
Eelco Dolstra 74e7ef35fe nix-daemon.nix: Add option nix.registry
This allows you to specify the system-wide flake registry. One use is
to pin 'nixpkgs' to the Nixpkgs version used to build the system:

  nix.registry.nixpkgs.flake = nixpkgs;

where 'nixpkgs' is a flake input. This ensures that commands like

  $ nix run nixpkgs#hello

pull in a minimum of additional store paths.

You can also use this to redirect flakes, e.g.

  nix.registry.nixpkgs.to = {
    type = "github";
    owner = "my-org";
    repo = "my-nixpkgs";
  };
2020-04-02 19:38:00 +02:00
Florian Klink 855a12eacf Revert "make-tarball.nix: Restore the 'commit' field in packages.json"
This reverts commit 5e8545e723.

It breaks eval:

attribute 'rev' missing, at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-0-gleber.ewr1.nix.ci/pkgs/top-level/make-tarball.nix:106:39
2020-03-29 20:57:50 +02:00
Eelco Dolstra 5e8545e723
make-tarball.nix: Restore the 'commit' field in packages.json
Also change incorrect 'revision' to 'rev' in the default value for
'nixpkgs' in release.nix.

Fixes https://github.com/NixOS/nixos-homepage/issues/372.
2020-03-29 20:16:07 +02:00
Eelco Dolstra 4e554ad1bc
make-tarball.nix: Strip source directory from packages.json
https://github.com/NixOS/nixos-homepage/issues/372
2020-03-29 20:02:44 +02:00
Eelco Dolstra d6ec410a47
Add packages.json to the tarball job
Moved from nixos-homepage.
2020-03-24 16:42:00 +01:00
Eelco Dolstra 64e5f4d53b Fix 'nix flake check' 2020-02-10 16:26:33 +01:00
Eelco Dolstra 5548397488 make-tarball.nix: Derive version from lastModified instead of revCount
GitHub flakes don't provide revCount.
2020-02-05 23:14:32 +01:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 8931db9f0b make-tarball / lib-tests: reduce duplication
The misc.nix and systems.nix tests were invoked at three different
places. Let's not that.
2019-07-11 18:02:05 +02:00
Vladimír Čunát 8d7439eb19
tarball job: more --show-trace
Without that I couldn't well do the grandparent commit.
2018-09-03 14:24:42 +02:00
Eelco Dolstra 8d4068d9d1
pkgs/top-level/release.nix: Don't require Darwin to be supported 2018-07-04 17:53:02 +02:00
Eelco Dolstra 5c5223d46b
make-tarball.nix: Fix <nixpkgs> check
This was broken by 6bcf194449, which
caused the result of the check to be ignored (since xargs will return
a non-zero exit status if *any* grep doesn't find a match).
2017-12-07 16:00:09 +01:00
Graham Christensen 5a43eec070
nixpkgs: expose .git-revision in the nixexprs like NixOS
nixos/lib/make-channel.nix:16:

    echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision

This means the .git-revision exists in nixos channels, but not
Nixpkgs channels. Adding it to the nixpkgs channel makes it a
common API for any Nixpkgs use cases.
2017-10-11 06:51:36 -04:00
John Ericson 296753f094 lib: Consolidate tests into one meta job 2017-05-17 11:14:59 -04:00
Eelco Dolstra 7a586794d4
make-tarball.nix: Fix running as root
Since Nix now runs builds in a user namespace with uid == 0, this
triggered the message

  warning: the group ‘nixbld’ specified in ‘build-users-group’ does not exist

which make-tarball.nix turns into a fatal error. So clear
build-users-group.

http://hydra.nixos.org/build/44817408
2016-12-15 13:08:21 +01:00
Eelco Dolstra c0da5f78d6
make-tarball.nix: Don't check broken packages
They're broken after all. In particular, this prevents us from
evaluating packages that are unsupported on a particular platform.

Reverts a147ddc42c.

Fixes #20817.
2016-11-30 15:21:30 +01:00
Eelco Dolstra e3a873479e
Remove fetchMD5warn
Deprecation warnings should not be used in Nixpkgs because they spam
innocent "nix-env -qa" users with (in this case) dozens of messages
that they can't do anything about.

This also reverts commit 2ca8833383.
2016-11-30 15:14:30 +01:00
Michael Raskin 2ca8833383 make-tarball.nix: filter out MD5 warnings in evaluation check 2016-10-12 10:50:58 +02:00
Eric Sagnes 4c97e4fbff make tarball: refactor with fileContents 2016-08-01 18:40:50 +09:00
Franz Pletz 6bcf194449 tarball: Only check nix files for nixpkgs references
Fixes travis build failure.
2016-07-19 10:49:18 +02:00
Tuomas Tynkkynen 30240ccb9d tarball: No need to depend on nix development headers 2016-05-02 01:06:45 +03:00
Nicolas B. Pierron 6313a5698a Replace references to all-packages.nix, by references to the top-level of nixpkgs repository. 2016-03-13 18:25:52 +00:00
Eelco Dolstra ac0c49970b make-tarball.nix: Allow passing in a different Nix
Used by the Nix tests (9fff492561).
2016-01-19 21:28:53 +01:00
Eelco Dolstra 7cd3d502bb copy-tarballs.pl: Revive extracting all tarballs from release.nix 2015-12-16 15:38:59 +01:00
Eelco Dolstra cae5bfb991 statsd: Don't use <nixpkgs>
This was preventing the Nixpkgs channel from updating, since the
program indexer barfed on:

  error: anonymous function at /nix/store/wdnwbh3kmf68nhqqp0khcyxbdbp43vg5-nixos-14.12.626.b0d594c/nixos/nixpkgs/pkgs/top-level/node-packages.nix:1:1 called without required argument ‘neededNatives’, at /data/releases/nixos/unstable-small/.tmp-nixos-16.03pre72946.c50d013-787/unpack/nixos-16.03pre72946.c50d013/lib/customisation.nix:56:12

because Nixpkgs 16.03 was importing files from Nixpkgs 14.12.

Also added some half-assed checks to detect this issue in the future.
2015-12-02 15:58:30 +01:00
Eelco Dolstra 45c7dd7d98 Add stdenv bootstrap tools generation to release.nix 2015-10-23 13:05:36 +02:00
Tuomas Tynkkynen 1357c3d533 make-tarball.nix: Fail if nixpkgs doesn't evaluate without warnings
Commit 3d6110d221 added a well-meaning
warning message, which unfortunately would also show up each time
`nix-env -qa` was run. It has been since fixed, but let's add a check
to prevent such errors from reaching the nixpkgs channel in the future.
2015-10-10 00:27:41 +03:00
Eelco Dolstra 7f9b8866bf Nixpkgs channel: Remove channel-name
This file no longer does anything.
2015-08-05 17:37:05 +02:00
Eelco Dolstra 1ba5ef6b6a viber: Mark as broken
It doesn't evaluate due to Qt changes. Also improve checking in
make-tarball.nix to catch this in the future.
2015-05-12 14:30:56 +02:00
Eelco Dolstra bf0aa66c17 Only test evaluation on supported platforms 2015-03-06 14:07:45 +01:00
Eelco Dolstra 438b9c543d Nixpkgs manual: Add a Nix expression to build 2014-08-24 11:03:55 +02:00
Eelco Dolstra a147ddc42c Check whether Nixpkgs evaluates with NIXPKGS_ALLOW_BROKEN=1 2014-08-22 20:23:53 +02:00
Eelco Dolstra c95cea4bfd Tarball: Check whether Nixpkgs evaluation doesn't depend on its path 2014-04-20 00:08:52 +02:00
Eelco Dolstra 5c2bd5dffc Remove obsolete line 2014-04-20 00:08:52 +02:00
Eelco Dolstra 7a51e17775 Fix updating of the tarball mirror 2014-02-19 13:58:42 +01:00
Eelco Dolstra d374bff41e Tarball: Match the NixOS version 2013-10-11 13:36:09 +02:00
Eelco Dolstra 041da5a6f9 Unify the Nixpkgs and NixOS version numbers 2013-10-10 13:28:22 +02:00
Eelco Dolstra 2ae2b0bca3 Drop --xml, it's no longer needed 2013-10-06 00:21:28 +02:00
Eelco Dolstra b0c1424788 tarball: Evaluate Nixpkgs on all supported platforms
So drop powerpc-linux and add x86_64-darwin and x86_64-freebsd.
2013-10-01 13:12:45 +02:00
Vladimír Čunát 310ae0915e tarball: add --show-trace on the remaining calls
This should help tracing some evaluation problems in future.
2013-08-23 09:02:10 +02:00
Eelco Dolstra bcc14c4d3c Add an "unstable" aggregate to replace the "unstable" view
Views are obsolete, aggregates are the declarative replacement.
2013-03-26 11:59:00 +01:00
Eelco Dolstra d330f6ff85 Nixpkgs channel: Use XZ compression for nixexprs.tar 2013-01-30 12:52:07 +01:00
Eelco Dolstra 72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Eelco Dolstra 887c89cc33 * Include the Git shortrev in the version number.
* Less verbose output in the tarball job.

svn path=/nixpkgs/trunk/; revision=34335
2012-06-04 04:12:17 +00:00
Eelco Dolstra 13bcdc5f33 * Fix building the tarball in a chroot.
svn path=/nixpkgs/trunk/; revision=34110
2012-05-15 14:37:24 +00:00
Eelco Dolstra 069604730b * Work around some problems in tarball checks. Nix wants to open the
DB even in read-only mode.  Should probably fix that.  Also, "or" no
  longer works like this because it's a keyword now.

svn path=/nixpkgs/trunk/; revision=34079
2012-05-13 19:10:57 +00:00
Eelco Dolstra 4d8e2180b5 * Set the channel name to "nixpkgs".
svn path=/nixpkgs/trunk/; revision=33784
2012-04-14 14:19:13 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra e8f1c8a08a * Check eval-release.nix.
svn path=/nixpkgs/trunk/; revision=23250
2010-08-19 14:33:44 +00:00
Rob Vermaas 6ab3528051 typo
svn path=/nixpkgs/trunk/; revision=21827
2010-05-18 08:39:31 +00:00