diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index a9ffffe2277c..e5ee1cb01ff1 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -159,34 +159,42 @@ The following methods are available on machine objects: `execute` : Execute a shell command, returning a list `(status, stdout)`. + + Commands are run with `set -euo pipefail` set: + + - If several commands are separated by `;` and one fails, the + command as a whole will fail. + + - For pipelines, the last non-zero exit status will be returned + (if there is one; otherwise zero will be returned). + + - Dereferencing unset variables fails the command. + + - It will wait for stdout to be closed. + If the command detaches, it must close stdout, as `execute` will wait for this to consume all output reliably. This can be achieved by redirecting stdout to stderr `>&2`, to `/dev/console`, `/dev/null` or a file. Examples of detaching commands are `sleep 365d &`, where the shell forks a new process that can write to stdout and `xclip -i`, where the `xclip` command itself forks without closing stdout. + Takes an optional parameter `check_return` that defaults to `True`. Setting this parameter to `False` will not check for the return code and return -1 instead. This can be used for commands that shut down the VM and would therefore break the pipe that would be used for retrieving the return code. + A timeout for the command can be specified (in seconds) using the optional + `timeout` parameter, e.g., `execute(cmd, timeout=10)` or + `execute(cmd, timeout=None)`. The default is 900 seconds. + `succeed` : Execute a shell command, raising an exception if the exit status is - not zero, otherwise returning the standard output. Commands are run - with `set -euo pipefail` set: - - - If several commands are separated by `;` and one fails, the - command as a whole will fail. - - - For pipelines, the last non-zero exit status will be returned - (if there is one, zero will be returned otherwise). - - - Dereferencing unset variables fail the command. - - - It will wait for stdout to be closed. See `execute` for the - implications. + not zero, otherwise returning the standard output. Similar to `execute`, + except that the timeout is `None` by default. See `execute` for details on + command execution. `fail` @@ -196,10 +204,13 @@ The following methods are available on machine objects: `wait_until_succeeds` : Repeat a shell command with 1-second intervals until it succeeds. + Has a default timeout of 900 seconds which can be modified, e.g. + `wait_until_succeeds(cmd, timeout=10)`. See `execute` for details on + command execution. `wait_until_fails` -: Repeat a shell command with 1-second intervals until it fails. +: Like `wait_until_succeeds`, but repeating the command until it fails. `wait_for_unit` diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml index b194d58e5beb..7ce3e4cb2906 100644 --- a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -274,35 +274,9 @@ start_all() Execute a shell command, returning a list - (status, stdout). If the command - detaches, it must close stdout, as - execute will wait for this to consume all - output reliably. This can be achieved by redirecting stdout - to stderr >&2, to - /dev/console, - /dev/null or a file. Examples of - detaching commands are sleep 365d &, - where the shell forks a new process that can write to stdout - and xclip -i, where the - xclip command itself forks without - closing stdout. Takes an optional parameter - check_return that defaults to - True. Setting this parameter to - False will not check for the return code - and return -1 instead. This can be used for commands that - shut down the VM and would therefore break the pipe that - would be used for retrieving the return code. + (status, stdout). - - - - - succeed - - - Execute a shell command, raising an exception if the exit - status is not zero, otherwise returning the standard output. Commands are run with set -euo pipefail set: @@ -317,22 +291,63 @@ start_all() For pipelines, the last non-zero exit status will be - returned (if there is one, zero will be returned - otherwise). + returned (if there is one; otherwise zero will be + returned). - Dereferencing unset variables fail the command. + Dereferencing unset variables fails the command. - It will wait for stdout to be closed. See - execute for the implications. + It will wait for stdout to be closed. + + If the command detaches, it must close stdout, as + execute will wait for this to consume all + output reliably. This can be achieved by redirecting stdout + to stderr >&2, to + /dev/console, + /dev/null or a file. Examples of + detaching commands are sleep 365d &, + where the shell forks a new process that can write to stdout + and xclip -i, where the + xclip command itself forks without + closing stdout. + + + Takes an optional parameter check_return + that defaults to True. Setting this + parameter to False will not check for the + return code and return -1 instead. This can be used for + commands that shut down the VM and would therefore break the + pipe that would be used for retrieving the return code. + + + A timeout for the command can be specified (in seconds) + using the optional timeout parameter, + e.g., execute(cmd, timeout=10) or + execute(cmd, timeout=None). The default + is 900 seconds. + + + + + + succeed + + + + Execute a shell command, raising an exception if the exit + status is not zero, otherwise returning the standard output. + Similar to execute, except that the + timeout is None by default. See + execute for details on command execution. + @@ -353,7 +368,10 @@ start_all() Repeat a shell command with 1-second intervals until it - succeeds. + succeeds. Has a default timeout of 900 seconds which can be + modified, e.g. + wait_until_succeeds(cmd, timeout=10). See + execute for details on command execution. @@ -363,8 +381,8 @@ start_all() - Repeat a shell command with 1-second intervals until it - fails. + Like wait_until_succeeds, but repeating + the command until it fails. diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index f3e615fe5bf9..035e3ffe8973 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -526,10 +526,17 @@ class Machine: self.run_callbacks() self.connect() + # Always run command with shell opts + command = f"set -euo pipefail; {command}" + + timeout_str = "" if timeout is not None: - command = "timeout {} sh -c {}".format(timeout, shlex.quote(command)) + timeout_str = f"timeout {timeout}" + + out_command = ( + f"{timeout_str} sh -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n" + ) - out_command = f"( set -euo pipefail; {command} ) | (base64 --wrap 0; echo)\n" assert self.shell self.shell.send(out_command.encode()) diff --git a/nixos/tests/step-ca.nix b/nixos/tests/step-ca.nix index f21bd5366266..a855b590232d 100644 --- a/nixos/tests/step-ca.nix +++ b/nixos/tests/step-ca.nix @@ -9,6 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: ''; in { + name = "step-ca"; nodes = { caserver = diff --git a/nixos/tests/web-apps/peertube.nix b/nixos/tests/web-apps/peertube.nix index 706c598338e8..d42b4e3d677b 100644 --- a/nixos/tests/web-apps/peertube.nix +++ b/nixos/tests/web-apps/peertube.nix @@ -30,10 +30,11 @@ import ../make-test-python.nix ({pkgs, ...}: ''; }; - services.redis = { + services.redis.servers.peertube = { enable = true; bind = "0.0.0.0"; requirePass = "turrQfaQwnanGbcsdhxy"; + port = 6379; }; }; @@ -109,7 +110,7 @@ import ../make-test-python.nix ({pkgs, ...}: start_all() database.wait_for_unit("postgresql.service") - database.wait_for_unit("redis.service") + database.wait_for_unit("redis-peertube.service") database.wait_for_open_port(5432) database.wait_for_open_port(6379) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 64de314c760f..b553640d144e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -56,7 +56,7 @@ let , stdenvOverride ? stdenv , src ? (getCoreSrc core) , broken ? false - , version ? "unstable-2022-04-08" + , version ? "unstable-2022-04-21" , platforms ? retroarch.meta.platforms # The resulting core file is based on core name # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename @@ -359,6 +359,7 @@ in core = "dosbox"; description = "Port of DOSBox to libretro"; license = lib.licenses.gpl2Only; + stdenvOverride = gcc10Stdenv; }; eightyone = mkLibRetroCore { diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index c32f46cf2665..e9aa7d80d57f 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -35,11 +35,11 @@ }: let - version = "1.10.2"; + version = "1.10.3"; libretroCoreInfo = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - sha256 = "sha256-XOSIVH3BSwAFKUeRvyYc2OXDa+TLjoKVGl+b8fgnvtY="; + sha256 = "sha256-wIIMEWrria8bZe/rcoJwDA9aCMWwbkDQFyEU80TZXFQ="; rev = "v${version}"; }; runtimeLibs = lib.optional withVulkan vulkan-loader @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "sha256-fMsHMQiEoXeFKITxeEyRH829z5SCf8p0Hxq6ww1p3z4="; + sha256 = "sha256-nAv1yv0laqlOmB8UUkK5wSYy/ySqXloEErm+yV30bbA="; rev = "v${version}"; }; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 78969df95d30..80e4e278c945 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -20,8 +20,8 @@ "beetle-ngp": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "6abc74d9dc6a86460ab71c93c153fe1cb8ef4dbb", - "sha256": "+p3MwlzwwTghIKTDMzkqGlxhZiy/Px7xaDK3a0JagUE=" + "rev": "facf8e1f5440c5d289258ee3c483710f3bf916fb", + "sha256": "vDKDt7MvCB9XQYP291cwcEPDxfNIVgNSWtBYz9PVgcw=" }, "beetle-pce-fast": { "owner": "libretro", @@ -32,20 +32,20 @@ "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "00abc26cafb15cc33dcd73f4bd6b93cbaab6e1ea", - "sha256": "4a1wV3WKZmg1ed3BD0PN0Ap9E9XahQtilRWTGV5Ns3g=" + "rev": "bfc0954e14b261a04dcf8dbe0df8798f16ae3f3c", + "sha256": "XzCb1lZFYgsg+3eQ1OqyycNxCgLtZFA30rno3ytdnoM=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "88929ae90b4807a41b1b240377ab440e39ecf2cc", - "sha256": "5AX5FPsmsqGWCNzLgJ7lsekZaIdano2j5sb4qUkD4cQ=" + "rev": "5a24d54d30dd00d817d267cf92fd5b3f4640928f", + "sha256": "uG1BhElNW75PnfM+rEYfbl97iwRT89hnl84yvlgx6fg=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "ae30f29e340a00b33e38df85ceaa599151a47cd7", - "sha256": "nc239PRM/TfkZMWm4Zl5kSoZBQcrMcMudupvCJtTBlc=" + "rev": "dd18f9c477106263b3b7b050f4970d331ff7b23a", + "sha256": "RN5dmORtNOjIklSz/n11lz37bZ4IcPD7cyRcBGS4Oi8=" }, "beetle-snes": { "owner": "libretro", @@ -62,14 +62,14 @@ "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "a91437af0879124aa00b6cb30ca1189f2c84b7cb", - "sha256": "ryahr/g6PDvUKCPkF1D8xozNGNCa4bLw63b5Ra9Vsfo=" + "rev": "246555f8ed7e0b9e5748b2ee2ed6743187c61393", + "sha256": "96lQlDqx2bvFeovqGGkemxqS2zlHw92O6YeTEGlgf34=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "089a62477c5f51ac746a5fc8eacf3599e9feb649", - "sha256": "yaaEJ+XgrBgtTEkffgnxvt2mrp5dsDYJ+TTxCZZU5OE=" + "rev": "d1fb3f399a2bc16b9ad0f2e8c8ba9f7051cd26bd", + "sha256": "p9mJv7zBFjNh1sh5iAjBZzxP6k8ydUNDXLQIjHl9doQ=" }, "blastem": { "owner": "libretro", @@ -135,8 +135,8 @@ "eightyone": { "owner": "libretro", "repo": "81-libretro", - "rev": "6aba19246c1ec08f3de5659b2dbc3277ec6bfb97", - "sha256": "2G6NkNlvqvP5RM35ydppnr2/RRbeiIpM2HKOpt8PkgU=" + "rev": "2e34567a320cba27b9162b1776db4de3cdb7cf03", + "sha256": "vjrHRLzc9Fy0MwV9d+LlcJTGJfVsRauEig8R+erBtfw=" }, "fbalpha2012": { "owner": "libretro", @@ -147,8 +147,8 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "01bf2e189dcd96f978c3a4ae7bbbb00f2d90aabf", - "sha256": "naCfGSrwA9vO3Cu2rHLplCMcTbpx6S/sapwisFCcL5c=" + "rev": "e4625a196b9232ba93a156e3a5164aa11193f20a", + "sha256": "/5JmwuLWWBQWXnqCMjKzOC2XG6wo5a6xgQOYX1P1zcw=" }, "fceumm": { "owner": "libretro", @@ -165,8 +165,8 @@ "fmsx": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "f9ea9eacd49297783c216d147dcc1a22465b2749", - "sha256": "nDsaaUeZUm4zTj07+2nPDefoDpw18vXdhQr1BH6/4eY=" + "rev": "11fa9f3c08cde567394c41320ca76798c2c64670", + "sha256": "1u5c5oDIjjXEquh6UBv2H1F/Ln7h44DTF1ohDG0Qnww=" }, "freeintv": { "owner": "libretro", @@ -183,26 +183,26 @@ "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "144045b30a18ab4b27c3ae46490274988f302748", - "sha256": "ydnyPdkJmM+xhuJqIOxZISFcTN8RFgOLbnRvOBJORek=" + "rev": "7520ac8aae7b08262c0472e724e6ef0bfe41d285", + "sha256": "wKcO/dulgZKgXTuHdcQvfSrfxSI5UA0az6qMLtP4K6g=" }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "d4547baf26dd70a18eeb38d231ce3f998004ec30", - "sha256": "9XU9TmBpuZeAOzqxuKVQZvdHRgX8fm4HcEfleM3jB7E=" + "rev": "f0f0b31f9ab95946965b75fed8d31e19290f3d43", + "sha256": "aiegBSpQDyXzVkyWuUpI66QvA1tqS8PQ8+75U89K10A=" }, "gw": { "owner": "libretro", "repo": "gw-libretro", - "rev": "85bf5c936044db0bf4138e7eb8ab20d3a7330035", - "sha256": "yCAnveQw+VyZFQ/GsUBuyoMRQ4yfhA0f3tYghZ2HecU=" + "rev": "d08a08154ce8ed8e9de80582c108f157e4c6b226", + "sha256": "PWd/r4BBmhiNqJdV6OaXHr4XCdR1GyVipq3zvyBcqEs=" }, "handy": { "owner": "libretro", "repo": "libretro-handy", - "rev": "5145f79bb746f6d9c0b340c2f9cc4bf059848924", - "sha256": "madTjJWKM8elM35LRAwm0RwnA44skLtIK2/7RXPSNl0=" + "rev": "517bb2d02909271836604c01c8f09a79ad605297", + "sha256": "Igf/OvmnCzoWjCZBoep7T0pXsoBKq3NJpXlYhE7nr3s=" }, "hatari": { "owner": "libretro", @@ -213,14 +213,14 @@ "mame": { "owner": "libretro", "repo": "mame", - "rev": "2a0e4ea0e2362bb7dcf77216c9fcb48426cea1e8", - "sha256": "imuHEwzDpI8jbdOeOhBBfzl4k74mDq/3SrKD8upzZmo=" + "rev": "b7dd999590717638ceade2e24d16d63147aa12ad", + "sha256": "QgENNjykhO+WSxAb//J+R7QP3/rZnxqv7sarO4eBYuc=" }, "mame2000": { "owner": "libretro", "repo": "mame2000-libretro", - "rev": "f35db3877f8a79a174dd3b2e37f4ebf39d71d5a4", - "sha256": "JmtvxKWAYNk1SyV1YpFeLX49zzGqpUv6nqM82xU70OM=" + "rev": "dd9d6612c29bf5b29bc2f94cab2d43fe3dcd69ee", + "sha256": "X0fP0bNBk2hqXVdRspylLIjZO563aMXkyX4qgx/3Vr8=" }, "mame2003": { "owner": "libretro", @@ -267,8 +267,8 @@ "mesen-s": { "owner": "libretro", "repo": "mesen-s", - "rev": "3694c7f9692a0be32d86979c347884ae9def0a3b", - "sha256": "VBNl4682e2X12WNjtXZ3P4/Kw4OeRLSRWyZqYDpfmCo=" + "rev": "b0b53409eecb696fb13f411ffde72e8f576feb09", + "sha256": "lDHyeIsVsI5+ZK8EJI50alrFuu0uJmxscda5bR1UmQQ=" }, "meteor": { "owner": "libretro", @@ -297,8 +297,8 @@ "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "7dbd5c6384c4c6326004c97fd8e6fa07cb4edcef", - "sha256": "OBkWP36BzwsEW+ORF2opHlXwXHgGN0l2ZxBuyDO/sKY=" + "rev": "a9e197f2583ef4f36e9e77d930a677e63a2c2f62", + "sha256": "QqmWSk8Ejf7QMJk0cVBgpnyqcK6oLjCnnXMXInuWfYc=" }, "np2kai": { "owner": "AZO234", @@ -310,8 +310,8 @@ "o2em": { "owner": "libretro", "repo": "libretro-o2em", - "rev": "efd749cec2dd1ce42a8aa3048a89f817d271d804", - "sha256": "aw0bJyQzYFOlQQOfNsRgqdeUJP1qF4llJxLq5t9oc5g=" + "rev": "641f06d67d192a0677ec861fcb731d3ce8da0f87", + "sha256": "s3FreOziXeGhUyQdSoOywZldD21m3+OXK0EJ2Z8rXiY=" }, "opera": { "owner": "libretro", @@ -334,28 +334,28 @@ "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "37d9bf8315be570a350cd44876ae14f9b0eff20b", - "sha256": "ieuEWs+NIQFCgMl/yTnaFdClxEv5NurrLuUvkjSUar0=" + "rev": "e24732050e902bd5402b2b7da7c391d2ca8fa799", + "sha256": "tPz5E3QO6FucjYOzdjbY2FHLPz1Fmms10tdt7rZIW8U=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "bb6a52fe60e6f3bdcd17effe75e68fd0f8c44ba7", - "sha256": "wztctLbK7VE4OPJS7ixKwnN4VkQv96Te3FmJlZ5m4A0=", + "rev": "7ff457f2f833570013f2a7e2608ac40632e0735d", + "sha256": "xEG5swvvWFhvosC1XpFaZphESNaf4AtX+6UE02B57j8=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "ec2a9460ea2beeb69d30534ee8affbda4fc4b156", - "sha256": "8maLaSJiF9soJdIlYoFHSG+2XXYTdLmWH6cq9vZRd/4=", + "rev": "39eb5c2eb6da65dc76b1c4d1319175a68120a77a", + "sha256": "EF3p0lvHjKGt4pxtTAkDM+uHsnW72lN+Ki8BaZIk/BQ=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "0eea0acf13022ff8d910adb55cec14ebad825afc", - "sha256": "f1Tscndz0TcW0bUhixEvsrbFKefLfsCFjqWA7ANnfB4=", + "rev": "83b8211abf7fb705835eb1ccf8feae04816ae96c", + "sha256": "8K4bz/GUnE8GrlAVFULMXLC+i3ZYvR28EpehEg6up4s=", "fetchSubmodules": true }, "prboom": { @@ -391,20 +391,20 @@ "smsplus-gx": { "owner": "libretro", "repo": "smsplus-gx", - "rev": "8e8378896bc15c8a9f756339b596171ba266cc14", - "sha256": "zvG2SF4zx3Yaaf54NZ2DgsGPN59msW8TvQFCS4OMcHQ=" + "rev": "9de9847dc8ba458e9522d5ae8b87bf71ad437257", + "sha256": "XzqQ/3XH5L79UQep+DZ+mDHnUJKZQXzjNCZNZw2mGvY=" }, "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "78d006ffdbb5cb6944177db52c3640152948d928", - "sha256": "Qh+nLtwdLfjwYxXCv49pPPf0mqdxKRv/JLRm82knJu0=" + "rev": "3c729a9763263bc3a69f48370e43ae05e672970a", + "sha256": "01M6Wvbu1omMwh3Xg4RGh028jirGs7mLpxwKJgMRQxA=" }, "snes9x2002": { "owner": "libretro", "repo": "snes9x2002", - "rev": "25d9d4fea4c7d7fcc8608c65c2bec9bcbc41f26e", - "sha256": "EYcaWckvTfi2ajx6C1olE5pW51diLSjMdqZdyH8U2Ck=" + "rev": "c4397de75a5f11403d154abd935e39fe969bca94", + "sha256": "yL4SIRR1Er+7Iq3YPfoe5ES47nvyA3UmGK+upLzKiFA=" }, "snes9x2005": { "owner": "libretro", @@ -415,26 +415,26 @@ "snes9x2010": { "owner": "libretro", "repo": "snes9x2010", - "rev": "b12f3ba46f09dd5d0254676ed4b9e289d16b9ea8", - "sha256": "i4GEqZkgwlehuUQGcjLdMkO9xNWRs8k+3y2OGivwXCw=" + "rev": "c98224bc74aa0bbf355d128b22e4a2a4e94215b0", + "sha256": "mf5msdwdcRRfFWHwmWLS/qKd7gNlLwexGEB6wB6TfhE=" }, "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "071e8f7eb1096dfe95d9eb2e5b7b27b30f28fbf9", - "sha256": "8WzBL8ojsHYxOqItHeeG4djALhqBBOV7nHE078UzqAY=" + "rev": "efb2a9f299cad241e12d811580f28d75b6c3438d", + "sha256": "QYwDTd8EZUMXJiuSJtoW8XQXgl+Wx0lPkNLOwzM5bzA=" }, "stella2014": { "owner": "libretro", "repo": "stella2014-libretro", - "rev": "1a2e96bc6ccf91de6fb4322048da05f67a9d21d4", - "sha256": "yINO6EU2kCldfxKcqym5ha3uIEQg7I6t4Wmu+8b6Hmw=" + "rev": "1351a4fe2ca6b1f3a66c7db0df2ec268ab002d41", + "sha256": "/sVDOfP5CE8k808lhmH3tT47oZ1ka3pgDG5LglfPmHc=" }, "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "0932243b0e5f1a5a237b0521b30b39473b61fa31", - "sha256": "krA7X9CIOg53giWSMXgzgazeyWFXEpMobPSnOB7g994=" + "rev": "0e53a5ac09a30d73d78b628f7e4954ebe5615801", + "sha256": "vOu99fsm2oeSi96tWR+vV5suZSYCyXJVgOdvjnKbNhg=" }, "tgbdual": { "owner": "libretro", @@ -464,8 +464,8 @@ "vba-next": { "owner": "libretro", "repo": "vba-next", - "rev": "ebd175d57ebb2065726099d32034cb25934787ce", - "sha256": "hTUlhLzvsemNz6wSmlnQNoNtzaVhipA+hmVmhzZVN+w=" + "rev": "4191e09e2b0fcf175a15348c1fa8a12bbc6320dd", + "sha256": "IG2oH4F17tlSv1cXYZobggb37tFNE53JOHzan/X0+ws=" }, "vecx": { "owner": "libretro", diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 0facf4e2656e..c6c44926fc82 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -107,10 +107,16 @@ def get_repo_hash_fetchFromGitHub( extra_args = [] if deep_clone: extra_args.append("--deep-clone") + else: + extra_args.append("--no-deep-clone") if fetch_submodules: extra_args.append("--fetch-submodules") + else: + extra_args.append("--no-fetch-submodules") if leave_dot_git: extra_args.append("--leave-dot-git") + else: + extra_args.append("--no-leave-dot-git") if rev: extra_args.append("--rev") extra_args.append(rev) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 74a60857a6a3..b4c06ae77192 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-30"; + version = "7.1.0-31"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-FfZJfjuQmYvYuOi18cZdr3Nam98/j+ZTGRwsd1sslsY="; + hash = "sha256-Pf+x3TnmvKTCDL3dGLyAr6JUl5E3BRi/XW/dkuCr2YA="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 766b05b2e145..5d709235741a 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-F4hAFLsZmRg/zeTHo9eYoT0BasorynGaSzNSbKr2/JE="; + sha256 = "sha256-kb7t3H2gpiN6/N/LxyG/Vu5Cp/zytAePsXmacxVyWCk="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index ad57e2c6623b..c902a7e67c57 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.26.0.136"; + version = "2.27.0.130"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-9QiE7CjCepDXQCzduqGzNUGqUgYS+PWBS71ouzHa83o="; + sha256 = "sha256-J0BGL03k1NAJLLEUOfvKjZEsBlupeHJR2Bp3c0ANBwg="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 3c56d84db4b5..118a35381a66 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python3.pkgs; [ - nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools + nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index c12853e5daee..40107fe4a269 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.6"; + version = "40.7"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "g/ugR+3s0ZbTBxmnDi9NCYa7Jswr1flVoKkgDqY/BhI="; + sha256 = "cXqJfV0H4X4K89ZpI/USNhPEEPZSOdqX0JKeScf7C2c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/scryer-prolog/cargo.patch b/pkgs/development/compilers/scryer-prolog/cargo.patch index e704798c3acf..ccce7ba357d7 100644 --- a/pkgs/development/compilers/scryer-prolog/cargo.patch +++ b/pkgs/development/compilers/scryer-prolog/cargo.patch @@ -1,101 +1,44 @@ diff --git a/Cargo.lock b/Cargo.lock -index ef25833..d9de212 100644 +index 4d699f11..1eb894fc 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -41,9 +41,9 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - - [[package]] - name = "az" --version = "0.3.1" -+version = "1.0.0" +@@ -875,15 +875,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "41a6b78289a33e09b00818ca8c90ab17c5dabb6e74f4b29a6de679c0e0886ade" -+checksum = "e9bcd47d94aa4eb8c076b50fc61a75020789394ffb9bd74a180b3379130f6569" - - [[package]] - name = "base64" -@@ -384,9 +384,9 @@ dependencies = [ - - [[package]] - name = "gmp-mpfr-sys" --version = "1.2.2" -+version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "63d7f805cf9df081683d463f62864bda8b8e3ce7162a8e11cd0c49f27b8ce89b" -+checksum = "ad4e8e85ec9fb902b4564deeb17b1a263d3ba1334bef56154418aa045b159508" - dependencies = [ - "libc", - "winapi 0.3.8", -@@ -485,9 +487,9 @@ dependencies = [ - - [[package]] - name = "lexical-core" --version = "0.4.6" -+version = "0.4.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2304bccb228c4b020f3a4835d247df0a02a7c4686098d4167762cfbbe4c5cb14" -+checksum = "34449d00c5d4066537f4dc72320b18e3aa421e8e92669250eecd664c618fefce" - dependencies = [ - "arrayvec 0.4.12", - "cfg-if", -@@ -766,15 +766,6 @@ version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" -[[package]] -name = "openssl-src" --version = "111.9.0+1.1.1g" +-version = "300.0.2+3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" +-checksum = "14a760a11390b1a5daf72074d4f6ff1a6e772534ae191f999f57e9ee8146d1fb" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" - version = "0.9.58" -@@ -784,7 +775,6 @@ dependencies = [ - "autocfg 1.0.0", + version = "0.9.70" +@@ -893,7 +884,6 @@ dependencies = [ + "autocfg 1.0.1", "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] -@@ -1159,9 +1149,9 @@ dependencies = [ - - [[package]] - name = "rug" --version = "1.8.0" -+version = "1.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "72315b6d9cb7d886fb99724330c47ceb29e923df657c31da3849fe88c0ded710" -+checksum = "e538d00da450a8e48aac7e6322e67b2dc86ec71a1feeac0e3954c4f07f01bc45" - dependencies = [ - "az", - "gmp-mpfr-sys", -@@ -1232,7 +1222,7 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - - [[package]] - name = "scryer-prolog" --version = "0.8.126" -+version = "0.8.127" - dependencies = [ - "base64 0.12.3", - "blake2", -@@ -1243,6 +1233,7 @@ dependencies = [ +@@ -1432,6 +1422,7 @@ dependencies = [ "divrem", - "downcast", + "fxhash", "git-version", + "gmp-mpfr-sys", "hostname", "indexmap", - "lazy_static", + "instructions-template", diff --git a/Cargo.toml b/Cargo.toml -index c359e1b..75c4325 100644 +index 8e81a947..d21a8d49 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -41,10 +41,14 @@ ring = "0.16.13" +@@ -55,7 +55,7 @@ ring = "0.16.13" ripemd160 = "0.8.0" sha3 = "0.8.2" blake2 = "0.8.1" @@ -104,10 +47,20 @@ index c359e1b..75c4325 100644 native-tls = "0.2.4" chrono = "0.4.11" select = "0.4.3" - roxmltree = "0.11.0" - base64 = "0.12.3" - sodiumoxide = "0.2.6" -+ +@@ -66,10 +66,14 @@ sodiumoxide = "0.2.6" + static_assertions = "1.1.0" + slice-deque = "0.3.0" + +[dependencies.gmp-mpfr-sys] +version = "1.4" +features = ["use-system-libs"] ++ + [dev-dependencies] + assert_cmd = "1.0.3" + predicates-core = "1.0.2" + serial_test = "0.5.1" + + [profile.release] +-debug = true +\ No newline at end of file ++debug = true diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix index 7c9afefe10df..9010cdef1dd7 100644 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ b/pkgs/development/compilers/scryer-prolog/default.nix @@ -1,6 +1,8 @@ { lib , fetchFromGitHub +, fetchpatch , rustPlatform +, rustfmt , gmp , libmpc , mpfr @@ -10,21 +12,32 @@ rustPlatform.buildRustPackage rec { pname = "scryer-prolog"; - version = "0.8.127"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mthom"; repo = "scryer-prolog"; rev = "v${version}"; - sha256 = "0307yclslkdx6f0h0101a3da47rhz6qizf4i8q8rjh4id8wpdsn8"; + sha256 = "3NHpEg6QaUaqbBCq8uM5hFcqS24q4XrOnKjMmn8Z1Dg="; }; - # Use system openssl, gmp, mpc and mpfr. - cargoPatches = [ ./cargo.patch ]; + cargoPatches = [ + # Use system openssl, gmp, mpc and mpfr. + ./cargo.patch - cargoSha256 = "1vf7pfhvpk7ikzibdccw7xgbywv5n4vvshjwsdsf94bhl2knrlg3"; + ./fix-tests.patch - nativeBuildInputs = [ pkg-config ]; + # Avoid testing failing with "couldn't save history" + (fetchpatch { + name = "fix-tests-1"; + url = "https://patch-diff.githubusercontent.com/raw/mthom/scryer-prolog/pull/1342.patch"; + sha256 = "2N0AOkFuf+H/aUn2QTXgmqjmvShTxHxB6kNuNdNoVRI="; + }) + ]; + + cargoSha256 = "nqAHVXAmTW9mdE2L2yhpOTz16JbYgQUmCgiFq9pBzUU="; + + nativeBuildInputs = [ pkg-config rustfmt]; buildInputs = [ openssl gmp libmpc mpfr ]; meta = with lib; { diff --git a/pkgs/development/compilers/scryer-prolog/fix-tests.patch b/pkgs/development/compilers/scryer-prolog/fix-tests.patch new file mode 100644 index 000000000000..53ececfdc794 --- /dev/null +++ b/pkgs/development/compilers/scryer-prolog/fix-tests.patch @@ -0,0 +1,29 @@ +diff --git a/tests/scryer/src_tests.rs b/tests/scryer/src_tests.rs +index b0b9efb5..8fddd842 100644 +--- a/tests/scryer/src_tests.rs ++++ b/tests/scryer/src_tests.rs +@@ -46,24 +46,6 @@ fn rules() { + load_module_test("src/tests/rules.pl", ""); + } + +-#[serial] +-#[test] +-fn setup_call_cleanup_load() { +- load_module_test( +- "src/tests/setup_call_cleanup.pl", +- "1+21+31+2>_17737+_177381+_158071+2>41+2>_177381+2>31+2>31+2>4ba" +- ); +-} +- +-#[test] +-fn setup_call_cleanup_process() { +- run_top_level_test_with_args( +- &["src/tests/setup_call_cleanup.pl", "-f", "-g", "halt"], +- "", +- "1+21+31+2>_19590+_195911+_176601+2>41+2>_195911+2>31+2>31+2>4ba" +- ); +-} +- + #[serial] + #[test] + fn clpz_load() { diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index bf2ff11158ec..3debeba329a9 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -176,6 +176,10 @@ let if test -e $out/bin/phpdbg; then wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib fi + + if test -e $out/bin/php-cgi; then + wrapProgram $out/bin/php-cgi --set PHP_INI_SCAN_DIR $out/lib + fi ''; }; in diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 28e8c61bf736..1e84498d9a9e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -33,7 +33,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.0.1"; + version = "22.0.2"; branch = versions.major version; self = stdenv.mkDerivation { @@ -47,7 +47,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0vs20kyq9sxh52hd242yf7nz2wzw6di8jw7s19pb6q25qn19cpy0"; + sha256 = "11b8mcplvis7nadcwi1jf3529i2za2q1bkb7609q0rnfvihaakyz"; }; # TODO: diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 5a6ad1f0facf..12f9a667fef8 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.3.1"; + version = "1.3.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-z6iiXMvBZs4JshQofQpPA7u89wu8owW1wi+JAYk/R9k="; + hash = "sha256-g8tMVH1MZihEEHGQjxX/Mcn5Mu3N9VA3AGdk2avlOoE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index b93b9b9c957b..f8cbd93bb35b 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "1.0.2"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-t3wJQ7dXX65yqxMYsFggViqqGvLCdASw1QLc5DJBn+4="; + hash = "sha256-wBk9tCVXDxHBnhofFQfMbsrYF4UYRZ2oXEBCldvJTnM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 1e6def5ae78a..74530b3fb830 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "1irlp5sakbdfcf717qmrx0r9rjlmwk0vza6zm3y55d32zw5c1cxg"; }; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index b4804176eddc..90a549c65955 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -35,13 +35,13 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.14"; + version = "0.12.15"; src = fetchFromGitHub { owner = pname; repo = "client"; rev = "v${version}"; - hash = "sha256-60E64ePW+C0C/eG7pLp4SpAFqycOHiCvOvmNOg2yoqY="; + hash = "sha256-Fq+JwUEZP1QDFKYVyiR8DUU0GQV6fK50FW78qaWh+Mo="; }; # setuptools is necessary since pkg_resources is required at runtime. diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index c9cf286b6cce..be9323c774d8 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,6 +1,6 @@ { lib -, fetchPypi , buildPythonPackage +, fetchFromGitHub , pythonOlder , intervaltree , pyflakes @@ -18,19 +18,37 @@ , jinja2 , configargparse , appdirs +, decorator +, pycairo +, pytestCheckHook +, python-fontconfig }: buildPythonPackage rec { pname = "xml2rfc"; - version = "3.12.3"; + version = "3.12.4"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-YUrcD3Q1fkDW+nwf6k2T/aBL8+W9iWkPYW/TqdTiuA0="; + src = fetchFromGitHub { + owner = "ietf-tools"; + repo = "xml2rfc"; + rev = "v${version}"; + sha256 = "sha256-TAu2Ls553t7wJ/Jhgu+Ff+H4P6az0Du8OL00JjZyCDs="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "SHELL := /bin/bash" "SHELL := bash" \ + --replace "test flaketest" "test" \ + --replace "python setup.py --quiet install" "" + substituteInPlace setup.py \ + --replace "'tox'," "" + substituteInPlace requirements.txt \ + --replace "jinja2>=2.11,<3.0" "jinja2" \ + --replace "markupsafe==2.0.1" "markupsafe" + ''; + propagatedBuildInputs = [ intervaltree jinja2 @@ -50,23 +68,25 @@ buildPythonPackage rec { appdirs ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "jinja2>=2.11,<3.0" "jinja2>=2.11" - ''; + checkInputs = [ + decorator + pycairo + pytestCheckHook + python-fontconfig + ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - - # lxml tries to fetch from the internet + # requires Noto Serif and Roboto Mono font doCheck = false; + checkPhase = '' + make tests-no-network + ''; + pythonImportsCheck = [ "xml2rfc" ]; meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; - homepage = "https://tools.ietf.org/tools/xml2rfc/trac/"; + homepage = "https://github.com/ietf-tools/xml2rfc"; # Well, parts might be considered unfree, if being strict; see: # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright license = licenses.bsd3; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index b0375db8c65c..cd313a5bc50b 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "sha256-AIOfudFxr1obuxABEN0ggainci/EjbBrdgr2cjVu2Io="; + sha256 = "sha256-PNIqsP5p+OdYH0JgOmjqvge9zVOrAcNg0FMflXFJHwQ="; }; - vendorSha256 = "sha256-buMkRxVLlS2LBJGaGWeR41BsmE/0vgDS8s1VcRYN0fA="; + vendorSha256 = "sha256-9WUjQhXWkpSEJj9Xq+9rOe3I1VZ7nqMTnX7DPl+rxsU="; preBuild = '' rm -r warn/docs diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 7fefe186c108..7b1de8045454 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -92,7 +92,8 @@ let patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:${electronLibPath}:$out/lib/electron" \ - $out/lib/electron/electron + $out/lib/electron/electron \ + ${lib.optionalString (! lib.versionOlder version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" } wrapProgram $out/lib/electron/electron \ --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 317de55ada56..7f8178838677 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -136,7 +136,7 @@ let ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $out/share/bash-completion/completions/ - $out/bin/npm completion > $out/share/bash-completion/completions/npm + $out/bin/npm completion > $out/share/bash-completion/completions/npm || : for dir in "$out/lib/node_modules/npm/man/"*; do mkdir -p $out/share/man/$(basename "$dir") for page in "$dir"/*; do diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix new file mode 100644 index 000000000000..562989d2fd31 --- /dev/null +++ b/pkgs/development/web/nodejs/v18.nix @@ -0,0 +1,15 @@ +{ callPackage, python3, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { + python = python3; + }; +in +buildNodejs { + inherit enableNpm; + version = "18.0.0"; + sha256 = "sha256-NE0OZUC1JMaal5/1w+eM2nJU/XLANpmSa+sLhVi4znU="; + patches = [ + ./disable-darwin-v8-system-instrumentation.patch + ]; +} diff --git a/pkgs/servers/monitoring/alerta/client.nix b/pkgs/servers/monitoring/alerta/client.nix index 31f31d074057..cd969d9dbba5 100644 --- a/pkgs/servers/monitoring/alerta/client.nix +++ b/pkgs/servers/monitoring/alerta/client.nix @@ -4,11 +4,11 @@ python3.pkgs.buildPythonApplication rec { pname = "alerta"; - version = "8.4.0"; + version = "8.5.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "260ff3118e73396104129928217b0f317ac5afdff8221874d8986df22ecf5f34"; + sha256 = "sha256-O13Ic2iHjNF/llp6vdaAiiWExcTBPsz46GAWY3oGDY8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/servers/monitoring/alerta/default.nix index e69a594a728b..c3758c26b253 100644 --- a/pkgs/servers/monitoring/alerta/default.nix +++ b/pkgs/servers/monitoring/alerta/default.nix @@ -4,11 +4,11 @@ python3.pkgs.buildPythonApplication rec { pname = "alerta-server"; - version = "8.3.3"; + version = "8.7.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97"; + sha256 = "sha256-EM3owmj+6gFjU0ARaQP3FLYXliGaGCRSaLgkiPwhGdU="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { psycopg2 pyjwt pymongo + pyparsing python-dateutil pytz pyyaml @@ -29,13 +30,17 @@ python3.pkgs.buildPythonApplication rec { sentry-sdk ]; - doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server + # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server + doCheck = false; - disabled = python3.pythonOlder "3.6"; + pythonImportsCheck = [ + "alerta" + ]; meta = with lib; { homepage = "https://alerta.io"; description = "Alerta Monitoring System server"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch index 4655879149d2..f811343ee79b 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch +++ b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch @@ -1,13 +1,13 @@ diff --git a/libinput-gestures b/libinput-gestures -index 66479b6..aca94ac 100755 +index 78c7c28..da04007 100755 --- a/libinput-gestures +++ b/libinput-gestures -@@ -6,7 +6,7 @@ from collections import OrderedDict - from pathlib import Path - from distutils.version import LooseVersion as Version - --PROG = Path(sys.argv[0]).stem -+PROG = "libinput-gestures" - +@@ -27,7 +27,7 @@ except ImportError: + + session_locked = False + +-PROGPATH = Path(sys.argv[0]) ++PROGPATH = Path("libinput-gestures") + PROGNAME = PROGPATH.stem + # Conf file containing gesture commands. - # Search first for user file then system file. diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch index 407450c8bccd..a507625406f2 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch +++ b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch @@ -1,45 +1,34 @@ diff --git a/libinput-gestures b/libinput-gestures -index aca94ac..c2f03ca 100755 +index 78c7c28..1a2c965 100755 --- a/libinput-gestures +++ b/libinput-gestures -@@ -77,7 +77,7 @@ def get_libinput_vers(): +@@ -87,11 +87,11 @@ def get_libinput_vers(): 'Return the libinput installed version number string' # Try to use newer libinput interface then fall back to old # (depreciated) interface. - res = run(('libinput', '--version'), check=False) + res = run(('@libinput@', '--version'), check=False) - return res.strip() if res else \ - run(('libinput-list-devices', '--version'), check=False) - -@@ -87,8 +87,8 @@ if not libvers: - sys.exit('libinput helper tools do not seem to be installed?') - - if Version(libvers) >= Version('1.8'): -- cmd_debug_events = 'libinput debug-events' -- cmd_list_devices = 'libinput list-devices' -+ cmd_debug_events = '@libinput@ debug-events' -+ cmd_list_devices = '@libinput@ list-devices' - else: - cmd_debug_events = 'libinput-debug-events' - cmd_list_devices = 'libinput-list-devices' -@@ -199,7 +199,7 @@ class COMMAND_internal(COMMAND): - - def run(self): - 'Get list of current workspaces and select next one' -- stdout = run(('wmctrl', '-d'), check=False) -+ stdout = run(('@wmctrl@', '-d'), check=False) - if not stdout: - # This command can fail on GNOME when you have only a single - # dynamic workspace using Xorg (probably a GNOME bug) so let's -@@ -233,7 +233,7 @@ class COMMAND_internal(COMMAND): - - # Switch to desired workspace - if index >= minindex and index < maxindex: -- run(('wmctrl', '-s', str(index))) -+ run(('@wmctrl@', '-s', str(index))) - - # Table of gesture handlers - handlers = OrderedDict() --- -2.19.1 + if res: + return res.strip(), True +- res = run(('libinput-list-devices', '--version'), check=False) ++ res = run(('@libinput-list-devices@', '--version'), check=False) + return res and res.strip(), False + + def get_devices_list(cmd_list_devices, device_list): +@@ -694,11 +694,11 @@ def main(): + sys.exit('libinput helper tools do not seem to be installed?') + + if has_subcmd: +- cmd_debug_events = 'libinput debug-events' +- cmd_list_devices = 'libinput list-devices' ++ cmd_debug_events = '@libinput@ debug-events' ++ cmd_list_devices = '@libinput@ list-devices' + else: +- cmd_debug_events = 'libinput-debug-events' +- cmd_list_devices = 'libinput-list-devices' ++ cmd_debug_events = '@libinput@-debug-events' ++ cmd_list_devices = '@libinput@-list-devices' + + if args.verbose: + # Output various info/version info diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index 1d0ea40e34f4..52ef02b24f95 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "libinput-gestures"; - version = "2.39"; + version = "2.72"; src = fetchFromGitHub { owner = "bulletmark"; repo = "libinput-gestures"; rev = version; - sha256 = "0bzyi55yhr9wyar9mnd09cr6pi88jkkp0f9lndm0a9jwi1xr4bdf"; + sha256 = "sha256-si94aKyiJtRwg+JS0PazqRjGrA/zUwN8CCIKI5KLJNw="; }; patches = [ ./0001-hardcode-name.patch diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index bd127b9092cc..4245d06a1cd0 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { patches = [ ./locale_archive.patch + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/openssh/gss-serv.c.patch?id=a7509603971ce2f3282486a43bb773b1b522af83"; + sha256 = "sha256-eFFOd4B2nccRZAQWwdBPBoKWjfEdKEVGJvKZAzLu3HU="; + }) + # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] ++ extraPatches; diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index 3ac6f58dce94..645cb010bdf3 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signify"; - version = "30"; + version = "31"; src = fetchFromGitHub { owner = "aperezdc"; repo = "signify"; rev = "v${version}"; - sha256 = "02xh6x6rszkvk3rf6zai7n3ivchmw0d8mwllpinjxc7k6sd415c3"; + sha256 = "sha256-y9jWG1JJhYCn6e5E2qjVqK8nmZpktiB7d9e9uP+3DLo="; }; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3703a284aa..1626cab2ed6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7757,10 +7757,13 @@ with pkgs; nodejs-slim-17_x = callPackage ../development/web/nodejs/v17.nix { enableNpm = false; }; + nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; + nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { + enableNpm = false; + }; # Update this when adding the newest nodejs major version! - # Do not set to nodejs-17_x because it requires 10.13 SDK on Darwin - nodejs_latest = nodejs-16_x; - nodejs-slim_latest = nodejs-slim-16_x; + nodejs_latest = nodejs-18_x; + nodejs-slim_latest = nodejs-slim-18_x; nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs;