public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
232,693 Commits 1 Branch 0 Tags
ea56dbfbc081fa2430d57c9f73fcb15779fa63bb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eelco Dolstra b505bf202b Update nixUnstable and nixFlakes 2020-06-22 12:11:49 +02:00
Eelco Dolstra 51e8a82f1e Merge pull request #89297 from Ma27/bump-hydra 
hydra-unstable: 2020-04-16 -> 2020-06-01
 2020-06-09 11:19:47 +02:00
Eelco Dolstra 97fc8af29b flake.nix: Remove edition field 2020-06-08 12:45:17 +02:00
Eelco Dolstra b00463d406 Merge pull request #89479 from edolstra/nix-2.4-completion 
Don't enable nix-bash-completions when using Nix 2.4
 2020-06-05 13:29:10 +02:00
Eelco Dolstra 96795314de Merge pull request #89476 from edolstra/bump-minver 
Bump minver.nix to 2.2
 2020-06-05 13:28:02 +02:00
Eelco Dolstra bbfc47326b Don't enable nix-bash-completions when using Nix 2.4 
2.4 has its own completion script which collides with
nix-bash-completions.
 2020-06-04 14:18:18 +02:00
Eelco Dolstra 8f9e4bef4c Bump minver.nix to 2.2 
Note: NixOS 19.03 had Nix 2.2 and 19.09 had 2.3.
 2020-06-04 13:43:10 +02:00
Eelco Dolstra 9a9f300758 Merge pull request #89423 from LnL7/replace-base64-hashes 
treewide: replace base64 encoded hashes
 2020-06-03 19:00:08 +02:00
Eelco Dolstra aef2bc1330 nix: 2.3.6 -> 2.3.6 2020-06-03 14:57:39 +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
Eelco Dolstra b7ddd316f1 postgresql: Use runuser instead of sudo 
Currently, sudo doesn't work in a NixOS container running inside a Nix
build, because Nix's seccomp filter doesn't allow setuid programs. In
any case, runuser is a bit lower-overhead than sudo.
 2020-05-15 00:25:27 +02:00
Eelco Dolstra 0ffc85d64b Remove unused files 2020-05-14 14:34:50 +02:00
Eelco Dolstra 77d40b2205 Merge pull request #87663 from nlewo/nixUnstable 
nixUnstable: pre7346_5e7ccdc9 -> pre7534_b92f58f6
 2020-05-12 15:44:11 +02:00
Eelco Dolstra 10d74709fe Merge pull request #87191 from edolstra/no-nested-logs 
testing{-python}.nix: Remove log pretty-printing cruft
 2020-05-09 09:00:27 +02:00
Eelco Dolstra 2e1e115472 Remove outdated reference to nix-log2xml 2020-05-07 16:01:29 +02:00
Eelco Dolstra 3f80fadec4 testing{-python}.nix: Remove log pretty-printing cruft 
This completes the removal of the nested log feature, which previously
got removed from Nix, Hydra, stdenv and GNU Make. In particular, this
means that the output of VM builds no longer contains a copy of
jQuery.
 2020-05-07 15:56:30 +02:00
Eelco Dolstra 06b9302baa Merge pull request #87182 from edolstra/no-experimental 
Don't use the 'nix' command
 2020-05-07 15:47:06 +02:00
Eelco Dolstra 78f2a83029 test-driver.py: Fix deadlock when the log queue gets full 
If a program (e.g. nixos-install) writes more than 1000 lines to
stderr during execute(), then process_serial_output() deadlocks
waiting for the queue to be processed. So use an unbounded queue
instead.

We should probably get rid of the structured log output (log.xml),
since then we don't need the log queue anymore.
 2020-05-07 15:25:24 +02:00
Eelco Dolstra ecdb5c4320 nixos-install: 'nix build' -> nix-build 
'nix build' is an experimental command so we shouldn't use it
yet. (nixos-rebuild also uses 'nix', but only when using flakes, which
are themselves an experimental feature.)
 2020-05-07 13:12:29 +02:00
