Commit Graph
100 Commits
Author SHA1 Message Date
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
Eelco Dolstra eaf1fbaef4 nixos-rebuild: --use-remote-sudo does not take an argument
Also remove outdated comment about trailing space.
2020-02-01 10:09:33 +01:00
Eelco Dolstra 40f3bf66f6 Merge pull request #66640 from worldofpeace/iso-gnome3
rename iso_graphical to iso_plasma5
2020-01-27 23:33:17 +01:00
Eelco Dolstra 1d59cdcb2a ISSUE_TEMPLATE: 'nix run' -> 'nix-shell -p'
'nix run' is an experimental command.
2020-01-05 22:47:43 +01:00
Eelco Dolstra 0ec8c3bb12 Revert "nix: build using gcc8"
This reverts commit 7ac90533a1.
2020-01-05 20:42:44 +01:00
Eelco Dolstra 3b15451291 nix: 2.3.1 -> 2.3.2 2020-01-05 20:35:43 +01:00
Eelco Dolstra aa1a41b60b maintainer-list: Update edolstra email address 2019-12-26 02:49:24 +01:00
Eelco Dolstra e82fae1a39 rustc: 1.39 -> 1.40 2019-12-24 16:15:36 +00:00
Eelco Dolstra 946c5fb8f7 Tweag releaase notes 2019-12-03 15:09:55 +01:00
Eelco Dolstra 56588e9eaa Merge pull request #74850 from davidak/PRETTY_NAME
nixos/version: PRETTY_NAME in /etc/os-release uses the release now
2019-12-03 15:08:52 +01:00
Eelco Dolstra 68f06e4438 keyctl: 1.6 -> 1.6.1 2019-11-20 17:24:21 +01:00
Eelco Dolstra 0b4b9651b8 Merge pull request #73050 from taku0/firefox-use-rust-1.38.0
firefox: use rustc 1.38.0
2019-11-08 16:24:08 +01:00
Eelco Dolstra e4a6fba808 Merge pull request #73039 from taku0/rust_multiple_version
rust: keep multiple version
2019-11-08 14:34:38 +01:00
Eelco Dolstra 5a4b2057d6 Merge pull request #72980 from edolstra/rust-1.39
rustc: 1.38.0 -> 1.39.0
2019-11-07 23:14:51 +01:00
Eelco Dolstra 14ee26ccf5 rustc: 1.38.0 -> 1.39.0 2019-11-07 15:04:06 +01:00
Eelco Dolstra 50ea99cbc1 nixos/tests/quake3.nix: Remove
This was a demo of the VM testing approach in an old paper but there's
no need to keep it around.
2019-11-05 15:14:30 +01:00
Eelco Dolstra aa98348f88 jormungandr: Remove
This is a good example of a package/module that should be distributed
externally (e.g. as a flake [1]): it's not stable yet so anybody who
seriously wants to use it will want to use the upstream repo. Also,
it's highly specialized so NixOS is not really the right place at the
moment (every NixOS module slows down NixOS evaluation for everybody).

[1] https://github.com/edolstra/jormungandr/tree/flake
2019-11-05 15:00:58 +01:00
Eelco Dolstra 52e739cc58 nix-daemon.nix: Fix checkConfig 2019-10-23 21:30:28 +02:00
Eelco Dolstra fc2592b2d6 nixFlakes: 2.4pre20190922_382aa05 -> 2.4pre20191022_9cac895 2019-10-23 00:24:25 +02:00
Eelco Dolstra e89e0385c1 nlohmann_json: 3.6.1 -> 3.7.0
Also install multiple headers (in particular to get json_fwd.hpp,
which Nix needs).
2019-10-23 00:24:25 +02:00
Eelco Dolstra 5b324c1825 Remove references to the nixpkgs-channels repo
Channel branches are now provided in the nixpkgs repo.

Issue #71176.
2019-10-17 19:44:03 +02:00
Eelco Dolstra 328796d734 makeInitrd: Use stdenvNoCC 2019-10-11 17:12:09 +02:00
Eelco Dolstra cae6db88d3 nukeReferences: Use stdenvNoCC 2019-10-11 17:12:09 +02:00
Eelco Dolstra e8bc181154 Merge pull request #70874 from edolstra/no-world-writable-per-user
[WIP] Don't create /nix/var/nix/{gcroots,per-user}/per-user with 1777 permission
2019-10-10 16:28:49 +02:00
Eelco Dolstra 9d0de0dc57 nix-daemon.nix: Shut up warning 2019-10-10 16:24:33 +02:00
Eelco Dolstra 27d2857a99 nix-daemon.nix: Use 'nix ping-store' to initialize directories 2019-10-10 16:24:33 +02:00
Eelco Dolstra 2c97f0669d Typo 2019-10-10 16:24:33 +02:00
Eelco Dolstra 4b950c42cd nix-daemon.nix: Drop Nix 1.x compatibility
Probably didn't work anyway anymore.
2019-10-10 16:24:33 +02:00
Eelco Dolstra 4e0d6a5ff8 Don't create /nix/var/nix/{gcroots,per-user}/per-user with 1777 permission
In fact, don't create them at all because Nix does that automatically.

