3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

391848 commits

Author SHA1 Message Date
Artturin 99a52394e9 mpv: move makeWrapper to nativeBuildInputs to fix cross eval
error: attribute 'runtimeShell' missing
2022-07-14 22:08:56 +03:00
Artturin 4a25775546 lua-packages: fix eval failure when cross-compiling
remove the inherit line did not work

fixes mpv for example

nix-repl> pkgsCross.aarch64-multiplatform.lua.withPackages (ps: with ps; [ luasocket ])
error: attribute 'runtimeShell' missing

       at /home/artturin/nixgits/my-nixpkgs/pkgs/top-level/all-packages.nix:849:17:

          848|       substitutions = {
          849|         shell = targetPackages.runtimeShell;
             |                 ^
          850|         passthru.tests = tests.makeWrapper;

       … while evaluating the attribute 'shell' of the derivation 'hook'

       at /home/artturin/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:270:7:

          269|     // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
          270|       name =
             |       ^
          271|         let

       … while evaluating 'optionalString'

       at /home/artturin/nixgits/my-nixpkgs/lib/strings.nix:203:5:

          202|     # String to return if condition is true
          203|     string: if cond then string else "";
             |     ^
          204|

       … from call site

       at /home/artturin/nixgits/my-nixpkgs/pkgs/build-support/trivial-builders.nix:536:12:

          535|         cp ${script} $out/nix-support/setup-hook
          536|       '' + lib.optionalString (deps != []) ''
             |            ^
          537|         printWords ${toString deps} > $out/nix-support/propagated-build-inputs

       … while evaluating the attribute 'buildCommand' of the derivation 'hook'

       at /home/artturin/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:270:7:

          269|     // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
          270|       name =
             |       ^
          271|         let

       … while evaluating anonymous lambda

       at /home/artturin/nixgits/my-nixpkgs/lib/lists.nix:646:25:

          645|    */
          646|   unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [];
             |                         ^
          647|

       … from call site

       at /home/artturin/nixgits/my-nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix:105:27:

          104|   # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
          105|   externalDepsGenerated = lib.unique (lib.filter (drv: !drv ? luaModule) (
             |                           ^
          106|     luarocksDrv.nativeBuildInputs ++ luarocksDrv.propagatedBuildInputs ++ luarocksDrv.buildInputs)

       … while evaluating 'generateLuarocksConfig'

       at /home/artturin/nixgits/my-nixpkgs/pkgs/development/lua-modules/lib.nix:83:28:

           82|   */
           83|   generateLuarocksConfig = {
             |                            ^
           84|     externalDeps

       … from call site

       at /home/artturin/nixgits/my-nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix:85:23:

           84|   luarocks_content = let
           85|     generatedConfig = lua.pkgs.lib.generateLuarocksConfig {
             |                       ^
           86|       externalDeps = externalDeps ++ externalDepsGenerated;

       … while evaluating the attribute 'configurePhase' of the derivation 'lua5.2-luasocket-3.0.0-1-aarch64-unknown-linux-gnu'

       at /home/artturin/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:270:7:

          269|     // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
          270|       name =
             |       ^
          271|         let

       … while evaluating anonymous lambda

       at /home/artturin/nixgits/my-nixpkgs/lib/lists.nix:646:25:

          645|    */
          646|   unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [];
             |                         ^
          647|

       … from call site

       at /home/artturin/nixgits/my-nixpkgs/pkgs/development/lua-modules/lib.nix:5:6:

            4|     modules =  filter hasLuaModule drvs;
            5|   in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules));
             |      ^
            6|   # Check whether a derivation provides a lua module.

       … while evaluating 'requiredLuaModules'

       at /home/artturin/nixgits/my-nixpkgs/pkgs/development/lua-modules/lib.nix:3:24:

            2| let
            3|   requiredLuaModules = drvs: with lib; let
             |                        ^
            4|     modules =  filter hasLuaModule drvs;

       … from call site

       at /home/artturin/nixgits/my-nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix:13:14:

           12|   env = let
           13|     paths =  requiredLuaModules (extraLibs ++ [ lua ] );
             |              ^
           14|   in buildEnv {

       … while evaluating the attribute 'passAsFile'

       at /home/artturin/nixgits/my-nixpkgs/pkgs/build-support/buildenv/default.nix:77:5:

           76|     # XXX: The size is somewhat arbitrary
           77|     passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ];
             |     ^
           78|   }

       … while evaluating the attribute 'passAsFile' of the derivation 'lua-aarch64-unknown-linux-gnu-5.2.4-env'

       at /home/artturin/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:270:7:

          269|     // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
          270|       name =
             |       ^
          271|         let
2022-07-14 22:08:55 +03:00
Artturi ada17132ec
Merge pull request #181413 from Artturin/introspectionfun
gobject-introspection: override pkg-config variables in a setup hook
2022-07-14 18:16:00 +03:00
github-actions[bot] 5b00bdffa2
Merge staging-next into staging 2022-07-14 12:02:11 +00:00
github-actions[bot] 58eb752984
Merge master into staging-next 2022-07-14 12:01:31 +00:00
Mario Rodas b0af875280
Merge pull request #181318 from centromere/libuv-1.44.2
libuv: 1.44.1 -> 1.44.2
2022-07-14 06:52:09 -05:00
Mario Rodas 81519a8314
Merge pull request #181464 from r-ryantm/auto-update/nodejs-18_x
nodejs-18_x: 18.5.0 -> 18.6.0
2022-07-14 06:48:20 -05:00
Martin Weinelt 1bfb66edf8
Merge pull request #181312 from r-ryantm/auto-update/firefox-esr-102-unwrapped 2022-07-14 13:33:05 +02:00
Fabian Affolter a85e79cf6c
Merge pull request #181455 from r-ryantm/auto-update/sqlfluff
sqlfluff: 1.1.0 -> 1.2.0
2022-07-14 13:18:12 +02:00
Fabian Affolter 90c71e391a
Merge pull request #181460 from r-ryantm/auto-update/python3.10-levenshtein
python310Packages.levenshtein: 0.19.1 -> 0.19.2
2022-07-14 13:17:49 +02:00
R. Ryantm 71f758e616 gnome-console: 42.0 -> 42.2 2022-07-14 12:54:24 +02:00
Sandro 3d74eddea4
Merge pull request #179985 from wildsebastian/fix/django_3_gdal
django: fix build with gdal and use correct geos version
2022-07-14 12:08:22 +02:00
R. Ryantm ca03b94dd7 python310Packages.levenshtein: 0.19.1 -> 0.19.2 2022-07-14 10:07:45 +00:00
R. Ryantm 5ad0643e1c nodejs-18_x: 18.5.0 -> 18.6.0 2022-07-14 10:05:53 +00:00
Bobby Rong 294bba4d99
Merge pull request #181433 from r-ryantm/auto-update/godns
godns: 2.8.3 -> 2.8.4
2022-07-14 17:25:32 +08:00
R. Ryantm 647e5317eb sqlfluff: 1.1.0 -> 1.2.0 2022-07-14 09:02:30 +00:00
Martin Weinelt 1f5af608e7
Merge pull request #179433 from mweinelt/firefox-updatescript
firefox: Extend upgrade script with version prefix
2022-07-14 10:54:01 +02:00
Martin Weinelt ddeb18d6e5
Merge pull request #179813 from mweinelt/zigbee2mqtt 2022-07-14 10:53:30 +02:00
Martin Weinelt 427242c4c7
Merge pull request #181206 from mweinelt/cpython-3.11.0b4 2022-07-14 10:52:29 +02:00
Martin Weinelt 37a52d22b3
Merge pull request #181411 from NixOS/home-assistant
home-assistant: 2022.7.3 -> 2022.7.4
2022-07-14 10:51:45 +02:00
Fabian Affolter 0df6644680
Merge pull request #179981 from fabaff/metasploit-bump
metasploit: 6.2.4 -> 6.2.6
2022-07-14 10:13:57 +02:00
kilianar 5eb9bf5565 alejandra: 1.5.0 -> 2.0.0 2022-07-14 17:46:49 +10:00
zowoq 3973b7d826 kubernetes: 1.23.8 -> 1.23.9
https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.23.md#changelog-since-v1238
2022-07-14 17:46:36 +10:00
Jörg Thalheim 2aec788739
Merge pull request #181438 from kilianar/signal-desktop-5.50.0
signal-desktop: 5.49.0 -> 5.50.0
2022-07-14 09:36:28 +02:00
github-actions[bot] 70e5346a93
Merge staging-next into staging 2022-07-14 06:02:10 +00:00
github-actions[bot] 4831214ba4
Merge master into staging-next 2022-07-14 06:01:25 +00:00
kilianar 28010c8de4 signal-desktop: 5.49.0 -> 5.50.0 2022-07-14 07:32:09 +02:00
R. Ryantm 12ea6c11ba godns: 2.8.3 -> 2.8.4 2022-07-14 05:10:50 +00:00
Mario Rodas c199a0a796
Merge pull request #181395 from shanesveller/package-nushell-0.65.0
nushell: 0.64.0 -> 0.65.0
2022-07-14 00:09:44 -05:00
Mario Rodas 766f792e5e
Merge pull request #181064 from r-ryantm/auto-update/python3.10-myst-docutils
python310Packages.myst-docutils: 0.17.2 -> 0.18.0
2022-07-14 00:08:18 -05:00
Mario Rodas 4853a6f24f
Merge pull request #181241 from xrelkd/update/boringtun
boringtun: 0.4.0 -> 0.5.0
2022-07-14 00:07:33 -05:00
Artturin e8ecd00e46 gobject-introspection: override pkg-config variables in a setup hook
instead of substituteInPlace

fixes gtk2 because it needs g_ir_scanner to be a path
2022-07-14 07:14:41 +03:00
Artturi 8eb14e7e79
Merge pull request #181089 from ymatsiuk/ymatsiuk/aws-sso-cli
aws-sso-cli: wrap with xdg-utils
2022-07-14 05:30:43 +03:00
Peter Hoeg ed781ecbea meta 2022-07-14 10:30:00 +08:00
Peter Hoeg b52679fe88 keyd: init at 2.4.1 2022-07-14 10:30:00 +08:00
Artturi 756bff3405
Merge pull request #181418 from twitchyliquid64/openscad/fix-wayland
openscad: fix on wayland systems
2022-07-14 05:29:35 +03:00
zowoq e4f3664e62 go_1_18: 1.18.3 -> 1.18.4 2022-07-14 12:29:03 +10:00
Martin Weinelt 0ae92922a1
nixos/tests/home-assistant: improve reload/restart test cases
Wait until home-assistant is fully reloaded or restarted to spot
possible errors during startup.

Swap out bluetooth_tracker for esphome, since the bluetooth tracker
causes errors, when it does not find a bluetooth device.

Drop mosquitto from the environment. It wasn't used since the 2022.3.0
release when MQTT stopped being configurable from the YAML config.
2022-07-14 02:26:54 +02:00
Martin Weinelt 9e0e2fdad0
home-assistant: 2022.7.3 -> 2022.7.4
https://github.com/home-assistant/core/releases/tag/2022.7.4
2022-07-14 02:26:54 +02:00
Tom 38f8a4d71c openscad: fix on wayland systems 2022-07-13 17:18:46 -07:00
github-actions[bot] 4030af8273
Merge staging-next into staging 2022-07-14 00:03:16 +00:00
github-actions[bot] 8e78cd16b3
Merge master into staging-next 2022-07-14 00:02:36 +00:00
Martin Weinelt 6d5c66a9d9
python3Packages.bellows: 0.31.0 -> 0.31.1 2022-07-14 00:46:55 +02:00
Martin Weinelt 8d28fdd57a
Merge pull request #181287 from r-ryantm/auto-update/python3.10-pyruckus 2022-07-14 00:46:38 +02:00
Martin Weinelt 4f57df1be2
Merge branch 'master' into auto-update/python3.10-pyruckus 2022-07-14 00:46:09 +02:00
adisbladis f09cb54c94
Merge pull request #181408 from qowoz/skopeo
skopeo: 1.8.0 -> 1.9.0
2022-07-14 06:45:07 +08:00
Martin Weinelt 14968aa064
Merge pull request #181052 from r-ryantm/auto-update/python3.10-huawei-lte-api 2022-07-14 00:44:16 +02:00
zowoq a85aa567ef skopeo: 1.8.0 -> 1.9.0
https://github.com/containers/skopeo/releases/tag/v1.9.0
2022-07-14 07:59:49 +10:00
Artturi 62b1c34ac6
Merge pull request #181384 from trofi/glibcLocales-only-glibc
glibcLocales, glibcLocalesUtf8: only define non-null on linux-glibc
2022-07-14 00:56:06 +03:00
Rick van Schijndel 4d00ba8c74
Merge pull request #181360 from illustris/hadoop-fix-blocker
hadoop: fix failing evaluation on platforms other than x86_64-linux
2022-07-13 23:51:21 +02:00