Eelco Dolstra 9bf75a27f4 Revert "nix-daemon.nix: Use 'nix ping-store' to initialize directories" 
This reverts commits 9d0de0dc57,
27d2857a99. 'nix ping-store' is an
experimental command so it doesn't work in Nix 2.4 unless you set
'experimental-features = nix-command' in nix.conf.
 2020-05-07 12:39:22 +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
Eelco Dolstra 4426104c8c Merge pull request #85711 from worldofpeace/gnome-iso 
nixos/release: add GNOME ISO
 2020-04-28 21:03:03 +02:00
Eelco Dolstra f76d7b5e41 Merge pull request #85620 from matthewbauer/use-modulesPath-for-nixos-generate-config 
nixos/nixos-generate-config.pl: use modulesPath instead of <nixpkgs>
 2020-04-20 17:25:17 +02:00
Eelco Dolstra 87d598e310 Merge pull request #85117 from r-ryantm/auto-update/opensubdiv 
opensubdiv: 3.4.0 -> 3.4.3
 2020-04-13 09:43:17 +02:00
Eelco Dolstra aa084e2a24 nix: Fix fallback paths 2020-04-10 21:13:15 +02:00
Eelco Dolstra cea352d276 nix: 2.3.3 -> 2.3.4 2020-04-10 17:23:28 +02:00
Eelco Dolstra 50913242ab Merge pull request #81500 from primeos/tcp-cong-switch-to-cubic 
linux config: Set TCP_CONG_CUBIC=yes to restore the default
 2020-04-06 17:11:31 +02:00
Eelco Dolstra 7121160d5b Merge pull request #84214 from edolstra/update-nix 
Update nixUnstable + nixFlakes, remove nix1
 2020-04-05 10:20:02 +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
Eelco Dolstra 18539b1041 kscreen: Fix #82141 
https://bugs.kde.org/show_bug.cgi?id=417316
 2020-04-03 18:04:25 +02:00
Eelco Dolstra 469f14ef0f Don't pin 'nixpkgs' in the system registry by default 
Nixpkgs takes up a lot of disk space so we shouldn't do this by
default.
 2020-04-03 14:41:48 +02:00
Eelco Dolstra 6b46563e44 Merge pull request #84125 from edolstra/system-registry 
nix-daemon.nix: Add option nix.registry
 2020-04-02 21:44:47 +02:00
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
Eelco Dolstra 9737f24919 packagekit: Don't depend on nix unless enableNixBackend = true 2020-04-02 19:32:21 +02:00
Eelco Dolstra 24519c87e8 kdeApplications: 19.12.1 -> 19.12.3 2020-03-31 22:31:53 +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 e51c7f60cb nixos/release-small.nix: Export options job 2020-03-24 21:17:53 +01:00
Eelco Dolstra 4052f9b849 Compress optionsJSON using brotli 2020-03-24 16:42:04 +01: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 98481cfdfa Merge pull request #83199 from edolstra/remove-manual-service 
Remove manual service
 2020-03-24 15:26:54 +01:00
Eelco Dolstra bd379be538 Remove unused 'rogue' service 2020-03-24 15:25:20 +01:00
Eelco Dolstra aebf9a4709 services/misc/nixos-manual.nix: Remove 
Running the manual on a TTY is useless in the graphical ISOs and not
particularly useful in non-graphical ISOs (since you can also run
'nixos-help').

Fixes #83157.
 2020-03-24 15:25:20 +01:00
Eelco Dolstra a0a61c3e34 nixos-option: Disable on Nix >= 2.4 because it doesn't compile 
This is needed when using the overlay from the Nix flake.
 2020-03-20 14:52:22 +01:00
Eelco Dolstra 9b2ac44106 Merge pull request #80961 from veprbl/pr/glibc_prlimit64 
glibc: provide fallback for kernels with missing prlimit64
 2020-03-04 14:58:45 +01:00
Eelco Dolstra 4c0821461e enable-coverage-instrumentation.sh: Fix unbound variable error 
https://hydra.nixos.org/build/113299582
 2020-02-28 12:31:50 +01:00