Also remove modules/programs/shell.nix because everything it did is
now done automatically by Nix.
2019-10-10 16:24:33 +02:00
Eelco Dolstra 3ab3614e2b nix: 2.3 -> 2.3.1 2019-10-10 16:23:33 +02:00
Eelco Dolstra b407822b85 locate.nix: Don't create /var/cache
Fixes

  setting up tmpfiles
  [/etc/tmpfiles.d/var.conf:19] Duplicate line for path "/var/cache", ignoring.
2019-10-08 21:45:42 +02:00
Eelco Dolstra 72531b1806 Merge pull request #70683 from dtzWill/fix/systemd-refs-to-sbin-modprobe
systemd: fix /sbin/modprobe usage in logind, nspawn@ service files
2019-10-08 11:12:25 +02:00
Eelco Dolstra 37c22b9d30 Revive systemd.coredump.enable 2019-10-07 20:28:13 +02:00
Eelco Dolstra 39c0e489d3 Revert "make-disk-image: replace nixos-install by nix-env calls"
This reverts commit e9bf955fd6. We use
nixos-install to ensure that make-disk-image produces the same result
as a regular installation (9802da517f)
and to reduce code duplication. If there is something broken in
nixos-install, it should be fixed there.
2019-10-07 17:21:28 +02:00
Eelco Dolstra ff8ca925b1 Merge pull request #70317 from alyssais/perl-install
Revert "perl-modules: do not create perllocal.pod, for determinism"
2019-10-07 13:26:25 +02:00
Eelco Dolstra 1be54bd0ad Merge pull request #69534 from edolstra/rustc-1.38.0
rustc: 1.37.0 -> 1.38.0
2019-09-30 12:58:25 +02:00
Eelco Dolstra 9c0968fd81 rustc: 1.37.0 -> 1.38.0 2019-09-26 16:34:48 +02:00
Eelco Dolstra adb15c3a63 Revert "rustc: Provide compiler-rt sources"
This reverts commit b7a8280312. It's no
longer needed with Rust 1.38.
2019-09-26 14:50:07 +02:00
Eelco Dolstra c8bc18bcc2 awscli: Get rid of runtime -dev dependencies 2019-09-23 19:24:05 +02:00
Eelco Dolstra 760bcf678e libotr: Use multiple outputs 2019-09-23 19:23:25 +02:00
Eelco Dolstra 711cbb9117 rtl8812au, rtl8821au: Prevent runtime dependency on kernel.dev 2019-09-23 19:23:21 +02:00
Eelco Dolstra 38bb1c373f Merge pull request #69295 from mayflower/fix/pick-more-systemd-tmpfiles-examples
nixos/systemd: pick more upstream tmpfiles confs
2019-09-23 15:33:53 +02:00
Eelco Dolstra 13beb8d753 firefox: Use default icu 2019-09-23 09:55:57 +02:00
Eelco Dolstra 8109be4859 nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05 2019-09-22 22:01:56 +02:00
Eelco Dolstra d8e35fdbf9 vista-fonts: Use new download location 2019-09-19 22:38:31 +02:00
Eelco Dolstra b0ccd6dd16 Revert "nixos/doc: re-format"
This reverts commit ea6e8775bd. The new
format is not an improvement.
2019-09-19 19:17:30 +02:00
Eelco Dolstra 387a2f27ec Merge pull request #68906 from edolstra/revert-interface-version
Revert systemd interface version to 2
2019-09-19 14:09:18 +02:00
Eelco Dolstra b20a0e49c8 Revert systemd interface version to 2
The new systemd in 19.09 gives an "Access Denied" error when doing
"systemctl daemon-reexec" on an 19.03 system. The fix is to use the
previous systemctl to signal the daemon to re-exec itself. This
ensures that users don't have to reboot when upgrading from NixOS
19.03 to 19.09.
2019-09-16 16:51:19 +02:00
Eelco Dolstra b9ed9c7fed Typo 2019-09-16 16:50:39 +02:00
Eelco Dolstra 054f01ee1b man-nixos-rebuild.xml: Improve layout 2019-09-16 14:42:59 +02:00
Eelco Dolstra b9e81b2138 nixFlakes: 2.3pre20190830_04np4n6 -> 2.4pre20190913_a25c022 2019-09-13 20:13:14 +02:00
Eelco Dolstra 404caba16b Merge pull request #66775 from Izorkin/qemu
qemu: 4.0.0 -> 4.1.0
2019-09-09 17:36:36 +02:00
Eelco Dolstra 37e333af9a nix: 2.2.2 -> 2.3 2019-09-04 21:36:49 +02:00
Eelco Dolstra 68801b40d6 Merge pull request #62042 from thefloweringash/aarch64-ami
Amazon Images for Aarch64
2019-09-04 18:00:47 +02:00
Eelco Dolstra 4388f7709a nixFlakes: 2.3pre20190829_ebc4dae -> 2.3pre20190830_04np4n6 2019-08-30 20:00:16 +02:00
Eelco Dolstra ebce65658f nix: Reduce closure size by 48 MiB 2019-08-30 19:35:04 +02:00
Eelco Dolstra e6ab68ba1f Merge pull request #67718 from eadwu/nixUnstable/2.3pre6779_31f5ecf
nix{Flakes,Unstable}/update-1
2019-08-30 15:42:50 +02:00
Eelco Dolstra 35c1c170d7 nix.conf: Set sandbox-fallback = false
For security, we don't want the sandbox to be disabled silently.
2019-08-27 21:17:20 +02:00