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

302191 commits

Author SHA1 Message Date
github-actions[bot] f0bb8c9a78
Merge master into staging-next 2021-07-14 18:01:12 +00:00
Tomek Mańko d75b67bfa4 rebar3: skip failing tests on M1 chip 2021-07-15 02:34:04 +09:00
Michael Adler 8a815af428 citrix-workspace: 21.03.0 -> 21.06.0 2021-07-14 09:38:38 -07:00
Michael Raskin 0b9a7ed217
Merge pull request #130191 from Stunkymonkey/leo3-phases
leo3-bin: deprecate phases
2021-07-14 15:20:56 +00:00
Felix Buehler cdf9e86ad1 leo3-bin: deprecate phases 2021-07-14 16:38:38 +02:00
Mario Rodas b141a58ff2
Merge pull request #130179 from marsam/update-nodejs-16_x
nodejs-16_x: 16.4.2 -> 16.5.0
2021-07-14 09:31:09 -05:00
Guillaume Girol 76df22f462
Merge pull request #129992 from peterhoeg/u/rdiff-backup
rdiff-backup: 1.3.3 -> 2.0.5
2021-07-14 14:30:50 +00:00
Guillaume Girol 05e46e3e1f
Merge pull request #113242 from lopsided98/uwsgi-cross
uwsgi: fix cross-compilation
2021-07-14 14:22:22 +00:00
Oleksii Filonenko 9b4f7584f3
Merge pull request #130182 from marsam/update-starship 2021-07-14 17:17:37 +03:00
Guillaume Girol d9bb47a3c1
Merge pull request #129871 from symphorien/tree-sitter-latex
tree-sitter-latex: init at HEAD
2021-07-14 14:16:27 +00:00
Guillaume Girol 983d828e4d
Merge pull request #130168 from Stunkymonkey/grepm-phase
grepm: deprecate phases
2021-07-14 14:10:01 +00:00
Guillaume Girol fa084c8474
Merge pull request #130170 from Stunkymonkey/pdfdiff-phase
pdfdiff: deprecate phases
2021-07-14 14:08:07 +00:00
Jörg Thalheim 04828c857b
Merge pull request #130181 from Mic92/merge-staging-next
Fix merge conflicts: master -> staging-next
2021-07-14 15:03:46 +01:00
Mario Rodas 5a655ff306
Merge pull request #130068 from r-ryantm/auto-update/bazelisk
bazelisk: 1.9.0 -> 1.10.0
2021-07-14 08:49:46 -05:00
Mario Rodas 644b656d09 starship: 0.55.0 -> 0.56.0
https://github.com/starship/starship/releases/tag/v0.56.0
2021-07-14 08:47:58 -05:00
Jörg Thalheim 7afa51c2bd Merge remote-tracking branch 'upstream/master' into HEAD 2021-07-14 15:45:51 +02:00
Mario Rodas 1ee2dd6dd3
Merge pull request #103349 from maksar/master
ruby-modules gem-config: add exif
2021-07-14 08:31:10 -05:00
Mario Rodas cf8defb1dd nodejs-16_x: 16.4.2 -> 16.5.0
https://github.com/nodejs/node/releases/tag/v16.5.0
2021-07-14 08:27:09 -05:00
Robert Helgesson d44ce53e07 svtplay-dl: 4.0 -> 4.1
Also add basic install check.
2021-07-14 15:23:42 +02:00
Martin Weinelt f40fa6014e
Merge pull request #130171 from mweinelt/borgbackup
borgbackup: only include pyfuse3 when not on darwin
2021-07-14 15:20:02 +02:00
Felix Bühler 91932cbdfa
sublime3/4: deprecate phases (#130169) 2021-07-14 15:16:07 +02:00
Martin Weinelt 090638e14e
borgbackup: only include pyfuse3 when not on darwin
It includes the fuse package which does not eval on darwin.
2021-07-14 14:41:19 +02:00
Guillaume Girol 2bd1e823a9
Merge pull request #123137 from Mindavi/libwebsockets/4.2.0
Libwebsockets: add and use 4.2.0 as default
2021-07-14 12:41:05 +00:00
Felix Buehler 339365aa67 pdfdiff: deprecate phases 2021-07-14 14:12:46 +02:00
Michael Weiss c4bfe87fc3
Merge pull request #130167 from primeos/chromiumDev
chromiumDev: 93.0.4557.4 -> 93.0.4573.0
2021-07-14 14:11:23 +02:00
Felix Buehler 7ea0638338 grepm: deprecate phases 2021-07-14 14:09:53 +02:00
Guillaume Girol 5a4320c4e6
Merge pull request #124415 from misuzu/aarch64-boot-test
nixos/boot: test on aarch64
2021-07-14 12:01:02 +00:00
Michael Weiss 96a3799050
chromiumDev: 93.0.4557.4 -> 93.0.4573.0 2021-07-14 13:51:47 +02:00
Lucas Ransan 86bb129011
glfw: add version with wayland support (#129367) 2021-07-14 12:45:21 +02:00
misuzu 930daac345 nixos/boot: test on aarch64 2021-07-14 12:47:12 +03:00
misuzu 702a1c23a4 nixos/test-driver: allow overriding qemu binary in create_startcommand 2021-07-14 12:47:12 +03:00
misuzu 2668c75886 ipxe: fix installPhase and license 2021-07-14 12:47:12 +03:00
ajs124 a14985cd28 ipxe: allow building on aarch64 2021-07-14 12:47:11 +03:00
Rok Garbas ae7c092d88
Merge pull request #120297 from rsynnest/master
nixos/unifi-video module and supporting packages
2021-07-14 11:45:25 +02:00
Maximilian Bosch b4c4784f7e
Merge pull request #129924 from Ma27/flake-modules-pos
flake/lib.nixosSystem: add `_file`-keys for error-location if needed
2021-07-14 10:29:04 +02:00
Maximilian Bosch e14c245934
flake/lib.nixosSystem: add _file-keys for error-location
When inlining a module with a problematic declaration, you usually get
get a not-so helpful error like this:

    $ cat flake.nix
    {
      description = "A very basic flake";
      inputs.nixpkgs.url = path:../.;
      outputs = { self, nixpkgs }: {
        nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
          system = "x86_64-linux";
          modules = [
            ({ lib, ... }: { services.wrong = 2; })
            { services.nginx.enable = true; }
          ];
        };
      };
    }
    $ nixos-rebuild build --flake .#foo -L
    error: The option `services.wrong' does not exist. Definition values:
           - In `<unknown-file>': 2

While it's certainly possible to guess where this comes from, this is
IMHO fairly confusing for beginners (and kinda reminds me of the
infamous "infinite recursion at undefined position"-error).

The module-system determines the position of a declaration using the
`_file`-key: this is either `toString path` if `path` is e.g. a value
from `imports = [ ./foo.nix ]` or the file used as `NIXOS_CONFIG` in
`<nixpkgs/nixos>`.

However such a mechanism doesn't exist (yet) for inlined flake modules,
so I tried to implement this in a fairly basic way:

* For non-path declarations, the position of `modules` inside the
  `flake.nix` which declares these modules is determined by doing
  `unsafeGetAttrPos` on the `modules`-argument of `lib.nixosSystem`.

  So the `flake.nix` from above would now raise the following
  error-message:

        $ nixos-rebuild build --flake .#foo -L
        error: The option `services.wrong' does not exist. Definition values:
               - In `/nix/store/4vi3nhqjyma73ygs4f93q38qjkhkaxw8-source/flake.nix': 2

Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
Co-authored-by: Silvan Mosberger <github@infinisil.com>
Co-authored-by: Robert Hensing <robert@roberthensing.nl>
2021-07-14 10:12:57 +02:00
Domen Kožar 9ea790e2f0
Merge pull request #129427 from NixOS/gha-tarball
GHA: add basic eval checks
2021-07-14 09:10:09 +02:00
zowoq 53caacaf56
Merge pull request #130111 from maxeaubrey/go_1.15.14_1.16.6
go_1_15: 1.15.13 -> 1.15.14, go_1_16: 1.16.5 -> 1.16.6
2021-07-14 13:02:18 +10:00
Ben Siraphob abdd929588
Merge pull request #130146 from SuperSandro2000/git.archlinux.org-move
treewide: convert all links git.archlinux.org to github.com/archlinux…
2021-07-14 09:59:30 +07:00
Jan Tojnar 21f3b2b50b
Merge pull request #126558 from zhaofengli/libproxy-optional-js
libproxy: Make JavaScript optional
2021-07-14 03:59:33 +02:00
Jan Tojnar 5fb893f922
Merge pull request #124315 from piegamesde/gnome-extensions
gnomeExtensions: Some more cleanup
2021-07-14 03:56:18 +02:00
Peter Hoeg aab4b6b493 rdiff-backup: 1.3.3 -> 2.0.5 2021-07-14 09:54:12 +08:00
Sandro 0d45160a61
Merge pull request #129912 from pbek/patch-2 2021-07-14 03:46:19 +02:00
Vanilla b7a7969c1a
layan-gtk-theme: init at 2021-06-30 (#130064)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-14 03:42:01 +02:00
Sandro cbdfe4eb8a
Merge pull request #129763 from pandaman64/master
build-rust-crate: disable incremental builds
2021-07-14 03:41:06 +02:00
Sandro 2e557d0510
Merge pull request #130147 from mikepurvis/patch-1 2021-07-14 03:38:41 +02:00
upkeep-bot 4d581620e2 vscodium: 1.58.0 -> 1.58.1 2021-07-14 10:37:37 +09:00
Sandro Jäckel 388a4ef423
treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* 2021-07-14 03:35:21 +02:00
piegames 3c85c0c975 gnomeExtensions.appindicator: Remove manual packaging 2021-07-14 03:35:12 +02:00
piegames e7d7df799f gnomeExtensions.dynamic-panel-transparency: Remove manual packaging 2021-07-14 03:35:12 +02:00