Eelco Dolstra 74c82056c9 lcov: Support gcc 9 
https://github.com/linux-test-project/lcov/issues/58
https://github.com/Homebrew/homebrew-core/pull/50070
 2020-02-28 12:31:41 +01:00
Eelco Dolstra 39892985b0 nixFlakes: 2.4pre20200207_d2032ed -> 2.4pre20200220_4a4521f 2020-02-24 10:52:45 +01:00
Eelco Dolstra 21a3b141c3 nix-fallback-paths.nix: Fix x86_64-linux path 
https://github.com/NixOS/nix/issues/3370
 2020-02-24 10:16:26 +01:00
Eelco Dolstra 3c47f78e82 nix: 2.3.2 -> 2.3.3 2020-02-19 01:54:25 +01:00
Eelco Dolstra 2de3caf011 nixos/release-combined.nix: List constituents of the 'tested' job by name 
https://github.com/NixOS/hydra/issues/715
 2020-02-17 17:20:45 +01:00
Eelco Dolstra 895042956f nixos/release-small.nix: List constituents of the 'tested' job by name 
https://github.com/NixOS/hydra/issues/715
 2020-02-17 16:37:10 +01:00
Eelco Dolstra f0f040c3f7 nixos/modules/misc/version.nix: Don't parse .git 
This leads to inconsistent results between local builds and
Hydra. Also Nix is not a general purpose language, we shouldn't be
parsing .git from inside Nix code.
 2020-02-15 20:16:14 +01:00
Eelco Dolstra a5f883e535 nixos/modules/installer/cd-dvd/channel.nix: Handle null config.system.nixos.revision 2020-02-15 20:16:14 +01:00
Eelco Dolstra 3182fbdeaa nixos/release.nix: Import './..' instead of nixpkgs 
'nixpkgs' is a result of a call to cleanSource, which is very
expensive and fails in --dry-run mode.
 2020-02-12 22:44:59 +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 0e6ceb8758 Merge pull request #68897 from edolstra/master 
Flake support
 2020-02-10 16:44:54 +01:00
Eelco Dolstra a1fa9e65ca flake.nix: Add note 2020-02-10 16:36:53 +01:00
Eelco Dolstra fb05afd78d Doh 2020-02-10 16:32:59 +01:00
Eelco Dolstra 64e5f4d53b Fix 'nix flake check' 2020-02-10 16:26:33 +01:00
Eelco Dolstra 5c389f84d4 lib/tests/misc.nix: Don't make a copy on Nixpkgs 2020-02-10 16:21:04 +01:00
Eelco Dolstra a274da605d lib/tests/misc.nix: Fix dependency on currentSystem 
This doesn't work in pure mode.
 2020-02-10 16:20:41 +01:00
Eelco Dolstra 8f86624ac9 nixos-rebuild: Remove TODOs 2020-02-10 15:45:27 +01:00
Eelco Dolstra c05cc615f2 nixos.revision: Use null instead of "master" 
"master" is not a valid SHA-1 commit hash, and it's not even
necessarily the branch used. 'nixos-version --revision' now returns an
error if the commit hash is not known.
 2020-02-10 15:45:15 +01:00
Eelco Dolstra b98ea45608 nixos-version --json: Use builtins.toJSON 2020-02-10 15:45:10 +01:00
Eelco Dolstra f9392f04ae nixos-rebuild: Remove --keep-going flag 2020-02-10 15:45:06 +01:00
Eelco Dolstra 4089dbf090 nixos-rebuild: Make 'edit' work with with flakes 2020-02-10 15:45:03 +01:00
Eelco Dolstra c08930874a nixos-rebuild: Propagate various flake lock file flags 
And also --refresh and --no-net.
 2020-02-05 23:15:18 +01:00
Eelco Dolstra 60330b6065 flake.nix: Handle missing rev attribute 
Dirty trees no longer set 'rev', so we need to handle this.
 2020-02-05 23:15:18 +01:00
Eelco DolstraandJörg Thalheim 2a0cf385d2 nixos-rebuild: Avoid subshell reading hostname 
Co-Authored-By: Jörg Thalheim <Mic92@users.noreply.github.com>
 2020-02-05 23:15:18 +01:00
Eelco Dolstra 7ff2e743e8 flake.nix: Support more systems 2020-02-05 23:15:18 +01:00
Eelco Dolstra 0bf1ab421b flake.nix: Remove packages, builders outputs 2020-02-05 23:15:18 +01:00
Eelco Dolstra 2452042c47 nixos-rebuild: Support -L flag 2020-02-05 23:15:18 +01:00
Eelco Dolstra 98e322b929 nixos-rebuild: uri -> url 2020-02-05 23:15:18 +01:00
Eelco Dolstra bda94ae808 epoch -> edition 2020-02-05 23:15:18 +01:00
Eelco Dolstra fb051f0dec nixos-{rebuild,container}: Use flakeref#attrpath syntax 
This makes them consistent with the 'nix' command line.
 2020-02-05 23:15:18 +01:00
Eelco Dolstra 20087bd553 nixos-container: Add flake support 
E.g. to create a container that runs the NixOS homepage:

  $ nixos-container create homepage --flake nixos-homepage

And to upgrade it:

  $ nixos-container update homepage
 2020-02-05 23:15:18 +01:00
Eelco Dolstra cfd468adbb nixos-rebuild: Use /etc/nixos/flake.nix if it exists 2020-02-05 23:15:18 +01:00
Eelco Dolstra 26e4d09c9c Export nixosModules.notDetected 2020-02-05 23:15:18 +01:00
Eelco Dolstra 7e9b745174 nixos-version: Add --json flag and show system.configurationRevision 2020-02-05 23:15:18 +01:00
Eelco Dolstra 855fcc324a Add option system.configurationRevision to record revision of top-level flake 2020-02-05 23:15:18 +01:00
Eelco Dolstra b91803bf13 nixosSystem: Automatically set version suffix from flake 
E.g.

  $ nixos-version
  19.03.20190913.af5eb77 (Koi)
 2020-02-05 23:15:18 +01:00
Eelco Dolstra 22cc7ab78c nixos-rebuild: Add --flake option 2020-02-05 23:15:18 +01:00
Eelco Dolstra 6a210fa345 flake.nix: Remove obsolete name attribute 2020-02-05 23:14:32 +01:00
Eelco Dolstra 63bcbc19cd Update flake interface 2020-02-05 23:14:32 +01:00
Eelco Dolstra 2ba1f3c195 Add flake outputs for the manuals 2020-02-05 23:14:32 +01:00
Eelco Dolstra f16ca590c7 Remove flake.lock 2020-02-05 23:14:32 +01:00
Eelco Dolstra 395f044bbe flake.nix: Update epoch 2020-02-05 23:14:32 +01:00
Eelco Dolstra b70a4436c6 flake.nix: provides -> outputs 2020-02-05 23:14:32 +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
Eelco Dolstra 0f913dee48 flake.nix: Add check 2020-02-05 23:14:32 +01:00
Eelco Dolstra af376fdc23 legacyPkgs -> legacyPackages 2020-02-05 23:14:32 +01:00
Eelco Dolstra b7cbbfff51 Add flake.lock 2020-02-05 23:14:32 +01:00
Eelco Dolstra 57ccd736bb Export a function for building NixOS system configurations 2020-02-05 23:14:32 +01:00
Eelco Dolstra 123dea9b0d flake.nix: Set system explicitly for now 
Flakes now are evaluated in pure mode, so we can't rely on
currentSystem anymore.
 2020-02-05 23:14:32 +01:00
Eelco Dolstra 8eaf02b9cd Add flake.nix 2020-02-05 23:14:32 +01:00
Eelco Dolstra 26aba55951 Revert "add config.environment.ld-linux" 
This reverts commit af665d822a, see
https://github.com/NixOS/nixpkgs/pull/78798#issuecomment-580059834 for
the reasons in a similar PR.
 2020-02-02 15:29:49 +01:00
Eelco Dolstra 5495cb91eb Revert "rmdir: avoid failing when directory did not exist" 
This reverts commit 45db499d2d.
 2020-02-02 15:29:40 +01:00