From 3dd79ce65d1ee5ad46701635bf8052ab1f58a394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Mon, 13 Jun 2022 21:45:40 +0200 Subject: [PATCH 01/59] etebase-server: 0.8.3 -> 0.9.1 --- pkgs/servers/etebase/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index 9ed14ac5503..8a69645c51e 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -1,16 +1,17 @@ { lib, fetchFromGitHub, buildPythonPackage, aioredis, aiofiles, django_3 -, fastapi, msgpack, pynacl, typing-extensions }: +, fastapi, msgpack, pynacl, typing-extensions +, withLdap ? true, ldap }: buildPythonPackage rec { pname = "etebase-server"; - version = "0.8.3"; + version = "0.9.1"; format = "other"; src = fetchFromGitHub { owner = "etesync"; repo = "server"; rev = "v${version}"; - sha256 = "sha256-rPs34uzb5veiOw74SACLrDm4Io0CYH9EL9IuV38CkPY="; + sha256 = "sha256-mYXy0N7ohNk3K2XNB6JvULF6lhL5dV8yBvooR6RuV1E="; }; patches = [ ./secret.patch ]; @@ -23,7 +24,7 @@ buildPythonPackage rec { msgpack pynacl typing-extensions - ]; + ] ++ lib.optional withLdap ldap; installPhase = '' mkdir -p $out/bin $out/lib From 1b106defc30e4b79d02403d7a513d4641354e004 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 19 Jun 2022 15:12:29 +0200 Subject: [PATCH 02/59] bsp-layout: unstable-2021-05-10 -> unstable-2022-06-19 --- pkgs/tools/misc/bsp-layout/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/tools/misc/bsp-layout/default.nix index bad5b4d9a89..c241eac0d19 100644 --- a/pkgs/tools/misc/bsp-layout/default.nix +++ b/pkgs/tools/misc/bsp-layout/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bsp-layout"; - version = "unstable-2021-05-10"; + version = "unstable-2022-06-19"; src = fetchFromGitHub { owner = "phenax"; repo = pname; - rev = "726b850b79eabdc6f4d236cff52e434848cb55e3"; - sha256 = "1wqlzbz7l9vz37gin2zckrnxkkabnd7x5mi9pb0x96w4yhld5mx6"; + rev = "181d38443778e81df2d4bc3639063c3ae608f9c7"; + sha256 = "sha256-4NKI+OnOTYGaJnaPvSoXGJdSSzMo9AjYRLOomp9onoo="; }; nativeBuildInputs = [ makeWrapper git bc ]; From caed3fca4bd6e972fb51a412f5456e5c78fd3592 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 19 Jun 2022 15:20:37 +0200 Subject: [PATCH 03/59] bsp-layout: add breaking change to 22.11 release notes --- .../doc/manual/from_md/release-notes/rl-2211.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 83f3c4a03bf..54b69b0bb31 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -138,6 +138,14 @@ (with foo; isPower && is32bit && isBigEndian). + + + bsp-layout no longer uses the command + cycle to switch to other window layouts, as + it got replaced by the commands previous + and next. + + PHP 7.4 is no longer supported due to upstream not supporting diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 2c5cc7c633c..19fd3e35c22 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -53,6 +53,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. +- `bsp-layout` no longer uses the command `cycle` to switch to other window layouts, as it got replaced by the commands `previous` and `next`. + - PHP 7.4 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 22.11 release. From b50add8f56b03ea72bc92f668aee604eca10f804 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 29 May 2022 22:38:54 +0200 Subject: [PATCH 04/59] binaryen: 105 -> 108 --- pkgs/development/compilers/binaryen/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 0df831831ba..c70b02cc55a 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "105"; + version = "108"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "0yg9rarjv1gfbq225cj9hnbgx99n5az2m19qwfp8z41dwhh71igm"; + sha256 = "sha256-CcGxPBdUiNLfMjjJKFMdDvaIrHvf2M/gCub4JBw4+8c="; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake python3 ]; From 397e8cceca5e779d45ddc54dab64130a99aa2fdf Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 29 May 2022 22:39:18 +0200 Subject: [PATCH 05/59] emscripten: 3.1.10 -> 3.1.12 --- .../compilers/emscripten/default.nix | 4 +- .../compilers/emscripten/package.json | 12 +- .../compilers/emscripten/yarn.lock | 390 ++++++++--------- .../development/compilers/emscripten/yarn.nix | 402 ++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 366 insertions(+), 444 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 47464e52ddb..9424a850667 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.10"; + version = "3.1.12"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "03k0pd5hna7khrnn3k3ln38h9w0vyaicfzvfqlqbxi4zz8jikrdb"; + sha256 = "sha256-lZ5U6e1UNd1Yvxp+k9eLsgwGXz/0WKisuhudUQf+pu0="; rev = version; }; diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json index 485fc87b9e3..8f3e09b5cbd 100644 --- a/pkgs/development/compilers/emscripten/package.json +++ b/pkgs/development/compilers/emscripten/package.json @@ -1,17 +1,17 @@ { "name": "emscripten", - "version": "3.1.10", + "version": "3.1.12", "private": true, "devDependencies": { - "es-check": "^6.1.1", - "eslint": "^8.6.0", + "es-check": "^6.2.1", + "eslint": "^8.16.0", "eslint-config-google": "^0.14.0", "source-map": "0.7.3", - "ws": "^8.5.0" + "ws": "^8.6.0" }, "dependencies": { - "acorn": "^8.7.0", - "google-closure-compiler": "20220104.0.0", + "acorn": "^8.7.1", + "google-closure-compiler": "20220502.0.0", "html-minifier-terser": "6.1.0", "wasm2c": "1.0.0" }, diff --git a/pkgs/development/compilers/emscripten/yarn.lock b/pkgs/development/compilers/emscripten/yarn.lock index 5a28df7f8dc..6b4e1011f94 100644 --- a/pkgs/development/compilers/emscripten/yarn.lock +++ b/pkgs/development/compilers/emscripten/yarn.lock @@ -26,15 +26,15 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@eslint/eslintrc@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886" - integrity sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA== +"@eslint/eslintrc@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" + integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw== dependencies: ajv "^6.12.4" debug "^4.3.2" espree "^9.3.2" - globals "^13.9.0" + globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" @@ -55,6 +55,46 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== +"@jridgewell/gen-mapping@^0.3.0": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" + integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.0.3": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe" + integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA== + +"@jridgewell/set-array@^1.0.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" + integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== + +"@jridgewell/source-map@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" + integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.13" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" + integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== + +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.13" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea" + integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -95,9 +135,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*": - version "17.0.32" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.32.tgz#51d59d7a90ef2d0ae961791e0900cad2393a0149" - integrity sha512-eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw== + version "18.0.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a" + integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA== "@types/node@13.9.3": version "13.9.3" @@ -147,20 +187,15 @@ ansi-escapes@^3.2.0: integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1" + integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw== ansi-regex@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -218,9 +253,9 @@ braces@^3.0.2: fill-range "^7.0.1" buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== callsites@^3.0.0: version "3.1.0" @@ -253,9 +288,9 @@ chalk@3.0.0: supports-color "^7.1.0" chalk@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -275,7 +310,7 @@ clean-css@^5.2.2: cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw== dependencies: restore-cursor "^2.0.0" @@ -287,17 +322,17 @@ cli-width@^2.0.0: clone-buffer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg= + integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g== clone-stats@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= + integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag== clone@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" - integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= + integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== cloneable-readable@^1.0.0: version "1.1.3" @@ -325,7 +360,7 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" @@ -351,7 +386,7 @@ color@^3.1.3: colornames@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96" - integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y= + integrity sha512-/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A== colorspace@1.1.x: version "1.1.4" @@ -374,12 +409,12 @@ commander@^8.3.0: concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== cross-spawn@^7.0.2: version "7.0.3" @@ -390,14 +425,7 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" -debug@^4.0.1, debug@^4.1.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^4.3.2: +debug@^4.0.1, debug@^4.1.1, debug@^4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -405,9 +433,9 @@ debug@^4.3.2: ms "2.1.2" deep-is@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== diagnostics@^1.1.1: version "1.1.1" @@ -446,7 +474,7 @@ emoji-regex@^8.0.0: enabled@1.0.x: version "1.0.2" resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" - integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M= + integrity sha512-nnzgVSpB35qKrUN8358SjO1bYAmxoThECTWw9s3J0x5G8A9hokKHVDFzBjVpCoSryo6MhN8woVyascN5jheaNA== dependencies: env-variable "0.0.x" @@ -455,7 +483,7 @@ env-variable@0.0.x: resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808" integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg== -es-check@^6.1.1: +es-check@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/es-check/-/es-check-6.2.1.tgz#08d6f5de2045da5d8f1535c66eac39bb611b2b65" integrity sha512-IPiRXUlwSTd2yMklIf9yEGe6GK5wCS8Sz1aTNHm1QSiYzI4aiq19giYbLi95tb+e0JJVKmcU0iQXQWW60a8V9A== @@ -472,7 +500,7 @@ es6-promisify@^6.0.0: escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== escape-string-regexp@^4.0.0: version "4.0.0" @@ -509,12 +537,12 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.6.0: - version "8.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.15.0.tgz#fea1d55a7062da48d82600d2e0974c55612a11e9" - integrity sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA== +eslint@^8.16.0: + version "8.18.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.18.0.tgz#78d565d16c993d0b73968c523c0446b13da784fd" + integrity sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA== dependencies: - "@eslint/eslintrc" "^1.2.3" + "@eslint/eslintrc" "^1.3.0" "@humanwhocodes/config-array" "^0.9.2" ajv "^6.10.0" chalk "^4.0.0" @@ -532,7 +560,7 @@ eslint@^8.6.0: file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^6.0.1" - globals "^13.6.0" + globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -574,9 +602,9 @@ esrecurse@^4.3.0: estraverse "^5.2.0" estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== esutils@^2.0.2: version "2.0.3" @@ -616,7 +644,7 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fastq@^1.6.0: version "1.13.0" @@ -633,7 +661,7 @@ fecha@^4.2.0: figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA== dependencies: escape-string-regexp "^1.0.5" @@ -660,19 +688,19 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" - integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== glob-parent@^5.1.2: version "5.1.2" @@ -688,76 +716,64 @@ glob-parent@^6.0.1: dependencies: is-glob "^4.0.3" -glob@^7.1.3: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== +glob@^7.1.3, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.6: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^13.6.0, globals@^13.9.0: - version "13.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" - integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== +globals@^13.15.0: + version "13.15.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac" + integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog== dependencies: type-fest "^0.20.2" -google-closure-compiler-java@^20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220104.0.0.tgz#de2784e2a7b58f091b861711218e41a5f04dbb05" - integrity sha512-cnxEfms548+whhdtIT5MLNVfHcXasYmsUGpyrdLDX+0xR4t+oJBT7RI/O7qOusoqXdW6lwAIT2jbFI8Irk6eVQ== +google-closure-compiler-java@^20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220502.0.0.tgz#a92696bfc05489738dc06f797041985bbfb334be" + integrity sha512-XDXw1v+1zcNHuEUXQg24eD9MUF2XTHnEDKCwF0P0zQe+8TWQajKvjsekdJnO6JH/Lqcu8XKc7dxO5+SMijr0sw== -google-closure-compiler-linux@^20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220104.0.0.tgz#fe503010827dceecaa4a842579645efcd156e443" - integrity sha512-3la7sjrcKHlQc8piP+nzsZmFQFYV/4DtxFcpjq+Re81+vYmE9NWUZ21xgp6OZ7ygZhVLEWQqGlZqJls45HS0rA== +google-closure-compiler-linux@^20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220502.0.0.tgz#64a3c1723f102e047433d85ec1dfd1d101a84b4f" + integrity sha512-T+2p/Qj02yGZHxymhj1oZsiHudNvI9sQKfCLoIH0wi0ikDiVIOh/dsH+57lsaGDJ+XTP/ur5Ozl8GIOjv1Efrw== -google-closure-compiler-osx@^20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220104.0.0.tgz#ff3b1c5c1e27ddcf821b8c7086e9581a61a39788" - integrity sha512-D6WPBKS6H416kY4OH9WBhviY7e+b1+RXT8jWhBGXMHoSlUiIUALOi67RvBuibiX39ljG0D1JSZbfYXNCDYLMmw== +google-closure-compiler-osx@^20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220502.0.0.tgz#b5e40b2adf737622d435d9bfc99d0912a75f967e" + integrity sha512-VwEncD4I1gfkF3zyHlRcUsx2o/poC0qzHjBv+g3Z09wHy9tuqjQ4EP8LmN/GMuV2Hai6gQvkKC0XjYnZTFx2mQ== -google-closure-compiler-windows@^20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220104.0.0.tgz#853a4c357bd23faf0687175a7a2671d6607b7716" - integrity sha512-VNBUBSBLn2ZeK4EKsoY/rl6qjXYoph+DWmiicNeFrEvqyUB9Vh9MhhP4F+PPOg1iYdPw4XtNsmfSnIV96kQHyA== +google-closure-compiler-windows@^20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220502.0.0.tgz#6c07ebeddd70e138135ae9382b0ced50aea5add6" + integrity sha512-ssdAUS2VZxJAyciVrbhpnYymvm//V4CHyg8aLvMisUfWRDeUSsOCC5mNXy6D8f9i9bYHs3cFV3itIRUfnYCEWg== -google-closure-compiler@20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220104.0.0.tgz#cf2ddee10abdf129cea82481e7d92f8c5ff30ce2" - integrity sha512-8JQs1cWpJYjvqnAskMis1sQ/nm2wHYIt/Rd3HYyMOgfEzjNdqLkIiuzCXbz2flktHXS63mvdxU4+ZlJR72Kz8g== +google-closure-compiler@20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220502.0.0.tgz#94d793f60be006236b174f8e1bc3c1a493ed86f1" + integrity sha512-i9Qdve2v3jlerkHzlm00bpYds+kfAlIdeaOQ+acK/pHPHeLjhiXS+EyIpegVnH8+TY3I1QAMZFuVEXkMVJqpBQ== dependencies: chalk "2.x" - google-closure-compiler-java "^20220104.0.0" + google-closure-compiler-java "^20220502.0.0" minimist "1.x" vinyl "2.x" vinyl-sourcemaps-apply "^0.2.0" optionalDependencies: - google-closure-compiler-linux "^20220104.0.0" - google-closure-compiler-osx "^20220104.0.0" - google-closure-compiler-windows "^20220104.0.0" + google-closure-compiler-linux "^20220502.0.0" + google-closure-compiler-osx "^20220502.0.0" + google-closure-compiler-windows "^20220502.0.0" has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" @@ -805,12 +821,12 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" @@ -847,26 +863,19 @@ is-arrayish@^0.3.1: is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^4.0.0, is-glob@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-glob@^4.0.3: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -881,17 +890,17 @@ is-number@^7.0.0: is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== js-yaml@^4.1.0: version "4.1.0" @@ -908,7 +917,7 @@ json-schema-traverse@^0.4.1: json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== kuler@1.0.x: version "1.0.1" @@ -930,11 +939,6 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - lodash@4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" @@ -946,9 +950,9 @@ lodash@^4.17.12, lodash@^4.17.14: integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== logform@^2.1.1, logform@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.0.tgz#131651715a17d50f09c2a2c1a524ff1a4164bcfe" - integrity sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw== + version "2.4.1" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.1.tgz#512c9eaef738044d1c619790ba0f806c80d9d3a9" + integrity sha512-7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A== dependencies: "@colors/colors" "1.5.0" fecha "^4.2.0" @@ -981,31 +985,24 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^3.1.2: +minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimist@1.x, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@1.x, minimist@^1.2.0, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - minimist "^1.2.5" + minimist "^1.2.6" ms@2.1.2: version "2.1.2" @@ -1020,12 +1017,12 @@ ms@^2.1.1: mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" - integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== no-case@^3.0.4: version "3.0.4" @@ -1038,19 +1035,19 @@ no-case@^3.0.4: once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" one-time@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e" - integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4= + integrity sha512-qAMrwuk2xLEutlASoiPiAMW3EN3K96Ka/ilSXYr6qR1zSVXw2j7+yDSqGTC4T9apfLYxM3tLLjKvgPdAUK7kYQ== onetime@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ== dependencies: mimic-fn "^1.0.0" @@ -1069,7 +1066,7 @@ optionator@^0.9.1: os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== param-case@^3.0.4: version "3.0.4" @@ -1097,7 +1094,7 @@ pascal-case@^3.1.2: path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-key@^3.1.0: version "3.1.1" @@ -1159,12 +1156,12 @@ regexpp@^3.2.0: relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= + integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog== remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== replace-ext@^1.0.0: version "1.0.1" @@ -1179,7 +1176,7 @@ resolve-from@^4.0.0: restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q== dependencies: onetime "^2.0.0" signal-exit "^3.0.2" @@ -1255,7 +1252,7 @@ signal-exit@^3.0.2: simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg== dependencies: is-arrayish "^0.3.1" @@ -1284,24 +1281,17 @@ source-map@0.7.3: source-map@^0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== source-map@^0.6.0, source-map@~0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@~0.8.0-beta.0: - version "0.8.0-beta.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11" - integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA== - dependencies: - whatwg-url "^7.0.0" - stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= + integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== string-width@^2.1.0: version "2.1.1" @@ -1346,7 +1336,7 @@ string_decoder@~1.1.1: strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== dependencies: ansi-regex "^3.0.0" @@ -1357,14 +1347,7 @@ strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-ansi@^6.0.1: +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -1413,13 +1396,13 @@ tabtab@^3.0.2: untildify "^3.0.3" terser@^5.10.0: - version "5.13.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz#66332cdc5a01b04a224c9fad449fc1a18eaa1799" - integrity sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA== + version "5.14.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz#7c95eec36436cb11cf1902cc79ac564741d19eca" + integrity sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ== dependencies: + "@jridgewell/source-map" "^0.3.2" acorn "^8.5.0" commander "^2.20.0" - source-map "~0.8.0-beta.0" source-map-support "~0.5.20" text-hex@1.0.x: @@ -1430,12 +1413,12 @@ text-hex@1.0.x: text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== tmp@^0.0.33: version "0.0.33" @@ -1451,13 +1434,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -tr46@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" - integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= - dependencies: - punycode "^2.1.0" - triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" @@ -1469,9 +1445,9 @@ tslib@^1.9.0: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" - integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" @@ -1500,7 +1476,7 @@ uri-js@^4.2.2: util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== v8-compile-cache@^2.0.3: version "2.3.0" @@ -1510,7 +1486,7 @@ v8-compile-cache@^2.0.3: vinyl-sourcemaps-apply@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" - integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU= + integrity sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw== dependencies: source-map "^0.5.1" @@ -1531,20 +1507,6 @@ wasm2c@1.0.0: resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0" integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA== -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" - integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== - -whatwg-url@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" - integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -1593,9 +1555,9 @@ wrap-ansi@^6.2.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@^8.5.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23" - integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw== +ws@^8.6.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769" + integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ== diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix index 96229c5f689..d22d1c7d615 100644 --- a/pkgs/development/compilers/emscripten/yarn.nix +++ b/pkgs/development/compilers/emscripten/yarn.nix @@ -18,11 +18,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_1.2.3.tgz"; + name = "_eslint_eslintrc___eslintrc_1.3.0.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz"; - sha512 = "uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA=="; + name = "_eslint_eslintrc___eslintrc_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; + sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; }; } { @@ -41,6 +41,54 @@ sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; } + { + name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; + path = fetchurl { + name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; + sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + }; + } + { + name = "_jridgewell_resolve_uri___resolve_uri_3.0.7.tgz"; + path = fetchurl { + name = "_jridgewell_resolve_uri___resolve_uri_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz"; + sha512 = "8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="; + }; + } + { + name = "_jridgewell_set_array___set_array_1.1.1.tgz"; + path = fetchurl { + name = "_jridgewell_set_array___set_array_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz"; + sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + }; + } + { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + path = fetchurl { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; + sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; + }; + } + { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; + path = fetchurl { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; + sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; + }; + } + { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.13.tgz"; + path = fetchurl { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.13.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; + sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; + }; + } { name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; path = fetchurl { @@ -90,11 +138,11 @@ }; } { - name = "_types_node___node_17.0.32.tgz"; + name = "_types_node___node_18.0.0.tgz"; path = fetchurl { - name = "_types_node___node_17.0.32.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.32.tgz"; - sha512 = "eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw=="; + name = "_types_node___node_18.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz"; + sha512 = "cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA=="; }; } { @@ -162,11 +210,11 @@ }; } { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; + name = "ansi_regex___ansi_regex_3.0.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "7QMXwyIGT3lGbAKWa922Bas32Zg="; + name = "ansi_regex___ansi_regex_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz"; + sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; }; } { @@ -177,14 +225,6 @@ sha512 = "ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="; }; } - { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; - }; - } { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { @@ -258,11 +298,11 @@ }; } { - name = "buffer_from___buffer_from_1.1.1.tgz"; + name = "buffer_from___buffer_from_1.1.2.tgz"; path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; } { @@ -298,11 +338,11 @@ }; } { - name = "chalk___chalk_4.1.1.tgz"; + name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; - sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; } { @@ -326,7 +366,7 @@ path = fetchurl { name = "cli_cursor___cli_cursor_2.1.0.tgz"; url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "s12sN2R5+sw+lHR9QdDQ9SOP/LU="; + sha512 = "8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw=="; }; } { @@ -342,7 +382,7 @@ path = fetchurl { name = "clone_buffer___clone_buffer_1.0.0.tgz"; url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"; - sha1 = "4+JbIHrE5wGvch4staFnksrD3Fg="; + sha512 = "KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g=="; }; } { @@ -350,7 +390,7 @@ path = fetchurl { name = "clone_stats___clone_stats_1.0.0.tgz"; url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"; - sha1 = "s3gt/4u1R04Yuba/D9/ngvh3doA="; + sha512 = "au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag=="; }; } { @@ -358,7 +398,7 @@ path = fetchurl { name = "clone___clone_2.1.2.tgz"; url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"; - sha1 = "G39Ln1kfHo+DZwQBYANFoCiHQ18="; + sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="; }; } { @@ -390,7 +430,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; } { @@ -422,7 +462,7 @@ path = fetchurl { name = "colornames___colornames_1.1.1.tgz"; url = "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz"; - sha1 = "+IiQMGhcfE/54qVZ9Qd+t2qBb5Y="; + sha512 = "/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="; }; } { @@ -454,15 +494,15 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; } { - name = "core_util_is___core_util_is_1.0.2.tgz"; + name = "core_util_is___core_util_is_1.0.3.tgz"; path = fetchurl { - name = "core_util_is___core_util_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } { @@ -473,14 +513,6 @@ sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } - { - name = "debug___debug_4.3.1.tgz"; - path = fetchurl { - name = "debug___debug_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; - sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; - }; - } { name = "debug___debug_4.3.4.tgz"; path = fetchurl { @@ -490,11 +522,11 @@ }; } { - name = "deep_is___deep_is_0.1.3.tgz"; + name = "deep_is___deep_is_0.1.4.tgz"; path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "s2nW+128E+7PUk+RsHD+7cNXzzQ="; + name = "deep_is___deep_is_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; } { @@ -542,7 +574,7 @@ path = fetchurl { name = "enabled___enabled_1.0.2.tgz"; url = "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz"; - sha1 = "ll9lE9LC0cX0ZStkouM5ZGf8L5M="; + sha512 = "nnzgVSpB35qKrUN8358SjO1bYAmxoThECTWw9s3J0x5G8A9hokKHVDFzBjVpCoSryo6MhN8woVyascN5jheaNA=="; }; } { @@ -574,7 +606,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; } { @@ -626,11 +658,11 @@ }; } { - name = "eslint___eslint_8.15.0.tgz"; + name = "eslint___eslint_8.18.0.tgz"; path = fetchurl { - name = "eslint___eslint_8.15.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.15.0.tgz"; - sha512 = "GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA=="; + name = "eslint___eslint_8.18.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.18.0.tgz"; + sha512 = "As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA=="; }; } { @@ -658,11 +690,11 @@ }; } { - name = "estraverse___estraverse_5.2.0.tgz"; + name = "estraverse___estraverse_5.3.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; - sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + name = "estraverse___estraverse_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; } { @@ -710,7 +742,7 @@ path = fetchurl { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; } { @@ -734,7 +766,7 @@ path = fetchurl { name = "figures___figures_2.0.0.tgz"; url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "OrGi0qYsi/tDGgyUy3l6L84nyWI="; + sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="; }; } { @@ -762,11 +794,11 @@ }; } { - name = "flatted___flatted_3.1.1.tgz"; + name = "flatted___flatted_3.2.5.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; - sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; + name = "flatted___flatted_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; } { @@ -774,7 +806,7 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; } { @@ -782,7 +814,7 @@ path = fetchurl { name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; + sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; }; } { @@ -802,67 +834,59 @@ }; } { - name = "glob___glob_7.1.7.tgz"; + name = "glob___glob_7.2.3.tgz"; path = fetchurl { - name = "glob___glob_7.1.7.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; - sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; + name = "glob___glob_7.2.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; } { - name = "glob___glob_7.2.0.tgz"; + name = "globals___globals_13.15.0.tgz"; path = fetchurl { - name = "glob___glob_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + name = "globals___globals_13.15.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz"; + sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; }; } { - name = "globals___globals_13.9.0.tgz"; + name = "google_closure_compiler_java___google_closure_compiler_java_20220502.0.0.tgz"; path = fetchurl { - name = "globals___globals_13.9.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz"; - sha512 = "74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA=="; + name = "google_closure_compiler_java___google_closure_compiler_java_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220502.0.0.tgz"; + sha512 = "XDXw1v+1zcNHuEUXQg24eD9MUF2XTHnEDKCwF0P0zQe+8TWQajKvjsekdJnO6JH/Lqcu8XKc7dxO5+SMijr0sw=="; }; } { - name = "google_closure_compiler_java___google_closure_compiler_java_20220104.0.0.tgz"; + name = "google_closure_compiler_linux___google_closure_compiler_linux_20220502.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_java___google_closure_compiler_java_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220104.0.0.tgz"; - sha512 = "cnxEfms548+whhdtIT5MLNVfHcXasYmsUGpyrdLDX+0xR4t+oJBT7RI/O7qOusoqXdW6lwAIT2jbFI8Irk6eVQ=="; + name = "google_closure_compiler_linux___google_closure_compiler_linux_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220502.0.0.tgz"; + sha512 = "T+2p/Qj02yGZHxymhj1oZsiHudNvI9sQKfCLoIH0wi0ikDiVIOh/dsH+57lsaGDJ+XTP/ur5Ozl8GIOjv1Efrw=="; }; } { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20220104.0.0.tgz"; + name = "google_closure_compiler_osx___google_closure_compiler_osx_20220502.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220104.0.0.tgz"; - sha512 = "3la7sjrcKHlQc8piP+nzsZmFQFYV/4DtxFcpjq+Re81+vYmE9NWUZ21xgp6OZ7ygZhVLEWQqGlZqJls45HS0rA=="; + name = "google_closure_compiler_osx___google_closure_compiler_osx_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220502.0.0.tgz"; + sha512 = "VwEncD4I1gfkF3zyHlRcUsx2o/poC0qzHjBv+g3Z09wHy9tuqjQ4EP8LmN/GMuV2Hai6gQvkKC0XjYnZTFx2mQ=="; }; } { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20220104.0.0.tgz"; + name = "google_closure_compiler_windows___google_closure_compiler_windows_20220502.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220104.0.0.tgz"; - sha512 = "D6WPBKS6H416kY4OH9WBhviY7e+b1+RXT8jWhBGXMHoSlUiIUALOi67RvBuibiX39ljG0D1JSZbfYXNCDYLMmw=="; + name = "google_closure_compiler_windows___google_closure_compiler_windows_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220502.0.0.tgz"; + sha512 = "ssdAUS2VZxJAyciVrbhpnYymvm//V4CHyg8aLvMisUfWRDeUSsOCC5mNXy6D8f9i9bYHs3cFV3itIRUfnYCEWg=="; }; } { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20220104.0.0.tgz"; + name = "google_closure_compiler___google_closure_compiler_20220502.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220104.0.0.tgz"; - sha512 = "VNBUBSBLn2ZeK4EKsoY/rl6qjXYoph+DWmiicNeFrEvqyUB9Vh9MhhP4F+PPOg1iYdPw4XtNsmfSnIV96kQHyA=="; - }; - } - { - name = "google_closure_compiler___google_closure_compiler_20220104.0.0.tgz"; - path = fetchurl { - name = "google_closure_compiler___google_closure_compiler_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220104.0.0.tgz"; - sha512 = "8JQs1cWpJYjvqnAskMis1sQ/nm2wHYIt/Rd3HYyMOgfEzjNdqLkIiuzCXbz2flktHXS63mvdxU4+ZlJR72Kz8g=="; + name = "google_closure_compiler___google_closure_compiler_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220502.0.0.tgz"; + sha512 = "i9Qdve2v3jlerkHzlm00bpYds+kfAlIdeaOQ+acK/pHPHeLjhiXS+EyIpegVnH8+TY3I1QAMZFuVEXkMVJqpBQ=="; }; } { @@ -870,7 +894,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; } { @@ -926,7 +950,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; } { @@ -934,7 +958,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; } { @@ -966,7 +990,7 @@ path = fetchurl { name = "is_extglob___is_extglob_2.1.1.tgz"; url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; } { @@ -974,7 +998,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "o7MKXE8ZkYMWeqq5O+764937ZU8="; + sha512 = "VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="; }; } { @@ -985,14 +1009,6 @@ sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } - { - name = "is_glob___is_glob_4.0.1.tgz"; - path = fetchurl { - name = "is_glob___is_glob_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; - }; - } { name = "is_glob___is_glob_4.0.3.tgz"; path = fetchurl { @@ -1014,7 +1030,7 @@ path = fetchurl { name = "is_stream___is_stream_1.1.0.tgz"; url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; + sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; } { @@ -1022,7 +1038,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; } { @@ -1030,7 +1046,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; } { @@ -1054,7 +1070,7 @@ path = fetchurl { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; } { @@ -1081,14 +1097,6 @@ sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; } - { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - path = fetchurl { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "7dFMgk4sycHgsKG0K7UhBRakJDg="; - }; - } { name = "lodash___lodash_4.17.15.tgz"; path = fetchurl { @@ -1106,11 +1114,11 @@ }; } { - name = "logform___logform_2.4.0.tgz"; + name = "logform___logform_2.4.1.tgz"; path = fetchurl { - name = "logform___logform_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.4.0.tgz"; - sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw=="; + name = "logform___logform_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.4.1.tgz"; + sha512 = "7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A=="; }; } { @@ -1145,14 +1153,6 @@ sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; } - { - name = "minimatch___minimatch_3.0.4.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - } { name = "minimatch___minimatch_3.1.2.tgz"; path = fetchurl { @@ -1162,19 +1162,19 @@ }; } { - name = "minimist___minimist_1.2.5.tgz"; + name = "minimist___minimist_1.2.6.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + name = "minimist___minimist_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; } { - name = "mkdirp___mkdirp_0.5.5.tgz"; + name = "mkdirp___mkdirp_0.5.6.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + name = "mkdirp___mkdirp_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; } { @@ -1198,7 +1198,7 @@ path = fetchurl { name = "mute_stream___mute_stream_0.0.7.tgz"; url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "MHXOk7whuPq0PhvE2n6BFe0ee6s="; + sha512 = "r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ=="; }; } { @@ -1206,7 +1206,7 @@ path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; } { @@ -1222,7 +1222,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; } { @@ -1230,7 +1230,7 @@ path = fetchurl { name = "one_time___one_time_0.0.4.tgz"; url = "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz"; - sha1 = "+M33eISCb+Tf+T46nMN7HkSAdC4="; + sha512 = "qAMrwuk2xLEutlASoiPiAMW3EN3K96Ka/ilSXYr6qR1zSVXw2j7+yDSqGTC4T9apfLYxM3tLLjKvgPdAUK7kYQ=="; }; } { @@ -1238,7 +1238,7 @@ path = fetchurl { name = "onetime___onetime_2.0.1.tgz"; url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "BnQoIw/WdEOyeUsiu6UotoZ5YtQ="; + sha512 = "oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="; }; } { @@ -1254,7 +1254,7 @@ path = fetchurl { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "u+Z0BseaqFxc/sdm/lc0VV36EnQ="; + sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; } { @@ -1286,7 +1286,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; } { @@ -1366,7 +1366,7 @@ path = fetchurl { name = "relateurl___relateurl_0.2.7.tgz"; url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz"; - sha1 = "VNvzd+UUQKypCkzSdGANP/LYiKk="; + sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="; }; } { @@ -1374,7 +1374,7 @@ path = fetchurl { name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "wkvOKig62tW8P1jg1IJJuSN52O8="; + sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="; }; } { @@ -1398,7 +1398,7 @@ path = fetchurl { name = "restore_cursor___restore_cursor_2.0.0.tgz"; url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "n37ih/gv0ybU/RYpI9YhKe7g368="; + sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="; }; } { @@ -1502,7 +1502,7 @@ path = fetchurl { name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "pNprY1/8zMoz9w0Xy5JZLeleVXo="; + sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; }; } { @@ -1534,7 +1534,7 @@ path = fetchurl { name = "source_map___source_map_0.5.7.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; + sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; }; } { @@ -1545,20 +1545,12 @@ sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } - { - name = "source_map___source_map_0.8.0_beta.0.tgz"; - path = fetchurl { - name = "source_map___source_map_0.8.0_beta.0.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz"; - sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA=="; - }; - } { name = "stack_trace___stack_trace_0.0.10.tgz"; path = fetchurl { name = "stack_trace___stack_trace_0.0.10.tgz"; url = "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "VHxws0fo0ytOEI6hoqFZ5f3eGcA="; + sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="; }; } { @@ -1606,7 +1598,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_4.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "qEeQIusaw2iocTibY1JixQXuNo8="; + sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="; }; } { @@ -1617,14 +1609,6 @@ sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; } - { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; - }; - } { name = "strip_ansi___strip_ansi_6.0.1.tgz"; path = fetchurl { @@ -1674,11 +1658,11 @@ }; } { - name = "terser___terser_5.13.1.tgz"; + name = "terser___terser_5.14.1.tgz"; path = fetchurl { - name = "terser___terser_5.13.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz"; - sha512 = "hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA=="; + name = "terser___terser_5.14.1.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz"; + sha512 = "+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ=="; }; } { @@ -1694,7 +1678,7 @@ path = fetchurl { name = "text_table___text_table_0.2.0.tgz"; url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; } { @@ -1702,7 +1686,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; + sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; }; } { @@ -1721,14 +1705,6 @@ sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; } - { - name = "tr46___tr46_1.0.1.tgz"; - path = fetchurl { - name = "tr46___tr46_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz"; - sha1 = "qLE/1r/SSJUZZ0zN5VujaTtwbQk="; - }; - } { name = "triple_beam___triple_beam_1.3.0.tgz"; path = fetchurl { @@ -1746,11 +1722,11 @@ }; } { - name = "tslib___tslib_2.3.0.tgz"; + name = "tslib___tslib_2.4.0.tgz"; path = fetchurl { - name = "tslib___tslib_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; - sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; + name = "tslib___tslib_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz"; + sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; }; } { @@ -1790,7 +1766,7 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; } { @@ -1806,7 +1782,7 @@ path = fetchurl { name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; url = "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; - sha1 = "q2VJ1h0XLCsbh75cUI0jnI74dwU="; + sha512 = "+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw=="; }; } { @@ -1825,22 +1801,6 @@ sha512 = "4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA=="; }; } - { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; - }; - } - { - name = "whatwg_url___whatwg_url_7.1.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz"; - sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; - }; - } { name = "which___which_2.0.2.tgz"; path = fetchurl { @@ -1886,15 +1846,15 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; } { - name = "ws___ws_8.6.0.tgz"; + name = "ws___ws_8.8.0.tgz"; path = fetchurl { - name = "ws___ws_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz"; - sha512 = "AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw=="; + name = "ws___ws_8.8.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz"; + sha512 = "JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ=="; }; } ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fdf14a4c6a..71b7a65423c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5646,7 +5646,7 @@ with pkgs; conform = callPackage ../applications/version-management/git-and-tools/conform { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_13; + llvmPackages = llvmPackages_14; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); From 215101a0037497b2586eda67d8653717a979fd35 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 29 May 2022 22:39:45 +0200 Subject: [PATCH 06/59] emscriptenStdenv: default dontStrip=true, it strips archive indices This fixes the emscriptenPackages.xmlmirror-unstable build --- pkgs/development/em-modules/generic/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index a8597202941..2f8d7d878a8 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -18,6 +18,9 @@ pkgs.stdenv.mkDerivation ( # fake conftest results with emscripten's python magic EMCONFIGURE_JS=2; + # removes archive indices + dontStrip = args.dontStrip or true; + configurePhase = args.configurePhase or '' # FIXME: Some tests require writing at $HOME HOME=$TMPDIR From c3b5da2298bfb484d6cc70bea6b53ae69980a4ed Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 30 May 2022 12:51:50 +0200 Subject: [PATCH 07/59] filecheck: init at 0.0.22 --- .../python-modules/filecheck/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/filecheck/default.nix diff --git a/pkgs/development/python-modules/filecheck/default.nix b/pkgs/development/python-modules/filecheck/default.nix new file mode 100644 index 00000000000..2480c196881 --- /dev/null +++ b/pkgs/development/python-modules/filecheck/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, poetry +}: + +buildPythonApplication rec { + pname = "filecheck"; + version = "0.0.22"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mull-project"; + repo = "FileCheck.py"; + rev = "v${version}"; + sha256 = "sha256-I2SypKkgcVuLyLiwNw5oWDb9qT56TbC6vbui8PEcziI="; + }; + + nativeBuildInputs = [ poetry ]; + + pythonImportsCheck = [ "filecheck" ]; + + meta = with lib; { + homepage = "https://github.com/mull-project/FileCheck.py"; + license = licenses.asl20; + description = "Python port of LLVM's FileCheck, flexible pattern matching file verifier"; + maintainers = with maintainers; [ yorickvp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab184d0d67e..0e156a5229d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3038,6 +3038,8 @@ in { filebytes = callPackage ../development/python-modules/filebytes { }; + filecheck = callPackage ../development/python-modules/filecheck { }; + filelock = callPackage ../development/python-modules/filelock { }; filemagic = callPackage ../development/python-modules/filemagic { }; From 30fa47e57e20809d15ea981c6e253ac09a806551 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 23 Jun 2022 13:14:40 +0900 Subject: [PATCH 08/59] haskellPackages: stackage LTS 19.11 -> LTS 19.12 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 8c460af7e37..a7f461652b7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.11 +# Stackage LTS 19.12 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -11,7 +11,7 @@ default-package-overrides: - acid-state ==0.16.1.1 - action-permutations ==0.0.0.1 - active ==0.2.0.15 - - ad ==4.5.1 + - ad ==4.5.2 - ad-delcont ==0.3.0.0 - adjunctions ==4.4.1 - adler32 ==0.1.2.0 @@ -25,7 +25,7 @@ default-package-overrides: - aeson-commit ==1.4 - aeson-compat ==0.3.10 - aeson-diff ==1.1.0.13 - - aeson-extra ==0.5.1 + - aeson-extra ==0.5.1.1 - aeson-generic-compat ==0.0.1.3 - aeson-optics ==1.1.1 - aeson-pretty ==0.8.9 @@ -42,7 +42,7 @@ default-package-overrides: - alex ==3.2.7.1 - alex-meta ==0.3.0.13 - algebra ==4.3.1 - - algebraic-graphs ==0.6 + - algebraic-graphs ==0.6.1 - align-audio ==0.0 - Allure ==0.11.0.0 - almost-fix ==0.0.2 @@ -239,7 +239,7 @@ default-package-overrides: - buffer-builder ==0.2.4.8 - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.4 - - bugsnag-hs ==0.2.0.8 + - bugsnag-hs ==0.2.0.9 - bugzilla-redhat ==1.0.0 - burrito ==2.0.1.1 - butcher ==1.3.3.2 @@ -256,7 +256,7 @@ default-package-overrides: - bytestring-conversion ==0.3.2 - bytestring-lexing ==0.5.0.8 - bytestring-mmap ==0.2.2 - - bytestring-strict-builder ==0.4.5.5 + - bytestring-strict-builder ==0.4.5.6 - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.9 - bytestring-trie ==0.2.7 @@ -813,7 +813,7 @@ default-package-overrides: - function-builder ==0.3.0.1 - functor-classes-compat ==2.0.0.2 - functor-combinators ==0.4.1.0 - - fused-effects ==1.1.1.2 + - fused-effects ==1.1.1.3 - fusion-plugin ==0.2.4 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 @@ -825,7 +825,7 @@ default-package-overrides: - gd ==3000.7.3 - gdp ==0.0.3.0 - general-games ==1.1.1 - - generic-aeson ==0.2.0.13 + - generic-aeson ==0.2.0.14 - generic-arbitrary ==0.2.2 - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.1 @@ -915,7 +915,7 @@ default-package-overrides: - gi-pango ==1.0.25 - githash ==0.1.6.2 - github ==0.27 - - github-release ==2.0.0.0 + - github-release ==2.0.0.1 - github-rest ==1.1.2 - github-types ==0.2.1 - github-webhooks ==0.15.0 @@ -1182,7 +1182,7 @@ default-package-overrides: - http-common ==0.8.3.4 - http-conduit ==2.3.8 - http-date ==0.0.11 - - http-directory ==0.1.9 + - http-directory ==0.1.10 - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 - http-io-streams ==0.1.6.1 @@ -1197,7 +1197,7 @@ default-package-overrides: - HUnit-approx ==1.1.1.1 - hunit-dejafu ==2.0.0.5 - hvect ==0.4.0.1 - - hvega ==0.12.0.2 + - hvega ==0.12.0.3 - hw-balancedparens ==0.4.1.2 - hw-bits ==0.7.2.2 - hw-conduit ==0.2.1.1 @@ -1248,7 +1248,7 @@ default-package-overrides: - if ==0.1.0.0 - iff ==0.0.6 - ihaskell ==0.10.2.2 - - ihaskell-hvega ==0.5.0.2 + - ihaskell-hvega ==0.5.0.3 - ihs ==0.1.0.3 - ilist ==0.4.0.1 - imagesize-conduit ==1.1 @@ -1301,7 +1301,7 @@ default-package-overrides: - io-streams ==1.5.2.1 - ip6addr ==1.0.3 - iproute ==1.7.12 - - IPv6Addr ==2.0.4 + - IPv6Addr ==2.0.5 - ipynb ==0.2 - ipython-kernel ==0.10.2.2 - irc ==0.6.1.0 @@ -1326,7 +1326,7 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.10 - - json-feed ==2.0.0.2 + - json-feed ==2.0.0.3 - jsonifier ==0.2.1.1 - jsonpath ==0.2.1.0 - json-stream ==0.4.4.1 @@ -1343,7 +1343,7 @@ default-package-overrides: - katip-logstash ==0.1.0.2 - katip-wai ==0.1.2.0 - kazura-queue ==0.1.0.4 - - keep-alive ==0.2.0.0 + - keep-alive ==0.2.1.0 - keycode ==0.2.2 - keys ==3.12.3 - ki ==0.2.0.1 @@ -1621,7 +1621,7 @@ default-package-overrides: - named ==0.3.0.1 - names-th ==0.3.0.1 - nano-erl ==0.1.0.1 - - NanoID ==3.2.0 + - NanoID ==3.2.1 - nanospec ==0.2.2 - nanovg ==0.8.0.0 - nats ==1.1.2 @@ -1799,7 +1799,7 @@ default-package-overrides: - peano ==0.1.0.1 - pem ==0.2.4 - percent-format ==0.0.2 - - peregrin ==0.3.2 + - peregrin ==0.3.3 - perf ==0.9.0 - perfect-hash-generator ==0.2.0.6 - persist ==0.1.1.5 @@ -1951,7 +1951,7 @@ default-package-overrides: - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.14.0.0 - - pusher-http-haskell ==2.1.0.9 + - pusher-http-haskell ==2.1.0.10 - pvar ==1.0.0.0 - PyF ==0.10.2.0 - qchas ==1.1.0.1 @@ -1998,7 +1998,7 @@ default-package-overrides: - rank2classes ==1.4.4 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - - ratel ==2.0.0.2 + - ratel ==2.0.0.3 - rate-limit ==1.4.2 - ratel-wai ==2.0.0.0 - rattle ==0.2 @@ -2091,7 +2091,7 @@ default-package-overrides: - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.7 + - rpmbuild-order ==0.4.8 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - RSA ==2.4.1 @@ -2216,7 +2216,7 @@ default-package-overrides: - ShellCheck ==0.8.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shellmet ==0.0.4.0 + - shellmet ==0.0.4.1 - shelltestrunner ==1.9 - shell-utility ==0.1 - shelly ==1.10.0 @@ -2247,7 +2247,7 @@ default-package-overrides: - siphash ==1.0.3 - Sit ==0.2022.3.18 - sitemap-gen ==0.1.0.0 - - sized ==1.0.0.0 + - sized ==1.0.0.1 - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 @@ -2370,7 +2370,7 @@ default-package-overrides: - stripe-scotty ==1.1.0.2 - stripe-signature ==1.0.0.14 - stripe-wreq ==1.0.1.14 - - strive ==6.0.0.2 + - strive ==6.0.0.3 - strong-path ==1.1.4.0 - structs ==0.1.6 - structured ==0.1.1 @@ -2382,7 +2382,7 @@ default-package-overrides: - svg-builder ==0.1.1 - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - - swagger2 ==2.8.2 + - swagger2 ==2.8.4 - swish ==0.10.2.0 - syb ==0.7.2.1 - sydtest-discover ==0.0.0.1 @@ -2587,7 +2587,7 @@ default-package-overrides: - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 - type-level-natural-number ==2.0 - - type-level-numbers ==0.1.1.1 + - type-level-numbers ==0.1.1.2 - typelits-witnesses ==0.4.0.0 - type-map ==0.1.7.0 - type-natural ==1.1.0.1 @@ -2641,7 +2641,7 @@ default-package-overrides: - unliftio ==0.2.22.0 - unliftio-core ==0.2.0.1 - unliftio-path ==0.0.2.0 - - unliftio-pool ==0.2.1.1 + - unliftio-pool ==0.2.2.0 - unliftio-streams ==0.1.1.1 - unlit ==0.4.0.0 - unordered-containers ==0.2.17.0 @@ -2718,7 +2718,7 @@ default-package-overrides: - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - wai-extra ==3.1.12.1 - - wai-feature-flags ==0.1.0.3 + - wai-feature-flags ==0.1.0.4 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 - wai-middleware-caching ==0.1.0.2 @@ -2745,9 +2745,9 @@ default-package-overrides: - wcwidth ==0.0.2 - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 - - webgear-core ==1.0.1 - - webgear-openapi ==1.0.1 - - webgear-server ==1.0.1 + - webgear-core ==1.0.2 + - webgear-openapi ==1.0.2 + - webgear-server ==1.0.2 - webpage ==0.0.5.1 - web-plugins ==0.4.1 - web-routes ==0.27.14.4 @@ -2851,7 +2851,7 @@ with-compiler: ghc-9.0.2 - yesod-markdown ==0.12.6.13 - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.1.0 - - yesod-paginator ==1.1.2.1 + - yesod-paginator ==1.1.2.2 - yesod-persistent ==1.6.0.8 - yesod-recaptcha2 ==1.0.2 - yesod-routes-flow ==3.0.0.2 From f8e6e1b688caa9a1f13471c94e53dbeca01cf02a Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 23 Jun 2022 13:15:16 +0900 Subject: [PATCH 09/59] all-cabal-hashes: 2022-06-17T13:13:15Z -> 2022-06-23T03:01:47Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 3828c6d45e7..d3d11e13385 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3871a68d11673db568acc232f35f8ffd28b63832", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3871a68d11673db568acc232f35f8ffd28b63832.tar.gz", - "sha256": "0fbj5353ni22b7vbfn5b9k5lq78i3aanx2njj6kac7qyiazrdck2", - "msg": "Update from Hackage at 2022-06-17T13:13:15Z" + "commit": "c87d8bf669c0f5da46e44dece7a851e2f9d8c3e9", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c87d8bf669c0f5da46e44dece7a851e2f9d8c3e9.tar.gz", + "sha256": "0m1ahg2knm136g2gr66asicsqcy9n80lmszs70nkz550ll51vq8v", + "msg": "Update from Hackage at 2022-06-23T03:01:47Z" } From 8815590ac7a8eb23f67f62af7d836c9de10765b7 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 23 Jun 2022 13:16:37 +0900 Subject: [PATCH 10/59] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1511 ++++++++++------- 1 file changed, 919 insertions(+), 592 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 914a9c6337e..3edcceea335 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5721,6 +5721,8 @@ self: { pname = "Euterpea"; version = "2.0.7"; sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8"; + revision = "1"; + editedCabalFile = "1fdkjivbrp9q5vwiprjhpnpl9bir1qdiybc2hm52i016x3rx51d8"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -11220,8 +11222,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "3"; - editedCabalFile = "0gs1gw5wmp7hqh2d0rwkhwzm71gjnivfqd3nd5gzc4yvqqzxplwg"; + revision = "4"; + editedCabalFile = "0njrmdrjnw0i3km50wprfsqmimvqsi90p8kc47d3imgkp6fvcnik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11470,8 +11472,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "2.0.4"; - sha256 = "1d20cfnxvahcnr8iq71ymyykfl6cgxzl5i6vmdl7ill2bj07xy08"; + version = "2.0.5"; + sha256 = "14zd98kbs3z6gmw9x897x1vslv5qphfhillhwxvnpkz87wsgzsc1"; libraryHaskellDepends = [ aeson attoparsec base iproute network network-info random text ]; @@ -13072,6 +13074,8 @@ self: { pname = "ListLike"; version = "4.7.7"; sha256 = "0h4yfzrf3ljvzf3x75nx791bpxlmdi7f42ff0xyfk8d498iws08a"; + revision = "1"; + editedCabalFile = "155y1r051ar9k8vhb54q5ga7a5rzlm4jx1c42pbw7cfy3c8af6hc"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -14661,8 +14665,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "3.2.0"; - sha256 = "16h4mhr16b2fkf37vpsalnzjmg06sghb86gh1n1w3z64dvad0849"; + version = "3.2.1"; + sha256 = "13917k5s17aq7h4hab3i2b6y3z3c0wq6p9x7hlindks28390i93f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21787,12 +21791,12 @@ self: { platforms = lib.platforms.windows; }) {}; - "Win32_2_13_2_0" = callPackage + "Win32_2_13_2_1" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.13.2.0"; - sha256 = "1gmhqb0v3ds7csrmzw211jqjjp955akgp7ykngwnpqb6kpbvpcf4"; + version = "2.13.2.1"; + sha256 = "1fn4z7spq0w2bajg6q8qw6mn3kpz07356zc0shpks8cf6gkmyb8h"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.windows; @@ -24619,16 +24623,17 @@ self: { "ad" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , criterion, data-reify, erf, free, nats, reflection, semigroups - , transformers + , tasty, tasty-hunit, transformers }: mkDerivation { pname = "ad"; - version = "4.5.1"; - sha256 = "08hx8ww93x2hg6qxfypd9hyqqcp7c70w17i6hs03qmk4i433h2b9"; + version = "4.5.2"; + sha256 = "08vcp760j6ay8k9zs4qzhvirf775vhni56923jbjzdxrs9mm5167"; libraryHaskellDepends = [ adjunctions array base comonad containers data-reify erf free nats reflection semigroups transformers ]; + testHaskellDepends = [ base tasty tasty-hunit ]; benchmarkHaskellDepends = [ base criterion erf ]; description = "Automatic Differentiation"; license = lib.licenses.bsd3; @@ -25059,6 +25064,8 @@ self: { pname = "aeson"; version = "2.0.3.0"; sha256 = "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr"; + revision = "1"; + editedCabalFile = "1zrgn63jzrpk3n3vd44zkzgw7kb5qxlvhx4nk6g3sswwrsz5j32i"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable indexed-traversable @@ -25094,6 +25101,8 @@ self: { pname = "aeson"; version = "2.1.0.0"; sha256 = "151wyyw0ip0f2w4mfxcs58c26rsvhaac7s0yba76gnhnzbskwxha"; + revision = "1"; + editedCabalFile = "1zq5rnapvvrhfi4yy1xzi322h5zvmx0c3klpbrb08k92ykvfb98q"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist generically ghc-prim hashable @@ -25384,35 +25393,6 @@ self: { }) {}; "aeson-extra" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base - , base-compat-batteries, bytestring, containers, deepseq - , exceptions, hashable, parsec, quickcheck-instances - , recursion-schemes, scientific, semialign, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, these, time-parsers - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson-extra"; - version = "0.5.1"; - sha256 = "13d01hppx71cm7f901n1bd0hxj69ikbp57i6ckfygc6da0mg49jc"; - revision = "1"; - editedCabalFile = "0minlchivdbpwlfqv7n7ss9cvd7fbpflnmbvs0bcmw1fi83k3b32"; - libraryHaskellDepends = [ - aeson attoparsec attoparsec-iso8601 base base-compat-batteries - bytestring containers deepseq exceptions hashable parsec - recursion-schemes scientific semialign template-haskell text these - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base-compat-batteries containers quickcheck-instances - tasty tasty-hunit tasty-quickcheck time-parsers - unordered-containers vector - ]; - description = "Extra goodies for aeson"; - license = lib.licenses.bsd3; - }) {}; - - "aeson-extra_0_5_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat-batteries , bytestring, containers, deepseq, quickcheck-instances , recursion-schemes, scientific, semialign, tasty, tasty-hunit @@ -25435,7 +25415,6 @@ self: { ]; description = "Extra goodies for aeson"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson-filthy" = callPackage @@ -25802,8 +25781,8 @@ self: { pname = "aeson-pretty"; version = "0.8.9"; sha256 = "021az9az6xik9c9s3rnar5fr1lgy2h3igibf5ixnc7ps3m2lzg2x"; - revision = "1"; - editedCabalFile = "0x01ryaadmic21dy8ix73k4nkh1hkvwn5vp04vf95a6d30zcmnjf"; + revision = "2"; + editedCabalFile = "1895w56jl4c06wfhv5zf8ayqpzkxgva2rz5xxz8fvfdiza781cgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27260,27 +27239,6 @@ self: { }) {}; "algebraic-graphs" = callPackage - ({ mkDerivation, array, base, containers, deepseq, extra - , inspection-testing, mtl, QuickCheck, transformers - }: - mkDerivation { - pname = "algebraic-graphs"; - version = "0.6"; - sha256 = "1d3gwyimrzcc7i2qj3iimab3wz6vicgwybhq7ac3da86b8pjlgim"; - revision = "1"; - editedCabalFile = "0f7ih4d0jls7399slxc3zkg38z32jm80jv74iyy42l8s6m5ya1cv"; - libraryHaskellDepends = [ - array base containers deepseq mtl transformers - ]; - testHaskellDepends = [ - array base containers deepseq extra inspection-testing mtl - QuickCheck transformers - ]; - description = "A library for algebraic graph construction and transformation"; - license = lib.licenses.mit; - }) {}; - - "algebraic-graphs_0_6_1" = callPackage ({ mkDerivation, array, base, containers, deepseq, extra , inspection-testing, QuickCheck, transformers }: @@ -27297,6 +27255,25 @@ self: { ]; description = "A library for algebraic graph construction and transformation"; license = lib.licenses.mit; + }) {}; + + "algebraic-graphs_0_7" = callPackage + ({ mkDerivation, array, base, containers, deepseq, extra + , inspection-testing, QuickCheck, transformers + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.7"; + sha256 = "0s75h92qb9jdfdyzh0fraxpzj0jl4xvcbqq9cwgba2k9306rl5ai"; + libraryHaskellDepends = [ + array base containers deepseq transformers + ]; + testHaskellDepends = [ + array base containers deepseq extra inspection-testing QuickCheck + transformers + ]; + description = "A library for algebraic graph construction and transformation"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; @@ -32953,15 +32930,16 @@ self: { }) {}; "appendful" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity - , validity-containers + ({ mkDerivation, aeson, autodocodec, base, containers, deepseq, mtl + , validity, validity-containers }: mkDerivation { pname = "appendful"; - version = "0.0.0.0"; - sha256 = "1wb2abnr2k7d7bgvh3zjyg55s1236cgnz1idldpxcrib30nr01l8"; + version = "0.1.0.0"; + sha256 = "07bs55kwj0r5q8z9mvihc890yfan9whis8q1n5k27sbqpfbwaqws"; libraryHaskellDepends = [ - aeson base containers deepseq mtl validity validity-containers + aeson autodocodec base containers deepseq mtl validity + validity-containers ]; license = lib.licenses.mit; }) {}; @@ -33306,6 +33284,8 @@ self: { pname = "approximate"; version = "0.3.5"; sha256 = "1f168ac9xryrv50k7gvh89xv0mj6c42cxw7pj01pqcbppbs0rm3g"; + revision = "1"; + editedCabalFile = "1dv6jk6hin5bvzdvdz10nlk4xfhn03mdd90f8g94ah4gyqsx6sfk"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens log-domain pointed safecopy semigroupoids semigroups vector @@ -37034,6 +37014,8 @@ self: { pname = "aur"; version = "7.0.7"; sha256 = "0k8b3rc89ibln7idb1a1f6g3p04f1n7mnk8q8nqiggygf8r6sdnh"; + revision = "1"; + editedCabalFile = "0lxhkpxxg7gvwa47bdk2hi0f9ww1kvrmkwy41ar64lp124frcvsf"; libraryHaskellDepends = [ aeson base bytestring hashable http-client http-types text ]; @@ -37076,6 +37058,8 @@ self: { pname = "aura"; version = "3.2.9"; sha256 = "0hw96090gb4rf6n6mf9mn2y50sjgcvny2ipdd9720an33nhpsd3m"; + revision = "3"; + editedCabalFile = "0ah0hdb3inqbmvriwx67hd7rbj5qkh3q103bvbdd0zj7zaqlz30k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37268,8 +37252,8 @@ self: { }: mkDerivation { pname = "autodocodec-openapi3"; - version = "0.2.0.0"; - sha256 = "1r9csd9v01pwiz1vhydpn3jnp5jk45shkfmizgpnn8p1mfkms55j"; + version = "0.2.1.0"; + sha256 = "1nd1r7r258dxhrdjwc7m8byrv99b1zqapvj8021yq8j1nad8mjvg"; libraryHaskellDepends = [ aeson autodocodec base insert-ordered-containers lens mtl openapi3 scientific text unordered-containers @@ -37995,6 +37979,8 @@ self: { pname = "aws-cloudfront-signed-cookies"; version = "0.2.0.11"; sha256 = "018a3q443h19pbcc178ns7zdmsdd3pz8ww3yfixrhr4jfghws3r9"; + revision = "2"; + editedCabalFile = "1i8zyr3kz1cm8ygzpkvxyfqzlnykkwsfa41yrb5k89729fw51dnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40342,6 +40328,17 @@ self: { mainProgram = "base91"; }) {}; + "based" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "based"; + version = "0.1"; + sha256 = "1s4nacp3ripdn895c863hmnpaqmbkiisjp3y45v1q28qdjy052qv"; + libraryHaskellDepends = [ base ]; + description = "alternative prelude"; + license = lib.licenses.mit; + }) {}; + "basement" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -41324,8 +41321,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.4"; - sha256 = "1c2w0ll84mrzkwg3314pnmasgaql0yjhrb5wy7zlm18s3bgpcysb"; + version = "0.13.5"; + sha256 = "08r6i7xs7n9054m80svqbyjgy6c5diypxswwjkc3gxrcn1s0fqkv"; libraryHaskellDepends = [ base dunai MonadRandom mtl simple-affine-space transformers ]; @@ -45159,6 +45156,8 @@ self: { pname = "bitvec"; version = "1.1.2.0"; sha256 = "0h7c5kpx43bm6qqnkpbzma9n201987cnq1231zg33p3xp7qc1hm2"; + revision = "1"; + editedCabalFile = "0kf70z3adgdhmwc91ymr2y3jlg9irnz4hzck3l9im1d3zxs1lyvs"; libraryHaskellDepends = [ base bytestring deepseq ghc-bignum primitive vector ]; @@ -45173,6 +45172,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "bitvec_1_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum + , primitive, quickcheck-classes, quickcheck-classes-base, random + , tasty, tasty-bench, tasty-quickcheck, vector + }: + mkDerivation { + pname = "bitvec"; + version = "1.1.3.0"; + sha256 = "0l85lshzh5c0s59pbbh76vg65bzz7x4y1a9gdvj4dkqz1bsklk0w"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-bignum primitive vector + ]; + testHaskellDepends = [ + base ghc-bignum primitive quickcheck-classes + quickcheck-classes-base tasty tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base containers ghc-bignum random tasty-bench vector + ]; + description = "Space-efficient bit vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bitwise" = callPackage ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }: mkDerivation { @@ -45197,8 +45220,8 @@ self: { pname = "bitwise-enum"; version = "1.0.1.0"; sha256 = "0vmdr8csmxwab7s4nmqdfpqdssivh90fddk94i8wkwj1la867y1z"; - revision = "1"; - editedCabalFile = "0g4w46bv0pj52v3kfcc41g9m750il67fg78n54s91p6jam6l0r6h"; + revision = "3"; + editedCabalFile = "1f94gscpmffhx1m88nq6h6y46b1xpzp1kwfxb362zq6k1rq7dbk9"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -45472,8 +45495,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "8"; - editedCabalFile = "1l5aj1p7db93qq1jxndv77csizwr6pbfm0g98d1mv7zgqanks3dd"; + revision = "9"; + editedCabalFile = "1qzwy8kd25crnnm1m4sks6daqsm01i7pi8z96wnv1aa056vwiqx2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -47962,7 +47985,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_0_69" = callPackage + "brick_0_70_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -47971,8 +47994,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.69"; - sha256 = "1q963gpcjcrnsyrypkb238ay8lbkq8745pxkanmhy4m40gvk5j94"; + version = "0.70.1"; + sha256 = "18i1i06ll6pklzaazcl2bzbi3w5zdn43l9wvkclhfcmddjy19lp4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48930,23 +48953,6 @@ self: { }) {}; "bugsnag-hs" = callPackage - ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client - , text, time, unordered-containers - }: - mkDerivation { - pname = "bugsnag-hs"; - version = "0.2.0.8"; - sha256 = "1qnbkp2c5fhv6b9mq3xr849if418qihy6xczzlsf7q4y0vx36kg9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring http-client text time unordered-containers - ]; - testHaskellDepends = [ aeson base bytestring hedgehog ]; - description = "A Bugsnag client for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "bugsnag-hs_0_2_0_9" = callPackage ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client , text, time, unordered-containers }: @@ -48961,7 +48967,6 @@ self: { testHaskellDepends = [ aeson base bytestring hedgehog ]; description = "A Bugsnag client for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bugsnag-wai" = callPackage @@ -50285,25 +50290,6 @@ self: { }) {}; "bytestring-strict-builder" = callPackage - ({ mkDerivation, base, bytestring, criterion, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "bytestring-strict-builder"; - version = "0.4.5.5"; - sha256 = "1knin3mfj2qfh7xhvbrpakd037y7qqic24f1w93v8p6y5g7bc3zp"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict bytestring builder"; - license = lib.licenses.mit; - }) {}; - - "bytestring-strict-builder_0_4_5_6" = callPackage ({ mkDerivation, base, bytestring, criterion, QuickCheck , quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck @@ -50320,7 +50306,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict bytestring builder"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring-substring" = callPackage @@ -54529,8 +54514,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "7"; - editedCabalFile = "1zb16h20w4p3qqvrg4m9rhnyrbpx1ga4r6azrzy1h8vsw09vcbsz"; + revision = "8"; + editedCabalFile = "17vm6016k4phznax0v4jbg14wckwwxlx9q0kkrvz1m2zcbjk8r9h"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -55052,15 +55037,15 @@ self: { broken = true; }) {}; - "cayley-client_0_4_18" = callPackage + "cayley-client_0_4_19" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector }: mkDerivation { pname = "cayley-client"; - version = "0.4.18"; - sha256 = "0zdv66p9klc6px8ch6239k2p4pi3px28k50918kq80wl94msigns"; + version = "0.4.19"; + sha256 = "0qfi56wkf9ycd7dhah01pc1vlaims4p8mscdcq7xc3pc3m4vvjs2"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -58026,7 +58011,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "citeproc_0_7" = callPackage + "citeproc_0_8" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, containers, data-default, Diff, directory , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific @@ -58035,8 +58020,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.7"; - sha256 = "1xsfsz6hdp0ickps1qafkfn7pwjxc22a5ib3bl99jdjbx7fql6h9"; + version = "0.8"; + sha256 = "13f89nnx1g91cpnw1cp28nv33lrvp8swdkxlcbgvsfm38gs684qc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63194,8 +63179,8 @@ self: { pname = "compensated"; version = "0.8.3"; sha256 = "0xigi4pcw581d8kjbhdjkksyz9bgcgvq0j17br9z1x6a3hw1m39a"; - revision = "1"; - editedCabalFile = "0c1yzvchjbrv5q6b24y74026082f408d2kqv1789a27z78awfhwm"; + revision = "2"; + editedCabalFile = "0nr81fm5b8pavgyf0n34199jvr2zp18y0cdlzas240xwpgxn6k1p"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive hashable lens log-domain safecopy semigroupoids semigroups vector @@ -65164,8 +65149,8 @@ self: { pname = "conferer"; version = "1.1.0.0"; sha256 = "1hkdrqxrac1mbzvd29f6ds4cbihdv0j0daai7yc282myv0varh09"; - revision = "1"; - editedCabalFile = "0xr6910zn9j07gwc9f9dmlgxiagirmpzjzb9vlaqc0qvpawgq201"; + revision = "2"; + editedCabalFile = "0j7q975kg4dchl7pn8cl26sf8945bmhw5mvy73s18ylxqx4qqkwb"; libraryHaskellDepends = [ base bytestring containers directory filepath text ]; @@ -65185,6 +65170,8 @@ self: { pname = "conferer-aeson"; version = "1.1.0.2"; sha256 = "07rdal3smq1s14zmsn7g26vc6sqj21rsa2a1vcbrwrfgh9x36jkn"; + revision = "1"; + editedCabalFile = "19v6xla4vvhmhqh3z82inp1b6jzvprbvcmd9nbg1l65nsvqgq25a"; libraryHaskellDepends = [ aeson base bytestring conferer directory text unordered-containers vector @@ -67703,6 +67690,26 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, hourglass, prettyprinter, scientific, text, time + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.3.4.0"; + sha256 = "07f90lhjv9vpnymidq6kyrnz6s2w3slvy2nwzjxvbia2p22nqmak"; + revision = "1"; + editedCabalFile = "1zc0y1f2mzycdnyd5f8dmkhnwc15bczhf2i82y45bjy4pg3890vg"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable hourglass + prettyprinter scientific text time unordered-containers uuid vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -67742,7 +67749,7 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_5_0_4" = callPackage + "core-program_0_5_1_0" = callPackage ({ mkDerivation, async, base, bytestring, core-data, core-text , directory, exceptions, filepath, fsnotify, hashable, hourglass , mtl, prettyprinter, safe-exceptions, stm, template-haskell @@ -67751,8 +67758,10 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.5.0.4"; - sha256 = "1s3b80hx4fzpibh79l42hhpw8lf01s85s5l3xa8jgnv32lisllby"; + version = "0.5.1.0"; + sha256 = "0h9iw9kdj947zlzjd9gi4xlnldrqpgw80vla31c0zhl4dmib6a22"; + revision = "1"; + editedCabalFile = "1920jl5yxwgj64wacgx929b054icq7bz73p06rqfm38wkj87bqa3"; libraryHaskellDepends = [ async base bytestring core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -67802,6 +67811,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_8_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.8.0"; + sha256 = "1vl463wdgnfb795nbir355w1cgy5ndqnwgfiiyr1j73xmngmvw04"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-warn" = callPackage ({ mkDerivation, base, containers, containers-good-graph, ghc, syb }: @@ -70756,16 +70783,16 @@ self: { }) {}; "css-easings" = callPackage - ({ mkDerivation, aeson, base, blaze-markup, data-default, deepseq - , QuickCheck, scientific, shakespeare, text + ({ mkDerivation, aeson, base, blaze-markup, data-default-class + , deepseq, QuickCheck, scientific, shakespeare, text }: mkDerivation { pname = "css-easings"; - version = "0.2.2.0"; - sha256 = "0ks42vnvj5qffs5zwnplsrqjd9c90xxlcfgcqdhl0iw5fxxnfipj"; + version = "0.2.3.0"; + sha256 = "1mammajx15ingmzk974b35lflq9bi2ri2rgpwd76zhzlzy91vca6"; libraryHaskellDepends = [ - aeson base blaze-markup data-default deepseq QuickCheck scientific - shakespeare text + aeson base blaze-markup data-default-class deepseq QuickCheck + scientific shakespeare text ]; description = "Defining and manipulating css easing strings"; license = lib.licenses.bsd3; @@ -76392,6 +76419,29 @@ self: { license = lib.licenses.mit; }) {}; + "deferred-folds_0_9_18_2" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.18.2"; + sha256 = "0amlxdgz1yfql1r7w6z9gy6gncihp5nm1fl2bxrk7027hc0wdp96"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -78159,8 +78209,8 @@ self: { pname = "dhall"; version = "1.41.1"; sha256 = "09flx2mfl8mzszn0hx80fai3ryiwgjkbxyklfkpmm5hw1smkdslv"; - revision = "1"; - editedCabalFile = "19lgfkyg1p9crrf3gi508zya477vma2ks7ib7hw0r84sl4jjiaji"; + revision = "3"; + editedCabalFile = "0x4dkfg3257c4vq05ca7jcyk7p446djzzwwc5j509wj23mrqf30h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78302,6 +78352,8 @@ self: { pname = "dhall-csv"; version = "1.0.2"; sha256 = "08m9gjjldbzbgqr7vb33xjnzn7vmhf8gp9zh73vvzbchflwgh48p"; + revision = "1"; + editedCabalFile = "08zavv7bpb4033imzqmbxpxh51a3srcy58h85k4nmii73xv1iwzg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78433,6 +78485,8 @@ self: { pname = "dhall-json"; version = "1.7.10"; sha256 = "11gpsgd3aafqh9v10gib7yivy3dp7dhd1a3dslf2ivc7na3d8p71"; + revision = "1"; + editedCabalFile = "1dhs90y4jn2ipc1x0srd3a5qrgh0pj0laqd7mmqgwr3l9f0p19g6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78484,8 +78538,8 @@ self: { pname = "dhall-lsp-server"; version = "1.1.1"; sha256 = "0z4gc27fpz1pcjbajwpxgn0zhxlp9xp47lyg55p03ghfpqa2mcl6"; - revision = "2"; - editedCabalFile = "1618pkfdv887sj9i572db8sgz0jl7lpkmil4fkdc8irh2y45wl6r"; + revision = "3"; + editedCabalFile = "0lb51q09fdsnwlfsgna8ssv3434w550kla193kslbrmx5vsi04kp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78564,6 +78618,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.8"; sha256 = "1jr9njnly63d5bzd9np7hijmczkwamb4j2k14h647h6i3hhkxh8n"; + revision = "1"; + editedCabalFile = "0navmlh0yh3abk114x7grv7rcbxxvk1yvh3lvnwc23qq6gm34r79"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78587,6 +78643,8 @@ self: { pname = "dhall-openapi"; version = "1.0.4"; sha256 = "1hvjilm1hjq4963l7xnr1r35x023pgddv0l3bvfgryd58zv728ah"; + revision = "2"; + editedCabalFile = "1vb7hka8iwprl555zl20z6wgl1zkah6bj02b9r0x6b99mds463x0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78730,6 +78788,8 @@ self: { pname = "dhall-yaml"; version = "1.2.10"; sha256 = "1a3g84799lbq7v9bzdq9bcwzyzci07rd1x42325ck4x51hrqs8nn"; + revision = "1"; + editedCabalFile = "1jfzpwbcg17mqk9c2f1lhqjwadxm1k04rd91j4h4gd5wnsvb85i4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80308,6 +80368,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "dimensional_1_5" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob + , hspec, hspec-discover, ieee754, numtype-dk, QuickCheck + , template-haskell, vector + }: + mkDerivation { + pname = "dimensional"; + version = "1.5"; + sha256 = "16d50vlln11hq894y8qxrg4cricz1459dg14z0wc1fzfiydxb6ns"; + libraryHaskellDepends = [ + base deepseq exact-pi ieee754 numtype-dk vector + ]; + testHaskellDepends = [ + base doctest Glob hspec QuickCheck template-haskell + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Statically checked physical dimensions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dimensional-codata" = callPackage ({ mkDerivation, base, dimensional, numtype-dk }: mkDerivation { @@ -82468,6 +82550,25 @@ self: { mainProgram = "dmenu-search"; }) {}; + "dnf-repo" = callPackage + ({ mkDerivation, base, directory, extra, filepath, simple-cmd + , simple-cmd-args + }: + mkDerivation { + pname = "dnf-repo"; + version = "0.1"; + sha256 = "1xsicihfdvygqpnham4y0cixd07iyh4mxcjrmbivrc3mglb3qgf2"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base directory extra filepath simple-cmd simple-cmd-args + ]; + description = "DNF wrapper tool to control repos"; + license = lib.licenses.bsd3; + mainProgram = "dnf-repo"; + }) {}; + "dns" = callPackage ({ mkDerivation, array, async, attoparsec, auto-update, base , base16-bytestring, base64-bytestring, bytestring, containers @@ -82876,8 +82977,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.7.0.0"; - sha256 = "1w228qhnl54v3d69ln4y5s64ywvcsd202m1m3ry8j6lsgfj1hawm"; + version = "0.7.0.1"; + sha256 = "18qbwfr930hnz0wrcvq6xzma64lmvh1f69b5nick540wsfbwcqg3"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -83763,8 +83864,8 @@ self: { }: mkDerivation { pname = "dormouse-client"; - version = "0.2.0.0"; - sha256 = "1l5vhlvl5kl4m5shl2rysj16r7wqkqwy1i1yb3r96zx8rbwhi2j8"; + version = "0.2.1.0"; + sha256 = "09qkmlgfq0p2d7amil9af6zbd3p2ayhziv8sr152zim4g0v2nmmk"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers dormouse-uri http-api-data http-client http-client-tls http-types @@ -85305,6 +85406,24 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "dunai_0_8_3" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.8.3"; + sha256 = "1xkc7a337g6xg2wgj1sphpmvj22y2fkifs36s7iws7cr7fqx1a1p"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -85325,8 +85444,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.8.2"; - sha256 = "0cicvzp604945mmlnrxwkkcyl01id933jrnnrv3y0c5xqlly2y9r"; + version = "0.8.3"; + sha256 = "07kirfcyzanscp0kdhgsg0pf809nwf6im0m104xrsrxkak1iqkh4"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -86484,8 +86603,8 @@ self: { }: mkDerivation { pname = "eccrypto"; - version = "0.2.2"; - sha256 = "1avzxzzlhldpjp6k14jirx3ws5818bpsip9p0wj6kl1g3ii7ydjz"; + version = "0.2.3"; + sha256 = "16jysii88v1wkm3g7vjx9vdhzcjqq1dlfrjkf2hccrcxz8wqv4d1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cryptohash-sha512 integer-gmp @@ -99645,6 +99764,8 @@ self: { pname = "folds"; version = "0.7.8"; sha256 = "11278546mq05rhyjfmhg0iasqjsn898l44dhp5qgaw1zwzywir2i"; + revision = "1"; + editedCabalFile = "1gxb8469w12afd1adf5cn32wxvnvndavxwr65dyc6icqvalbkirn"; configureFlags = [ "-f-test-hlint" ]; libraryHaskellDepends = [ adjunctions base bifunctors comonad constraints contravariant @@ -103147,8 +103268,8 @@ self: { }: mkDerivation { pname = "fused-effects"; - version = "1.1.1.2"; - sha256 = "1icm2mk4xbijahn7srv5dhnrlgx7fx5m0si75ixj1g1s16s2v8sf"; + version = "1.1.1.3"; + sha256 = "046d6r1sbcqvinla14hhfb6f2ynryz5ixqzf4q2fjd3g0c4pfm88"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base containers hedgehog hedgehog-fn inspection-testing @@ -105013,24 +105134,6 @@ self: { }) {}; "generic-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl - , tagged, text, unordered-containers, vector - }: - mkDerivation { - pname = "generic-aeson"; - version = "0.2.0.13"; - sha256 = "0w5xp1rfg3r90ja1f0s48i4x7yyynfv52p6b9ncsdqyrq3y9qvl0"; - revision = "1"; - editedCabalFile = "07kg0bc2jvfww9a9n5rzffsi23k2i3py7h7dq7qcj7817kkh0ig0"; - libraryHaskellDepends = [ - aeson attoparsec base generic-deriving mtl tagged text - unordered-containers vector - ]; - description = "Derivation of Aeson instances using GHC generics"; - license = lib.licenses.bsd3; - }) {}; - - "generic-aeson_0_2_0_14" = callPackage ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl , tagged, text, unordered-containers, vector }: @@ -105044,7 +105147,6 @@ self: { ]; description = "Derivation of Aeson instances using GHC generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "generic-arbitrary" = callPackage @@ -111566,8 +111668,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "2.0.0.0"; - sha256 = "03bvbqpaa3xp9rnmg8a95qs9j7chng1xsk53f30520m1cfyyikgq"; + version = "2.0.0.1"; + sha256 = "1ic4qg7gbmf28hhzzcg8907grwdai9vxj41gz7f3wzjyph8q574g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113558,20 +113660,20 @@ self: { }) {}; "godot-megaparsec" = callPackage - ({ mkDerivation, base, criterion, lens, megaparsec, text - , unordered-containers + ({ mkDerivation, base, criterion, generic-lens, lens, megaparsec + , mtl, text, unordered-containers }: mkDerivation { pname = "godot-megaparsec"; - version = "0.2.2.0"; - sha256 = "0rlbvvanf8y9drnr8f5fszylkchl70ddhlfcib9d03albvw1xllb"; + version = "0.2.5.1"; + sha256 = "1k5bil98zc6pw363mb2hmmlsq27zjf7j7xfwa61vg41bxyz88nqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base lens megaparsec text unordered-containers + base generic-lens lens megaparsec mtl text unordered-containers ]; executableHaskellDepends = [ base criterion megaparsec text ]; - description = "Megaparsec parser for Godot `tscn` and `gdns` files"; + description = "Megaparsec parser for Godot `tscn` and `gdextension` files"; license = lib.licenses.bsd3; mainProgram = "bench"; }) {}; @@ -116706,8 +116808,8 @@ self: { ({ mkDerivation, base, criterion, hedgehog }: mkDerivation { pname = "grab"; - version = "0.0.0.7"; - sha256 = "14r5asraz28apc7fhyf36ai1i6ndgf29c32ln5nk88s6z1fnlhvk"; + version = "0.0.0.8"; + sha256 = "0g3b79q985r6r6dfd97x1fhdj8fh35qnz9b34b78982qg60pl6y6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hedgehog ]; benchmarkHaskellDepends = [ base criterion ]; @@ -116719,8 +116821,8 @@ self: { ({ mkDerivation, base, containers, grab, hedgehog, text }: mkDerivation { pname = "grab-form"; - version = "0.0.0.7"; - sha256 = "0hqj0b6lv3qs5cs4rhsmk3prd25x8v6m04ilab8jck3c01lfksfm"; + version = "0.0.0.8"; + sha256 = "0q1lx6lybariwhnlbg49m683jppn6da5q8h3xmg795m420x1dk5a"; libraryHaskellDepends = [ base containers grab text ]; testHaskellDepends = [ base containers grab hedgehog text ]; description = "Applicative parsers for form parameter lists"; @@ -129382,8 +129484,8 @@ self: { }: mkDerivation { pname = "haspara"; - version = "0.0.0.3"; - sha256 = "1gfrqabmnv4fqfq9w03s6aj1rg5ba54nfrjcmbg9msy7sclsrx5i"; + version = "0.0.0.4"; + sha256 = "0jl6ncf16lc4h9w6w8n59b3z58h5g4ddcmjm5ml2pd1qgp5ncilh"; libraryHaskellDepends = [ aeson base containers exceptions hashable megaparsec mtl refined safe-decimal scientific template-haskell text time @@ -129448,6 +129550,33 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_5_0_4" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, text + , text-builder, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.5.0.4"; + sha256 = "01jfjx9l10f28w395r1990r6l5i15bw1333d968m2qgnx5l04vw3"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-strict-builder contravariant + dlist hashable hashtables mtl postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + contravariant-extras QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -129597,8 +129726,8 @@ self: { }: mkDerivation { pname = "hasql-implicits"; - version = "0.1.0.3"; - sha256 = "0xw7yy146adc805cr95ijm06ynmzinidngy16vgcfaqph0zx1ks2"; + version = "0.1.0.4"; + sha256 = "1ls8ximzpgr3p4301xgxjfl17dff4ljpxwps205nblh1d7bkda6a"; libraryHaskellDepends = [ aeson base bytestring containers hasql network-ip scientific text time uuid vector @@ -129985,6 +130114,25 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-th_0_4_0_15" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant, foldl + , hasql, postgresql-syntax, template-haskell + , template-haskell-compat-v0208, text, uuid, vector + }: + mkDerivation { + pname = "hasql-th"; + version = "0.4.0.15"; + sha256 = "0h8cg8w16hn315hwdgamik9vwqslpgrbrhsd109w0lrv5l27xywz"; + libraryHaskellDepends = [ + base bytestring containers contravariant foldl hasql + postgresql-syntax template-haskell template-haskell-compat-v0208 + text uuid vector + ]; + description = "Template Haskell utilities for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-transaction" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, hasql, mtl, rerebase @@ -132480,13 +132628,13 @@ self: { }: mkDerivation { pname = "hedgehog-golden"; - version = "1.0.0"; - sha256 = "17ja3ch042kvk0fpd1gd9nnj9x5jbl37vxn579hr9rimwgf99az7"; + version = "1.0.1"; + sha256 = "1pjzpsn0dq07dnvf6nixz0jghskwkngjhki2hqc4bnw2ha5h3fdl"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring containers Diff directory extra hedgehog text ]; - testHaskellDepends = [ base hedgehog ]; + testHaskellDepends = [ aeson base hedgehog ]; description = "Golden testing capabilities for hedgehog using Aeson"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -133405,8 +133553,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.5"; - sha256 = "121s8x61ya4p921zs38r4grqvpi4jkhinlys394hajlqniz7mh6h"; + version = "0.9.6"; + sha256 = "1viy6h0jslhr5ln06g1yqmgqjr36yl6014v8m2fzlnszga761v6y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -133550,8 +133698,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.3.1"; - sha256 = "1653riw0r3l2lyx69346h19cbrxqw12bmzbpnjmmdkcr9h3g36k6"; + version = "0.3.2"; + sha256 = "1lr7ai19zq55y1ib7133llajpx4n041xv6gv797d1ibk03qj69gc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133590,8 +133738,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.2.0"; - sha256 = "03zqj51ch9n49p13554mischjv3vz02dlbnswz714bz78rxw7lbv"; + version = "0.3.3.0"; + sha256 = "03c579y14cnynnrgfj2p41q65aplhr5ayc8i38yzvm96i5d6w6yq"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ @@ -133620,8 +133768,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.2.0"; - sha256 = "1s4vwjsk7sj7627yaq9i1c3ghxk83gdhhvf50p6fl93mji5513k3"; + version = "0.3.3.0"; + sha256 = "0h4igygjmi8z9dyfidizs04f9yhnibdba523h8996lf7s2dxb6g9"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -135604,8 +135752,8 @@ self: { pname = "hiedb"; version = "0.4.1.0"; sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i"; - revision = "1"; - editedCabalFile = "1ayy7xjbwfbdln1bqk9lpv2afc8kbzxyz9858gfafdd08kx0xmw1"; + revision = "2"; + editedCabalFile = "1mlsjdd41a89znafqssafwghlvk6bkijk5qkbgrm61h1h7flir2j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146121,7 +146269,7 @@ self: { license = lib.licenses.mit; }) {}; - "hslua_2_2_0" = callPackage + "hslua_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-aeson, hslua-classes, hslua-core, hslua-marshalling , hslua-objectorientation, hslua-packaging, lua, lua-arbitrary, mtl @@ -146130,10 +146278,8 @@ self: { }: mkDerivation { pname = "hslua"; - version = "2.2.0"; - sha256 = "1krx9ay31q2rvnjncyirw77h7ljg20qqcix2zin81ws6wy4lwirq"; - revision = "1"; - editedCabalFile = "08zpky44l0hnk8l4xbasv47mn3043i7bn510jnrcldgj99zsaii1"; + version = "2.2.1"; + sha256 = "1q587cjwb29jsf71hhmra6djr2sycbx2hr0rhwlgvb8ax699vkv3"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-aeson hslua-classes hslua-core hslua-marshalling hslua-objectorientation @@ -146264,15 +146410,15 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-core_2_2_0" = callPackage + "hslua-core_2_2_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, lua, lua-arbitrary , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua-core"; - version = "2.2.0"; - sha256 = "1nwh0alhnwgg4rzl113nlh8bkkq89dk9d9vl0iihipj9s2mk84bh"; + version = "2.2.1"; + sha256 = "0hy3a7rn940bcj0shxyk75dndwl23wwmmvbnwnay36py60hy3rbq"; libraryHaskellDepends = [ base bytestring exceptions lua mtl text ]; @@ -146323,17 +146469,15 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-marshalling_2_2_0" = callPackage + "hslua-marshalling_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, hslua-core , lua-arbitrary, mtl, QuickCheck, quickcheck-instances, tasty , tasty-hslua, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua-marshalling"; - version = "2.2.0"; - sha256 = "0mwj7zqzgzijlx40amwzs4jbldd0vbjqv3x791kdxip3yyvnlyqi"; - revision = "1"; - editedCabalFile = "1k9f13rjivvg18a6l5pcmd844s0yxgg1cl6g4hk05g4bngibnhkh"; + version = "2.2.1"; + sha256 = "1xmix1frfcyv4p51rnshrg02gba7di7nrrc6chsq71d3mbwhyask"; libraryHaskellDepends = [ base bytestring containers hslua-core mtl text ]; @@ -146462,7 +146606,7 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-objectorientation_2_2_0_1" = callPackage + "hslua-objectorientation_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-core, hslua-marshalling, lua-arbitrary, mtl, QuickCheck , quickcheck-instances, tasty, tasty-hslua, tasty-hunit @@ -146470,8 +146614,8 @@ self: { }: mkDerivation { pname = "hslua-objectorientation"; - version = "2.2.0.1"; - sha256 = "04fm0d3rvb06k7b7jka2prlhnh7dl2j2410jdl5pbbnfkwbaw1q7"; + version = "2.2.1"; + sha256 = "13011yzz6lrgl2gasn9w5ggdqgrdz49hhqk1h259qd9gq29jnq3y"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-core hslua-marshalling mtl text @@ -146507,15 +146651,15 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-packaging_2_2_0_1" = callPackage + "hslua-packaging_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, hslua-core , hslua-marshalling, hslua-objectorientation, mtl, tasty , tasty-hslua, tasty-hunit, text }: mkDerivation { pname = "hslua-packaging"; - version = "2.2.0.1"; - sha256 = "0kyc50xrfnxnhhx2xic1ajd0p0dkhlv0w88yykl4fncpb0i2wc25"; + version = "2.2.1"; + sha256 = "1yxfrsxmmsb96lyfihlk9ks53l2z2aln3whfqaha7grs3gx1yaib"; libraryHaskellDepends = [ base containers hslua-core hslua-marshalling hslua-objectorientation mtl text @@ -149716,6 +149860,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "http-client-brread-timeout" = callPackage + ({ mkDerivation, base, bytestring, http-client }: + mkDerivation { + pname = "http-client-brread-timeout"; + version = "0.1.0.1"; + sha256 = "04p98qkii1g6mk3cjra6ij73ks6qv0r2p7naq9j1rwvr9m7n1d4p"; + libraryHaskellDepends = [ base bytestring http-client ]; + description = "Http client with time-limited brRead"; + license = lib.licenses.mit; + }) {}; + "http-client-conduit" = callPackage ({ mkDerivation, base, http-client }: mkDerivation { @@ -150059,26 +150214,6 @@ self: { }) {}; "http-directory" = callPackage - ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client - , http-client-tls, http-conduit, http-date, http-types, network-uri - , text, time, xml-conduit - }: - mkDerivation { - pname = "http-directory"; - version = "0.1.9"; - sha256 = "0hvrajwap7ilqi6ika0vd3hf83k1p3wr3ck6bvz8kayim8ih7apz"; - libraryHaskellDepends = [ - base bytestring html-conduit http-client http-client-tls - http-conduit http-date http-types network-uri text time xml-conduit - ]; - testHaskellDepends = [ base hspec text ]; - description = "http directory listing library"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "http-directory_0_1_10" = callPackage ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client , http-client-tls, http-conduit, http-date, http-types, network-uri , text, time, xml-conduit @@ -151713,25 +151848,6 @@ self: { }) {}; "hvega" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , filepath, tasty, tasty-golden, text, unordered-containers - }: - mkDerivation { - pname = "hvega"; - version = "0.12.0.2"; - sha256 = "0m78j7w7sf09yvvs995pvk66ifli7q1bl7r739mgm9dgxaw7wqhm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ aeson base text unordered-containers ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring containers filepath tasty - tasty-golden text unordered-containers - ]; - description = "Create Vega-Lite visualizations (version 4) in Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "hvega_0_12_0_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers }: @@ -151748,7 +151864,6 @@ self: { ]; description = "Create Vega-Lite visualizations (version 4) in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hvega-theme" = callPackage @@ -153632,6 +153747,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "hybrid-vectors_0_2_3" = callPackage + ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: + mkDerivation { + pname = "hybrid-vectors"; + version = "0.2.3"; + sha256 = "0g3z482sd0j930ja3g9cyc4xnjby03d4cq8x56crsl61arr81r1c"; + libraryHaskellDepends = [ + base deepseq primitive semigroups vector + ]; + description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hydra-hs" = callPackage ({ mkDerivation, base, hmatrix, sixense_x64 }: mkDerivation { @@ -154087,6 +154216,8 @@ self: { pname = "hyperloglog"; version = "0.4.6"; sha256 = "0zwg4dhgasa9sx7pbjjjb9kz2bnhb3r2daij2b572cszv65l91nv"; + revision = "1"; + editedCabalFile = "1vpzs2sj0p4y0dy88fvb0imfks84655ilw1n56dpkfz3kn4dqaq8"; libraryHaskellDepends = [ approximate base binary bits bytes bytestring cereal cereal-vector comonad cpu deepseq distributive hashable lens reflection @@ -155484,17 +155615,6 @@ self: { }) {}; "ihaskell-hvega" = callPackage - ({ mkDerivation, aeson, base, hvega, ihaskell, text }: - mkDerivation { - pname = "ihaskell-hvega"; - version = "0.5.0.2"; - sha256 = "0r0q4hfjcm2p229k2xwyh9xrxbm6i3vpy13rjpsv4x5n30rsv56s"; - libraryHaskellDepends = [ aeson base hvega ihaskell text ]; - description = "IHaskell display instance for hvega types"; - license = lib.licenses.bsd3; - }) {}; - - "ihaskell-hvega_0_5_0_3" = callPackage ({ mkDerivation, aeson, base, hvega, ihaskell, text }: mkDerivation { pname = "ihaskell-hvega"; @@ -155503,7 +155623,6 @@ self: { libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ihaskell-inline-r" = callPackage @@ -156995,6 +157114,8 @@ self: { pname = "indexed-traversable-instances"; version = "0.1.1"; sha256 = "0i4s8fbqbgvkd2na48zwhlrcjpwxkx5rdh6f9fq2h4sl7c1d23hh"; + revision = "1"; + editedCabalFile = "1655cf712kkjrpf0axwgdf7y6yjqnf2njyijlfr3mdzzy6dkagwb"; libraryHaskellDepends = [ base indexed-traversable OneTuple tagged unordered-containers vector @@ -159003,6 +159124,8 @@ self: { pname = "invert"; version = "1.0.0.2"; sha256 = "13zl9i6g7ygkm3pgm7b72815cfp66mykxzp5vwy5kqakr8c3w1fp"; + revision = "1"; + editedCabalFile = "01qaybywd30b5s3clvw4bblq9pviwckgc2claf7lvl4fq6hjqszs"; libraryHaskellDepends = [ base containers generic-deriving hashable unordered-containers vector @@ -160429,6 +160552,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "isomorphism-class" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, primitive + , QuickCheck, quickcheck-instances, rebase, tasty, tasty-hunit + , tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "isomorphism-class"; + version = "0.1.0.1"; + sha256 = "1iynpy0mz1y569p8im3x9a48z73r7mz191dy0cm9x878r79hbplz"; + libraryHaskellDepends = [ + base bytestring containers hashable primitive text + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers hashable primitive QuickCheck + quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck text + unordered-containers vector + ]; + description = "Isomorphism typeclass solving the conversion problem"; + license = lib.licenses.mit; + }) {}; + "isotope" = callPackage ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck , template-haskell, th-lift @@ -163060,10 +163205,8 @@ self: { }: mkDerivation { pname = "json-directory"; - version = "0.1.0.1"; - sha256 = "145z46hh3ba3g7niwv9kf5djfv3xa1q5fmwadi629h7grfij0rr3"; - revision = "2"; - editedCabalFile = "0rid8i7chq7ca81m6kyhd0dl3ig8k24fk7mq5ydnhgdfnd25v78g"; + version = "0.1.0.2"; + sha256 = "12fwzazj88hd6a6fgr2rf1m276j2zsxs5fwczkyhak892c2w3hx6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163140,8 +163283,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "2.0.0.2"; - sha256 = "075385gvk01r6iw5v7d019y9fa9xng4nx574qjxrxp3nci9gv4rq"; + version = "2.0.0.3"; + sha256 = "0hil16m7higmcvjgdjmrq9r1cdwq13jyp9fz7hm83j1hra2z4i5j"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -165582,18 +165725,6 @@ self: { }) {}; "keep-alive" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "keep-alive"; - version = "0.2.0.0"; - sha256 = "1hkmm1933y6dlzr88p75kkl6qiw5jnb1f4klfbwbl2d3jx8fg92k"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "TCP keep alive implementation"; - license = lib.licenses.bsd3; - }) {}; - - "keep-alive_0_2_1_0" = callPackage ({ mkDerivation, base, network }: mkDerivation { pname = "keep-alive"; @@ -165603,7 +165734,6 @@ self: { testHaskellDepends = [ base network ]; description = "TCP keep alive implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "keera-callbacks" = callPackage @@ -171208,8 +171338,8 @@ self: { }: mkDerivation { pname = "ldap-scim-bridge"; - version = "0.7"; - sha256 = "1vy8ccdjp4s8pbv1jckd53c07gzykzjacdk104bcvfj8pv09k7cq"; + version = "0.8"; + sha256 = "04klp9n61q63bvpcn7i12q35dfm6r3mivjpw8708pxqq1mkd2qf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171854,6 +171984,8 @@ self: { pname = "lens"; version = "5.1.1"; sha256 = "08mkm2mjvhmwg9hc4kd4cd6dgmcszs1p2mzp1nmri7lqbpy9jknc"; + revision = "1"; + editedCabalFile = "19z3k7ikpfa96b86yabxghfqpnq9d0ayy4gdlvci3ycvws0s8cy6"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -171933,8 +172065,8 @@ self: { pname = "lens-aeson"; version = "1.2.1"; sha256 = "08x0vbkay8d6s24fzy2iria0hl9pmq891cnzm6zl0j9j53z9jw9l"; - revision = "2"; - editedCabalFile = "0pbnfpr8l1nbskh7sn40jazrfmbzsnw8xgw2iyk7dnqwfl6vzirs"; + revision = "3"; + editedCabalFile = "0lqpl5fhl94fm3xcwf8ssz7yg9nyfxp9bw2z959x7hg6bcqmv9p1"; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text text-short unordered-containers vector @@ -172544,18 +172676,19 @@ self: { }) {inherit (pkgs) leveldb;}; "levenshtein" = callPackage - ({ mkDerivation, base, binary, data-default, deepseq, hashable - , hspec, hspec-discover, QuickCheck + ({ mkDerivation, base, binary, criterion, data-default-class + , deepseq, hashable, hspec, hspec-discover, QuickCheck }: mkDerivation { pname = "levenshtein"; - version = "0.1.3.0"; - sha256 = "1h9xygy65npn2a5pgngqzm39k9ms3krzn1in9h0adln6aq2kcgdx"; + version = "0.2.0.0"; + sha256 = "0q0q19xjp37gl3xadfm1i70q5dwyh1b3699rf0b3rb6zb13py839"; libraryHaskellDepends = [ - base binary data-default deepseq hashable QuickCheck + base binary data-default-class deepseq hashable QuickCheck ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base data-default-class hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Calculate the edit distance between two foldables"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -174611,6 +174744,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "linear_1_21_10" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, indexed-traversable, lens, random, reflection + , semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.21.10"; + sha256 = "1d3s1p4imkifn7dccqci2qiwcg99x22kf250hzh4fh4xghi361xr"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable indexed-traversable lens + random reflection semigroupoids semigroups tagged template-haskell + transformers transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq HUnit reflection simple-reflect + test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -177579,6 +177740,8 @@ self: { pname = "log-domain"; version = "0.13.2"; sha256 = "0i4fx9k8cwjvmj0pgfnbici1b68zmif1jmmqxplpjqy32ksnyifa"; + revision = "1"; + editedCabalFile = "0nbfbp7a6x3vppavra7pf28l2wwlci3qgps60igqgjkbdcvq7w8c"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable semigroupoids semigroups vector @@ -179046,6 +179209,38 @@ self: { license = lib.licenses.mit; }) {}; + "lsp_1_5_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , co-log-core, containers, data-default, directory, exceptions + , filepath, hashable, hspec, hspec-discover, lens, lsp-types, mtl + , network-uri, prettyprinter, QuickCheck, quickcheck-instances + , random, scientific, sorted-list, stm, temporary, text, text-rope + , time, transformers, unliftio-core, unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "1.5.0.0"; + sha256 = "0cqrdsq4w4nwhzpxadxa5mvh3cn1zy9wjsq7ib38r6b09zxzi3i7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring co-log-core containers + data-default directory exceptions filepath hashable lens lsp-types + mtl network-uri prettyprinter random scientific sorted-list stm + temporary text text-rope time transformers unliftio-core + unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base containers filepath hspec lens network-uri QuickCheck + quickcheck-instances sorted-list text text-rope + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-test" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -179075,6 +179270,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "lsp-test_0_14_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, co-log-core, conduit, conduit-parse, containers + , data-default, Diff, directory, extra, filepath, Glob, hspec, lens + , lsp, lsp-types, mtl, parser-combinators, process, some, text + , time, transformers, unix, unliftio, unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.14.0.3"; + sha256 = "110hkf91033m1vg90mj7ifq5214r4a2qwswkgb0ahj4sd8c0hsa7"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring co-log-core + conduit conduit-parse containers data-default Diff directory + filepath Glob lens lsp lsp-types mtl parser-combinators process + some text time transformers unix unordered-containers + ]; + testHaskellDepends = [ + aeson base co-log-core data-default directory filepath hspec lens + lsp mtl parser-combinators process text unliftio + unordered-containers + ]; + testToolDepends = [ lsp ]; + benchmarkHaskellDepends = [ base extra lsp process ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, Diff, directory, dlist, filepath, hashable @@ -179096,6 +179320,26 @@ self: { license = lib.licenses.mit; }) {}; + "lsp-types_1_5_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, containers, data-default + , deepseq, Diff, dlist, filepath, hashable, lens, mod, mtl + , network-uri, scientific, some, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "lsp-types"; + version = "1.5.0.0"; + sha256 = "18hbhwd0cl32dbw88wskpxkqvnkym0rvjm46mcpnz3nxa1rdbn0m"; + libraryHaskellDepends = [ + aeson base binary containers data-default deepseq Diff dlist + filepath hashable lens mod mtl network-uri scientific some + template-haskell text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -179257,12 +179501,12 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "lua_2_2_0" = callPackage + "lua_2_2_1" = callPackage ({ mkDerivation, base, lua5_4, tasty, tasty-hunit }: mkDerivation { pname = "lua"; - version = "2.2.0"; - sha256 = "1258i5a3b16lbkgfdzgibqx3q4csd5wvk2gzqp96kkjcndfva92d"; + version = "2.2.1"; + sha256 = "07wni3ji46ndqabwffgwzij2jk34dq2d66z15hcd6jg33sqnym45"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ lua5_4 ]; @@ -184236,19 +184480,19 @@ self: { "melf" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , exceptions, filepath, mtl, optparse-applicative, prettyprinter - , singletons, tasty, tasty-golden, tasty-hunit, template-haskell - , unix + , singletons, singletons-base, singletons-th, tasty, tasty-golden + , tasty-hunit, template-haskell, unix }: mkDerivation { pname = "melf"; - version = "1.0.2"; - sha256 = "065nsazfsh8f6j2g80c2wppq5zm502ngwbn3lyzg2y42im4cdycx"; + version = "1.1.0"; + sha256 = "0d8rc67yirdj03i1gdcyip51q3qbzfghfblwqzdm85hlhp7vidic"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring exceptions mtl prettyprinter singletons - template-haskell + singletons-base singletons-th template-haskell ]; executableHaskellDepends = [ base binary bytestring exceptions optparse-applicative @@ -184256,7 +184500,8 @@ self: { ]; testHaskellDepends = [ base binary bytestring containers directory exceptions filepath mtl - prettyprinter singletons tasty tasty-golden tasty-hunit unix + prettyprinter singletons singletons-th tasty tasty-golden + tasty-hunit unix ]; description = "An Elf parser"; license = lib.licenses.bsd3; @@ -184875,15 +185120,15 @@ self: { }) {}; "mergeful" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, mtl, text, time - , validity, validity-containers, validity-time + ({ mkDerivation, aeson, autodocodec, base, containers, deepseq, mtl + , text, time, validity, validity-containers, validity-time }: mkDerivation { pname = "mergeful"; - version = "0.2.0.0"; - sha256 = "0cvx0qs4j7jbamz5dz23dii7car8dq5wz0qvkbckb3ymbrf16ywa"; + version = "0.3.0.0"; + sha256 = "1w7ccngqcgvwysw1zbdm0qr6hscqc3dnza9n1cp6xfdb80qjqynn"; libraryHaskellDepends = [ - aeson base containers deepseq mtl text time validity + aeson autodocodec base containers deepseq mtl text time validity validity-containers validity-time ]; license = lib.licenses.mit; @@ -184930,6 +185175,22 @@ self: { license = lib.licenses.mit; }) {}; + "mergeless_0_4_0_0" = callPackage + ({ mkDerivation, aeson, autodocodec, base, containers, deepseq, mtl + , text, validity, validity-containers + }: + mkDerivation { + pname = "mergeless"; + version = "0.4.0.0"; + sha256 = "0iy4l51kqldgm9wv60g524q67rag9rswapxrymrfy89cshyc5hib"; + libraryHaskellDepends = [ + aeson autodocodec base containers deepseq mtl text validity + validity-containers + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "mergeless-persistent" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , genvalidity-mergeless, genvalidity-persistent, hspec, mergeless @@ -185976,8 +186237,8 @@ self: { pname = "microstache"; version = "1.0.2.1"; sha256 = "12i2sx2rv2ai77m95gvfm93jcjk6q5i4cgfyxjrhyx3ll94z775v"; - revision = "1"; - editedCabalFile = "1qxhznrd20d9c2ji4vvddkpc9zbxamlabf3p4yyzm75ivh374lmf"; + revision = "2"; + editedCabalFile = "0vjqffb0960kc4k32lgbsjl1mwah129m3ci6lyqyw7slqripw5fp"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -189113,8 +189374,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.2.0.2"; - sha256 = "1kk8wfcj0jrjb563n59x9naz4h6f75j1gax4zki7vm8xs5289ry0"; + version = "0.3.0.1"; + sha256 = "1bfz5z836m9fn7sd6r5mlgsnavb8ih0d3x9nm0m3zlx654llvpmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199496,8 +199757,8 @@ self: { }: mkDerivation { pname = "nix-deploy"; - version = "1.0.5"; - sha256 = "0jsrmslai8xn1nkijg1196gkn10dagqgm8p39r7jsfaa4jvwm040"; + version = "1.0.6"; + sha256 = "119zfpcn0iil56z3bv2hwiy6pn6546pq3nvaa9cbhxvld0ax76wc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203654,6 +203915,8 @@ self: { pname = "opaleye"; version = "0.9.2.0"; sha256 = "0zvms42pmsg6ish76mvk0ksz4apxvs4iyjfvgkm7zwadq3i9v8l3"; + revision = "1"; + editedCabalFile = "006pp9l4j2vc2h6597vml424834xv1j4krfb3xjyaxhnq32hzcjr"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -206071,19 +206334,19 @@ self: { }) {}; "ordinal" = callPackage - ({ mkDerivation, base, containers, data-default, hspec - , hspec-discover, QuickCheck, regex, template-haskell, text, time - , vector + ({ mkDerivation, base, containers, data-default-class, deepseq + , hspec, hspec-discover, QuickCheck, regex, template-haskell, text + , time, vector }: mkDerivation { pname = "ordinal"; - version = "0.4.0.6"; - sha256 = "0zpqhyn8f2iphgz2746fxsjk817ly8q6s4dz6129jrrd25v3kdc7"; + version = "0.5.0.0"; + sha256 = "016ydmanbxpj8jngqv19wf2v8c12s51lf3x3ddyb1706fh7nqcrw"; libraryHaskellDepends = [ - base containers data-default QuickCheck regex template-haskell text - time vector + base containers data-default-class deepseq QuickCheck regex + template-haskell text time vector ]; - testHaskellDepends = [ base hspec QuickCheck text ]; + testHaskellDepends = [ base hspec QuickCheck text time ]; testToolDepends = [ hspec-discover ]; description = "Convert numbers to words in different languages"; license = lib.licenses.bsd3; @@ -206468,8 +206731,8 @@ self: { }: mkDerivation { pname = "ory-hydra-client"; - version = "1.10"; - sha256 = "0ciyyd1925z2wnd6w57f993dva519cm1wgcs39kiw20n2bpb2myi"; + version = "1.10.1"; + sha256 = "1hs0r7f9b5kzcxs7m83ynnd36fk12j0jlhr0zngz8hlbcgkzwv9v"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -206481,7 +206744,7 @@ self: { aeson base bytestring containers hspec iso8601-time mtl QuickCheck semigroups text time transformers unordered-containers vector ]; - description = "Auto-generated ory-hydra-client API Client"; + description = "Auto-generated ory-hydra API Client"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -212335,25 +212598,6 @@ self: { }) {}; "peregrin" = callPackage - ({ mkDerivation, base, bytestring, hspec, pg-harness-client - , postgresql-simple, resource-pool, text, transformers - }: - mkDerivation { - pname = "peregrin"; - version = "0.3.2"; - sha256 = "12p17fznvrn9hhcwr7hpsii4syq5vhyww8lp7nrsyn966q8dd8xa"; - libraryHaskellDepends = [ base bytestring postgresql-simple text ]; - testHaskellDepends = [ - base hspec pg-harness-client postgresql-simple resource-pool text - transformers - ]; - description = "Database migration support for use in other libraries"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "peregrin_0_3_3" = callPackage ({ mkDerivation, base, bytestring, hspec, pg-harness-client , postgresql-simple, resource-pool, text, transformers }: @@ -220794,6 +221038,34 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_12_4_4" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances + , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.4.4"; + sha256 = "03lh7ply77849xwpxh6k2hz20xl9cmvyx8yq03wqywvh7snd1ss3"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -221182,8 +221454,8 @@ self: { pname = "postgresql-simple"; version = "0.6.4"; sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; - revision = "7"; - editedCabalFile = "056q0jpnb4fz5djzngjy2xbbqijrhjg90mr7mphjxb8clzc2xl1w"; + revision = "8"; + editedCabalFile = "1qavb3qs1g307pc19k9y3yvqp0c1srwsplijvayn9ldp0bxdy6q8"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -222088,6 +222360,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "pqueue_1_4_2_0" = callPackage + ({ mkDerivation, base, deepseq, random, tasty, tasty-bench + , tasty-quickcheck + }: + mkDerivation { + pname = "pqueue"; + version = "1.4.2.0"; + sha256 = "1b7a0gf00aaw02vz21s7g7mni3dlx34cvl88dgm96a9jrm1djqrw"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; + description = "Reliable, persistent, fast priority queues"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pqueue-mtl" = callPackage ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl , stateful-mtl, uvector @@ -223659,6 +223947,29 @@ self: { license = lib.licenses.mit; }) {}; + "primitive-extras_0_10_1_5" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.10.1.5"; + sha256 = "0xmigva8lss9h18q0a63mc9sridny40nyzkizr2vmgm5d9qniqjs"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + primitive-unlifted profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-foreign" = callPackage ({ mkDerivation, base, primitive, QuickCheck }: mkDerivation { @@ -225822,6 +226133,8 @@ self: { pname = "proto3-suite"; version = "0.5.0"; sha256 = "09y09y321jflxlrx13b9fm4v3f3k4j475wpp0bilmc4ygq9bxjcm"; + revision = "2"; + editedCabalFile = "0wd212sjjdvggav7a719pxh3q232bnyp6jlgdavhay4b5n4adzx8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -227580,27 +227893,6 @@ self: { }) {}; "pusher-http-haskell" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-client-tls - , http-types, memory, QuickCheck, text, time, unordered-containers - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "2.1.0.9"; - sha256 = "1ipx9xy5wf79pgkmy1669qh8v73ad6ncx7fhqqacmlmhvvphv9vs"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-client-tls http-types memory text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec QuickCheck text unordered-containers - ]; - description = "Haskell client library for the Pusher Channels HTTP API"; - license = lib.licenses.mit; - }) {}; - - "pusher-http-haskell_2_1_0_10" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-client-tls , http-types, memory, QuickCheck, text, time, unordered-containers @@ -227619,7 +227911,6 @@ self: { ]; description = "Haskell client library for the Pusher Channels HTTP API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -228824,6 +229115,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "quibble-core" = callPackage + ({ mkDerivation, base, bytestring, containers, hedgehog + , mono-traversable, optics-core, tasty, tasty-hedgehog, tasty-hunit + , text, text-conversions, time, uuid + }: + mkDerivation { + pname = "quibble-core"; + version = "0.0.0.1"; + sha256 = "1dzgha5c827x0gb9fhqa13rz0wkdn0wpxfw3sxnxq8g9rr8myb0g"; + libraryHaskellDepends = [ + base bytestring containers mono-traversable optics-core text + text-conversions time uuid + ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Convenient SQL query language for Haskell (but only for single tables)"; + license = lib.licenses.bsd3; + }) {}; + "quic" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, bytestring , containers, crypto-token, cryptonite, data-default-class, doctest @@ -229053,8 +229364,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.27"; sha256 = "10vb3rl1ma9x4qdych9vn8gj9kngkqs2b97f4s6s1a908ddxv4m5"; - revision = "1"; - editedCabalFile = "1b17ghhhrw9h625q08145pdpw72xmava73d3xb933slza5jms6nz"; + revision = "2"; + editedCabalFile = "13g7mf6brxxwp99n5a0pazjq4r3i5ckzq6kflcfaknzl1gxvmnhp"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple QuickCheck scientific splitmix @@ -231509,8 +231820,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "2.0.0.2"; - sha256 = "1z5wla26c11dvx0rymp1r5v62vwf8w71jymjlbvmiqh0dxlp4pf3"; + version = "2.0.0.3"; + sha256 = "1bgag2z55pmxnyng5nzplqcyd6zkqswhkaj4qmd7mnbsk5jqhf01"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types uuid @@ -231683,14 +231994,14 @@ self: { broken = true; }) {}; - "rattletrap_11_2_10" = callPackage + "rattletrap_11_2_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "11.2.10"; - sha256 = "1iy0nkqpnwhscs98b277q6ykk7mph5a5ah8gqf4dxz58q7lwk47z"; + version = "11.2.11"; + sha256 = "004lhyi5v34124990j1m8mhcb1inn6313lp4db9yd3p82c7k928n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232951,6 +233262,30 @@ self: { license = lib.licenses.mit; }) {}; + "rebase_1_16" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , contravariant, deepseq, dlist, either, groups, hashable + , invariant, mtl, profunctors, scientific, selective, semigroupoids + , stm, text, time, time-compat, transformers, unordered-containers + , uuid-types, vector, vector-instances, void + }: + mkDerivation { + pname = "rebase"; + version = "1.16"; + sha256 = "0r5dmkw1bb3fkc40gjdcswf7388c8w7lzvzh7wvf7vk4lhxjaxhd"; + revision = "1"; + editedCabalFile = "048h2ir37j09s0z7fb364p7smyhzq6h4705qklhvylak9242gz2n"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad containers contravariant deepseq + dlist either groups hashable invariant mtl profunctors scientific + selective semigroupoids stm text time time-compat transformers + unordered-containers uuid-types vector vector-instances void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -235042,6 +235377,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "regex_1_1_0_2" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring, containers + , hashable, regex-base, regex-pcre-builtin, regex-tdfa + , template-haskell, text, time, time-locale-compat, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "regex"; + version = "1.1.0.2"; + sha256 = "1nzyfkqmclmawmphvksvm9l64awqgnypic4xplc2s9sjcj4h814a"; + libraryHaskellDepends = [ + array base base-compat bytestring containers hashable regex-base + regex-pcre-builtin regex-tdfa template-haskell text time + time-locale-compat transformers unordered-containers utf8-string + ]; + description = "Toolkit for regex-base"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "regex-applicative" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , criterion, deepseq, filtrable, megaparsec, parsec, parsers @@ -235194,8 +235549,8 @@ self: { }: mkDerivation { pname = "regex-examples"; - version = "1.1.0.1"; - sha256 = "1x8611bnvzj8pcc2g934gif4m6sssi08rxyqamn1b2i28ixzfh0c"; + version = "1.1.0.2"; + sha256 = "1m0z6xjm26fh0zhbkv2ajy5vjb86hawbdn8q6qwd0sydrjy1879b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -235579,6 +235934,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "regex-with-pcre_1_1_0_2" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, regex + , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "regex-with-pcre"; + version = "1.1.0.2"; + sha256 = "00x90kj8xc9pnnzryx45rnvfh0psya6kc174y7zx43jgvbz29icy"; + libraryHaskellDepends = [ + base base-compat bytestring containers regex regex-base + regex-pcre-builtin regex-tdfa template-haskell text transformers + unordered-containers + ]; + description = "Toolkit for regex-base"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "regex-wrapper" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , regex-tdfa, string-conv, text @@ -235807,8 +236181,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.3.0.7"; - sha256 = "10fa8aw966py3hr6cnisiisf9578kp46kglrpa2q34hzz0q7sr7g"; + version = "0.3.0.8"; + sha256 = "1mz8ahbivaj8a9hsi5m8shwmdz5hqq2fw1m0z7m2kpinnj1p3pbf"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -237435,6 +237809,8 @@ self: { pname = "req"; version = "3.12.0"; sha256 = "1gwdqmqmj3acim5r8c4sjzcvr3hvlbcjwkrpcsvq95ckr1wmzpqp"; + revision = "1"; + editedCabalFile = "0f3d1y1ymgrdbf84p4pgpbsn5772vc5lrjmj7wgf7baqw03kq8wy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -241335,32 +241711,6 @@ self: { }) {}; "rpmbuild-order" = callPackage - ({ mkDerivation, base, case-insensitive, directory, extra, fgl - , filepath, graphviz, hspec, optparse-applicative, simple-cmd - , simple-cmd-args, unix - }: - mkDerivation { - pname = "rpmbuild-order"; - version = "0.4.7"; - sha256 = "10qwndr8hxvgy386jy4zxkjsw4cj79fr9rh6qivivx6y0q2d2jnr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base case-insensitive directory extra fgl filepath graphviz - simple-cmd - ]; - executableHaskellDepends = [ - base directory extra fgl optparse-applicative simple-cmd-args - ]; - testHaskellDepends = [ base extra hspec simple-cmd unix ]; - description = "Sort RPM packages in dependency order"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "rpmbuild-order"; - broken = true; - }) {}; - - "rpmbuild-order_0_4_8" = callPackage ({ mkDerivation, base, case-insensitive, directory, extra, fgl , filepath, graphviz, hspec, optparse-applicative, simple-cmd , simple-cmd-args, unix @@ -245736,16 +246086,14 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; - "sdl2_2_5_3_2" = callPackage + "sdl2_2_5_3_3" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh }: mkDerivation { pname = "sdl2"; - version = "2.5.3.2"; - sha256 = "06v3zdfashd8f2jhrl2gfgkp7ykjsc06yvw2l4n3sy1p9xxk9q2y"; - revision = "1"; - editedCabalFile = "1v0y88c86d0f9p0ymi9hcq5hlzdyglrvhj4sxv0bkpjkpqavn5l9"; + version = "2.5.3.3"; + sha256 = "1a0vdw7nhwhq9zz1wq1w8j9za02js55h92n2rj8zrbqxcr2091ma"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -246863,8 +247211,8 @@ self: { pname = "semialign"; version = "1.2.0.1"; sha256 = "0ci1jpp37p1lzyjxc1bljd6zgg407qmkl9s36b50qjxf85q6j06r"; - revision = "1"; - editedCabalFile = "00cmkdmgqlk8v2jg084nddlj2qkwj68nqk9p3l07kzwf796rn5qf"; + revision = "2"; + editedCabalFile = "0dm51m0qa1mbwk66wzidws1vvv6xy54swjg58nkjhw76yys2mcia"; libraryHaskellDepends = [ base containers hashable indexed-traversable indexed-traversable-instances semigroupoids tagged these @@ -252814,24 +253162,6 @@ self: { }) {}; "shellmet" = callPackage - ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text - }: - mkDerivation { - pname = "shellmet"; - version = "0.0.4.0"; - sha256 = "1nrva50knx3ca0m6f84f1yim4apj949fqqmmrxqmxhlixjzafl8v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base process text ]; - executableHaskellDepends = [ base text ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Out of the shell solution for scripting in Haskell"; - license = lib.licenses.mpl20; - mainProgram = "readme"; - }) {}; - - "shellmet_0_0_4_1" = callPackage ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text }: mkDerivation { @@ -252846,7 +253176,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Out of the shell solution for scripting in Haskell"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "readme"; }) {}; @@ -254103,6 +254432,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_7" = callPackage + ({ mkDerivation, base, directory, extra, filepath, hspec, process + , time, unix + }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.7"; + sha256 = "1pjkcww6s45s6w757cyxniis2w4ndg7vgz6gj3c1iwfh10ajk0q4"; + libraryHaskellDepends = [ + base directory extra filepath process time unix + ]; + testHaskellDepends = [ base hspec ]; + description = "Simple String-based process commands"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -255723,24 +256069,24 @@ self: { "sized" = callPackage ({ mkDerivation, base, constraints, containers, deepseq , equational-reasoning, ghc-typelits-knownnat - , ghc-typelits-presburger, hashable, hspec, inspection-testing - , lens, mono-traversable, subcategories, template-haskell, th-lift - , these, type-natural, vector + , ghc-typelits-presburger, hashable, inspection-testing, lens + , mono-traversable, subcategories, tasty, tasty-expected-failure + , tasty-inspection-testing, template-haskell, th-lift, these + , type-natural, vector }: mkDerivation { pname = "sized"; - version = "1.0.0.0"; - sha256 = "0f6ql0yk0qi2wkzifhhhfn5z3wzh10d57ak9wrb4dv8s6mx34yk7"; - revision = "3"; - editedCabalFile = "13v3dkfdnzg2y7pfkn2dnvczd9y40izlm30vcssn2a5b1v7vy3bz"; + version = "1.0.0.1"; + sha256 = "1ayj3fzr4l4l5wmkqnv4h4fxgivmjgamq3wdlpixlwy43wbmf3fy"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning ghc-typelits-knownnat ghc-typelits-presburger hashable lens mono-traversable subcategories these type-natural vector ]; testHaskellDepends = [ - base containers hspec inspection-testing mono-traversable - subcategories template-haskell th-lift type-natural vector + base containers inspection-testing mono-traversable subcategories + tasty tasty-expected-failure tasty-inspection-testing + template-haskell th-lift type-natural vector ]; description = "Sized sequence data-types"; license = lib.licenses.bsd3; @@ -261277,6 +261623,18 @@ self: { license = lib.licenses.isc; }) {}; + "splint_1_0_2_0" = callPackage + ({ mkDerivation, base, containers, ghc, hlint, stm }: + mkDerivation { + pname = "splint"; + version = "1.0.2.0"; + sha256 = "18n97b6437yql0sk55kns9mz2x2rgdfjw9ajpmm4adh5n5kc5cf6"; + libraryHaskellDepends = [ base containers ghc hlint stm ]; + description = "HLint as a GHC source plugin"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "split" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -267373,6 +267731,8 @@ self: { pname = "stripe-scotty"; version = "1.1.0.2"; sha256 = "123l1khqd0ilcihrij1givz4lg2jns2r2iyf90yjh7zdva1xf507"; + revision = "1"; + editedCabalFile = "0rr2vyw1vpa4psxqq2x9lsp67lgm0pylmnsnixm681qa6pykjnhr"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text @@ -267444,6 +267804,8 @@ self: { pname = "stripe-wreq"; version = "1.0.1.14"; sha256 = "01z0hqqnnc2g8q0bzj4brjmd9wmpjda4rlk770brvk9ip9mjdlys"; + revision = "1"; + editedCabalFile = "1knsmrj0m1xjf8z8hsjcci3h7bg5afzbnx5v6znffc5vzgnphc64"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text wreq ]; @@ -267491,8 +267853,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "6.0.0.2"; - sha256 = "02bw8qsfixjdlyzp1gpgrrj0qacw40rsw75858l0894lyq7x35hk"; + version = "6.0.0.3"; + sha256 = "1sj2s6cqcmyczbf09d2bzygd0gfgx0p16wgwcrmr9f9h84dk4bps"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -269372,8 +269734,8 @@ self: { }: mkDerivation { pname = "swagger2"; - version = "2.8.2"; - sha256 = "0vxqmc3wx01fx04cqq9l0gvcas7njsj6q2r960rb1gbmggydpysc"; + version = "2.8.4"; + sha256 = "11gpnh7dg6bqbvgwfw9xri3l08kvxply698arpz62ix38qyf14iv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat-batteries bytestring containers @@ -272496,6 +272858,28 @@ self: { broken = true; }) {}; + "takedouble" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , hedgehog, temporary, unix + }: + mkDerivation { + pname = "takedouble"; + version = "0.0.1.1"; + sha256 = "0b0m96grcjjk1hw9i13d9nfs8k7i68zl4jv5raqw8lxqvav5yd3j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory extra filepath unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory extra filepath hedgehog temporary unix + ]; + description = "duplicate file finder"; + license = lib.licenses.bsd3; + mainProgram = "takedouble"; + }) {}; + "takusen-oracle" = callPackage ({ mkDerivation, base, clntsh, mtl, old-time, time }: mkDerivation { @@ -276817,17 +277201,18 @@ self: { license = lib.licenses.mit; }) {}; - "text-builder-dev_0_3_2" = callPackage + "text-builder-dev_0_3_3" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds - , QuickCheck, quickcheck-instances, rerebase, split, tasty - , tasty-hunit, tasty-quickcheck, text, transformers + , isomorphism-class, QuickCheck, quickcheck-instances, rerebase + , split, tasty, tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "text-builder-dev"; - version = "0.3.2"; - sha256 = "0x77y8vrsxdrmx2d6y8wxw7qmdnxdjh4rzbs3lwmharxvrqdwnxs"; + version = "0.3.3"; + sha256 = "0h88yxj0w7ycpmzxyxnxkrz05dmi902dv9v8mxlx7nrr8idxss74"; libraryHaskellDepends = [ - base bytestring deferred-folds split text transformers + base bytestring deferred-folds isomorphism-class split text + transformers ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -277567,6 +277952,8 @@ self: { pname = "text-show-instances"; version = "3.9"; sha256 = "1bfangk4ys6pvhrv3j7i2c29xnhgin5lma2ndw051hnmmc7v2j7l"; + revision = "1"; + editedCabalFile = "1radrshv4flxlqsv36bz06pvw1l7nanqimfrx9rzspxcnldzv5q7"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -278065,8 +278452,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.1.0.0"; - sha256 = "03d5ddbxzfn60ysxxn17q7gzdlls8hvlsvhzai4mn0qfjpwi6ljx"; + version = "0.1.1.0"; + sha256 = "0579yxlcl3cfirjim31capk7q2raf9bmmfnvcxxnicjmvx22790q"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = lib.licenses.bsd3; @@ -282169,8 +282556,8 @@ self: { }: mkDerivation { pname = "tonatona-google-server-api"; - version = "0.2.0.0"; - sha256 = "01ilskcr8k219vijd3zkzy6lpzavqv36j3vxbx1hrms0hylnydah"; + version = "0.3.0.0"; + sha256 = "04bw1z2is1mr5mqllxrp1inagvnan95f4gckzyj3a87sv1x2qm8m"; libraryHaskellDepends = [ base google-server-api monad-logger persistent persistent-sqlite resource-pool servant-client tonalude tonaparser tonatona @@ -282449,8 +282836,8 @@ self: { pname = "topograph"; version = "1.0.0.1"; sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; - revision = "3"; - editedCabalFile = "144pbbmir77ql5qzf031mh2qs946c05h22iz3fm8xkzg1cgils0z"; + revision = "4"; + editedCabalFile = "05pkc4byw9xqz4048sdlk24h311kw41nr18f3vs1p1vssyy10g36"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -283943,8 +284330,8 @@ self: { pname = "tree-diff"; version = "0.2.1.1"; sha256 = "0p1pvbqgrwkxmv4b8xmw9mx6a1xpyl6j8ivg1qs65q5nd7xaxqvp"; - revision = "1"; - editedCabalFile = "0avc30hkfhh6sr2ch5d6xrndskj06az8h0b0zkrrnl89jgiw7c3x"; + revision = "2"; + editedCabalFile = "12smpqjg5ah2sr593d4glx8ib5yjj3wh1mhy6v4xy82xj27mhh11"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers deepseq hashable parsec parsers @@ -285564,7 +285951,7 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; - "turtle_1_6_0" = callPackage + "turtle_1_6_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, directory, doctest, exceptions, filepath, foldl , hostname, managed, optional-args, optparse-applicative, process @@ -285573,8 +285960,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.6.0"; - sha256 = "1g35l9c3zsimirlhknjma6pziiaxam51i6r0a4xfbr7cc8psflc5"; + version = "1.6.1"; + sha256 = "171viripwn8hg3afkkswr243bv7q0r0bz3mn0bflddm4jdf49597"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -286754,20 +287141,6 @@ self: { }) {}; "type-level-numbers" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "type-level-numbers"; - version = "0.1.1.1"; - sha256 = "12iiyaqi60fpds7fv1qvphy84rwyj71maq54mfwpcr0bdrgyymjv"; - revision = "1"; - editedCabalFile = "0nzam0mkawxaq793l5isrfnc3vg8s73lca5nig0y50kfmyk30sbc"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base template-haskell ]; - description = "Type level numbers implemented using type families"; - license = lib.licenses.bsd3; - }) {}; - - "type-level-numbers_0_1_1_2" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "type-level-numbers"; @@ -286777,7 +287150,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Type level numbers implemented using type families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "type-level-sets" = callPackage @@ -290480,21 +290852,6 @@ self: { }) {}; "unliftio-pool" = callPackage - ({ mkDerivation, base, resource-pool, time, transformers - , unliftio-core - }: - mkDerivation { - pname = "unliftio-pool"; - version = "0.2.1.1"; - sha256 = "0hxxngldp4zr55qv67gf62a87yxr1f0xfyh4gfzr45q62mscs8xv"; - libraryHaskellDepends = [ - base resource-pool time transformers unliftio-core - ]; - description = "Data.Pool generalized to MonadUnliftIO."; - license = lib.licenses.bsd3; - }) {}; - - "unliftio-pool_0_2_2_0" = callPackage ({ mkDerivation, base, resource-pool, time, transformers , unliftio-core }: @@ -290507,7 +290864,6 @@ self: { ]; description = "Data.Pool generalized to MonadUnliftIO."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unliftio-streams" = callPackage @@ -293774,6 +294130,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector_0_13_0_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, HUnit, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-inspection-testing, tasty-quickcheck, template-haskell + , transformers, vector-stream + }: + mkDerivation { + pname = "vector"; + version = "0.13.0.0"; + sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; + libraryHaskellDepends = [ base deepseq primitive vector-stream ]; + testHaskellDepends = [ + base base-orphans HUnit primitive QuickCheck random tasty + tasty-hunit tasty-inspection-testing tasty-quickcheck + template-haskell transformers + ]; + benchmarkHaskellDepends = [ base random tasty tasty-bench ]; + description = "Efficient Arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-algorithms" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random , primitive, QuickCheck, vector @@ -293782,8 +294160,8 @@ self: { pname = "vector-algorithms"; version = "0.8.0.4"; sha256 = "0fxg6w0vh5g2vzw4alajj9ywdijfn9nyx28hbckhmwwbfxb6l5vn"; - revision = "1"; - editedCabalFile = "10zjr2cdsaxb71z9svl7h2bxrxbhr19ckqy9p2mhkvhg7ar60ixz"; + revision = "2"; + editedCabalFile = "0i55aqh2kfswmzvkyls1vlzlg3gvh1ydhksx9w7circ8ffj6lrg0"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -293853,6 +294231,24 @@ self: { license = lib.licenses.mit; }) {}; + "vector-builder_0_3_8_4" = callPackage + ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-builder"; + version = "0.3.8.4"; + sha256 = "0gc2n5j1ca07hd50shy7l5xybs1y720zrarzs5dj74dsdcpvmjxw"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Vector builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-bytes-instances" = callPackage ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }: mkDerivation { @@ -293979,8 +294375,8 @@ self: { }: mkDerivation { pname = "vector-extras"; - version = "0.2.7"; - sha256 = "0ygxryrm2sylv2is1nxw9j8qb8hrald7j0smcbx079g8byvf5nj7"; + version = "0.2.7.1"; + sha256 = "1a8aak9v68qmrx719w782ww7accn7bk11gnca3d2lvbzw793dl4q"; libraryHaskellDepends = [ base containers deferred-folds foldl hashable unordered-containers vector @@ -294081,6 +294477,8 @@ self: { pname = "vector-instances"; version = "3.4"; sha256 = "10akvpa5w9bp0d8hflab63r9laa9gy2hv167smhjsdzq1kplc0hv"; + revision = "1"; + editedCabalFile = "177jllmcv0517vppc4lx0l0kvicgaf1h060lkcnv7fl0hnp16zf5"; libraryHaskellDepends = [ base comonad hashable keys pointed semigroupoids semigroups vector ]; @@ -294284,6 +294682,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-stream" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "vector-stream"; + version = "0.1.0.0"; + sha256 = "0v40vdpp35lhnnnx7q17fah0c14jrkjlnwsk0q4mbwb7ch7j3258"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Efficient Streams"; + license = lib.licenses.bsd3; + }) {}; + "vector-text" = callPackage ({ mkDerivation, base, binary, prologue, text, vector , vector-binary-instances @@ -296348,26 +296757,6 @@ self: { }) {}; "wai-feature-flags" = callPackage - ({ mkDerivation, aeson, base, bytestring, splitmix, text - , unordered-containers, wai, warp - }: - mkDerivation { - pname = "wai-feature-flags"; - version = "0.1.0.3"; - sha256 = "1w1n24w7wf3jxnlid437d4rva86vbhyvlrz8nq7z6bc3xi8bdlkz"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring splitmix text unordered-containers wai - ]; - executableHaskellDepends = [ base wai warp ]; - description = "Feature flag support for WAI applications"; - license = lib.licenses.bsd3; - mainProgram = "example-app"; - }) {}; - - "wai-feature-flags_0_1_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, splitmix, text , unordered-containers, wai, warp }: @@ -296384,7 +296773,6 @@ self: { executableHaskellDepends = [ base wai warp ]; description = "Feature flag support for WAI applications"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example-app"; }) {}; @@ -296488,6 +296876,8 @@ self: { pname = "wai-handler-hal"; version = "0.1.2.0"; sha256 = "05q0aig70yfrhq73q8i79y4kvjkb2hlrbgza5m9sz5g3i0w21l3y"; + revision = "1"; + editedCabalFile = "1gkj8yhwqv6rf5b38xjiniwwyfnz5krbx4nx5r98danipjpr1fan"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai @@ -299588,25 +299978,6 @@ self: { }) {}; "webgear-core" = callPackage - ({ mkDerivation, arrows, base, bytestring, case-insensitive - , filepath, http-api-data, http-media, http-types, jose, mime-types - , network, safe-exceptions, tagged, template-haskell, text - , unordered-containers, wai - }: - mkDerivation { - pname = "webgear-core"; - version = "1.0.1"; - sha256 = "06yg14x40j7jg5gy875f2g4fplnh08678qy3naqapd8ysvw52rmb"; - libraryHaskellDepends = [ - arrows base bytestring case-insensitive filepath http-api-data - http-media http-types jose mime-types network safe-exceptions - tagged template-haskell text unordered-containers wai - ]; - description = "Composable, type-safe library to build HTTP APIs"; - license = lib.licenses.mpl20; - }) {}; - - "webgear-core_1_0_2" = callPackage ({ mkDerivation, arrows, base, bytestring, case-insensitive , filepath, http-api-data, http-media, http-types, jose, mime-types , network, safe-exceptions, tagged, template-haskell, text @@ -299623,26 +299994,9 @@ self: { ]; description = "Composable, type-safe library to build HTTP APIs"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webgear-openapi" = callPackage - ({ mkDerivation, arrows, base, http-media, http-types - , insert-ordered-containers, lens, openapi3, text, webgear-core - }: - mkDerivation { - pname = "webgear-openapi"; - version = "1.0.1"; - sha256 = "0fxj5bhsqxkjizyl0wcwbs5ai05lksf3cwzz2535lb4rh90ndx3b"; - libraryHaskellDepends = [ - arrows base http-media http-types insert-ordered-containers lens - openapi3 text webgear-core - ]; - description = "Composable, type-safe library to build HTTP API servers"; - license = lib.licenses.mpl20; - }) {}; - - "webgear-openapi_1_0_2" = callPackage ({ mkDerivation, arrows, base, http-media, http-types , insert-ordered-containers, lens, openapi3, text, webgear-core }: @@ -299656,35 +300010,9 @@ self: { ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webgear-server" = callPackage - ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring - , bytestring-conversion, http-api-data, http-media, http-types - , jose, monad-time, mtl, QuickCheck, quickcheck-instances, tasty - , tasty-hunit, tasty-quickcheck, text, unordered-containers, wai - , webgear-core - }: - mkDerivation { - pname = "webgear-server"; - version = "1.0.1"; - sha256 = "0v27iq4jqbxyn66pzi7sz0qapd4a0k1iifvj2ng488jl2j852xa2"; - libraryHaskellDepends = [ - aeson arrows base base64-bytestring bytestring - bytestring-conversion http-api-data http-media http-types jose - monad-time mtl text unordered-containers wai webgear-core - ]; - testHaskellDepends = [ - base base64-bytestring bytestring http-types QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text wai - webgear-core - ]; - description = "Composable, type-safe library to build HTTP API servers"; - license = lib.licenses.mpl20; - }) {}; - - "webgear-server_1_0_2" = callPackage ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring , bytestring-conversion, http-api-data, http-media, http-types , jose, monad-time, mtl, QuickCheck, quickcheck-instances, tasty @@ -299707,7 +300035,6 @@ self: { ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webidl" = callPackage @@ -301150,8 +301477,8 @@ self: { pname = "witherable"; version = "0.4.2"; sha256 = "0121ic4xkv3k568j23zp22a5lrv0k11h94fq7cbijd18fjr2n3br"; - revision = "2"; - editedCabalFile = "1ljnv5xf6w7x58akj0a0yw16j63jkka0dvfvmjqwbn76aqg3pzc1"; + revision = "3"; + editedCabalFile = "1f2bvl41by904lnr0dk6qgasqwadq2w48l7fj51bp2h8bqbkdjyc"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -306252,8 +306579,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.10"; - sha256 = "07pwdd6w6gh0x05925hfk5mhzmig6rh9yb87rkyx15197r9hj7xw"; + version = "0.1.0.11"; + sha256 = "1znca5my1z2pjgnw4x37lmh0lqipbg4xkw7lsijjn4ddhazwpd7x"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64-bytestring bytestring conduit containers foldl hashable From d531cd40af1f8385eb1f0c2384dc5a9e1ccb32db Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 30 May 2022 13:02:20 +0200 Subject: [PATCH 11/59] binaryen: run tests --- .../compilers/binaryen/default.nix | 31 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 5 ++- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index c70b02cc55a..9f417c5ef7a 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten }: +{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten, + gtest, lit, nodejs, filecheck +}: stdenv.mkDerivation rec { pname = "binaryen"; @@ -8,12 +10,35 @@ stdenv.mkDerivation rec { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "sha256-CcGxPBdUiNLfMjjJKFMdDvaIrHvf2M/gCub4JBw4+8c="; - fetchSubmodules = true; + sha256 = "sha256-KGrzAME2Gt4WFIcBJ4L6k4DtE+OtuH4KFbEMPe+f+pA="; }; nativeBuildInputs = [ cmake python3 ]; + preConfigure = '' + if [ $doCheck -eq 1 ]; then + sed -i '/googletest/d' third_party/CMakeLists.txt + else + cmakeFlagsArray=($cmakeFlagsArray -DBUILD_TESTS=0) + fi + ''; + + checkInputs = [ gtest lit nodejs filecheck ]; + checkPhase = '' + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py $tests + ''; + + tests = [ + "version" "wasm-opt" "wasm-dis" + "crash" "dylink" "ctor-eval" + "wasm-metadce" "wasm-reduce" "spec" + "lld" "wasm2js" "validator" + "example" "unit" + # "binaryenjs" "binaryenjs_wasm" # not building this + "lit" "gtest" + ]; + doCheck = stdenv.isLinux; + meta = with lib; { homepage = "https://github.com/WebAssembly/binaryen"; description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71b7a65423c..7578f6b0d4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12415,7 +12415,10 @@ with pkgs; bigloo = callPackage ../development/compilers/bigloo { }; - binaryen = callPackage ../development/compilers/binaryen { }; + binaryen = callPackage ../development/compilers/binaryen { + nodejs = nodejs-slim; + inherit (python3Packages) filecheck; + }; blueprint-compiler = callPackage ../development/compilers/blueprint { }; From 995b0ffd9c0040d98fe2a494fa6bc6060ae54411 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 22 Jun 2022 15:07:07 -0400 Subject: [PATCH 12/59] binaryen: 108 -> 109 --- pkgs/development/compilers/binaryen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 9f417c5ef7a..e526fd46546 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "108"; + version = "109"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "sha256-KGrzAME2Gt4WFIcBJ4L6k4DtE+OtuH4KFbEMPe+f+pA="; + sha256 = "sha256-HMPoiuTvYhTDaBUfSOfh/Dt4FdO9jGqUaFpi92pnscI="; }; nativeBuildInputs = [ cmake python3 ]; From 4df8e6fc952fd7fefb3e81e154bfd4f497073a29 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 22 Jun 2022 15:15:18 -0400 Subject: [PATCH 13/59] emscripten: 3.1.12 -> 3.1.14 --- pkgs/development/compilers/emscripten/default.nix | 12 +++--------- pkgs/development/compilers/emscripten/package.json | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 9424a850667..0a99fa170b7 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -3,12 +3,11 @@ , llvmPackages , symlinkJoin, makeWrapper, substituteAll , mkYarnModules -, fetchpatch }: stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.12"; + version = "3.1.14"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-lZ5U6e1UNd1Yvxp+k9eLsgwGXz/0WKisuhudUQf+pu0="; + sha256 = "sha256-CVFC278ibwUMib2F64Uc7FP+D1JPUJ/9/3w0wz1PWqg="; rev = version; }; @@ -39,11 +38,6 @@ stdenv.mkDerivation rec { src = ./0001-emulate-clang-sysroot-include-logic.patch; resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; }) - (fetchpatch { - # https://github.com/emscripten-core/emscripten/pull/16986 - url = "https://github.com/emscripten-core/emscripten/commit/d5ef6937fe395488e23a82c1e582a7ea5c2dab83.patch"; - sha256 = "sha256-YX5DG8i5x6S7XnU58etEapDd+o5SuzbFIGv8v/9+T3E="; - }) ]; buildPhase = '' @@ -98,7 +92,7 @@ stdenv.mkDerivation rec { # precompile libc (etc.) in all variants: pushd $TMPDIR - echo 'int main() { return 42; }' >test.c + echo 'int __main_argc_argv() { return 42; }' >test.c for LTO in -flto ""; do # wasm2c doesn't work with PIC $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json index 8f3e09b5cbd..dfd416c3b5a 100644 --- a/pkgs/development/compilers/emscripten/package.json +++ b/pkgs/development/compilers/emscripten/package.json @@ -1,6 +1,6 @@ { "name": "emscripten", - "version": "3.1.12", + "version": "3.1.14", "private": true, "devDependencies": { "es-check": "^6.2.1", From 511201ded50be0acf0e1038762caa333658b4503 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 24 Jun 2022 13:21:02 +0900 Subject: [PATCH 14/59] haskellPackages.hercules-ci-agent: remove no longer needed source override --- pkgs/development/haskell-modules/configuration-common.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c162e3feec3..f3396bd24a1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1662,11 +1662,7 @@ self: super: { # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; - hercules-ci-agent = - assert super.hercules-ci-agent.version == "0.9.5"; # >0.9.5: remove source override as sdist will be fixed - overrideSrc - { src = pkgs.fetchFromGitHub { owner = "hercules-ci"; repo = "hercules-ci-agent"; rev = "hercules-ci-agent-0.9.5"; sha256 = "sha256-7d8lf4g8CWHTzIOmma8UKvFIi1Og6RqPH9Lt+6iA4pw="; } + "/hercules-ci-agent"; } - (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent); + hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; # Test suite doesn't compile with aeson 2.0 # https://github.com/hercules-ci/hercules-ci-agent/pull/387 From 7d3e319949922fbb6d05aa3e53b9a1dd559e04dd Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 24 Jun 2022 11:58:33 +0200 Subject: [PATCH 15/59] haskellPackages.hls-floskell-plugin: Disable flaky test on arm --- pkgs/development/haskell-modules/configuration-arm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 38a176c3db3..c7bbe3c6137 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -112,6 +112,7 @@ self: super: { hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; hls-rename-plugin = dontCheck super.hls-rename-plugin; hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; + hls-floskell-plugin = dontCheck super.hls-floskell-plugin; } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { # AARCH32-SPECIFIC OVERRIDES From 0956fc22d8d732dd589a819b825e61c691e78a5d Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Fri, 24 Jun 2022 11:05:38 -0400 Subject: [PATCH 16/59] binaryen: backport patch for wasm2js --- pkgs/development/compilers/binaryen/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index e526fd46546..6aeaeac8a1e 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, cmake, python3, fetchFromGitHub, emscripten, - gtest, lit, nodejs, filecheck + gtest, lit, nodejs, filecheck, fetchpatch }: stdenv.mkDerivation rec { @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-HMPoiuTvYhTDaBUfSOfh/Dt4FdO9jGqUaFpi92pnscI="; }; + patches = [ + # https://github.com/WebAssembly/binaryen/pull/4321 + (fetchpatch { + url = "https://github.com/WebAssembly/binaryen/commit/93b8849d9f98ef7ed812938ff0b3219819c2be77.patch"; + sha256 = "sha256-Duan/B9A+occ5Lj2SbRX793xIfhzHbdYPI5PyTNCZoU="; + }) + ]; + nativeBuildInputs = [ cmake python3 ]; preConfigure = '' From f9771ac5baec358aa6fa5c8fae7301c2970bd622 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 00:32:09 +0000 Subject: [PATCH 17/59] allegro5: 5.2.7.0 -> 5.2.8.0 --- pkgs/development/libraries/allegro/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 859d46459cb..6bb1a70b865 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.7.0"; + version = "5.2.8.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0="; + sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; }; nativeBuildInputs = [ cmake ]; From d4c725fee854864534aa4e2593e28bf1405d2991 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Jun 2022 04:20:00 +0000 Subject: [PATCH 18/59] actionlint: 1.6.13 -> 1.6.14 https://github.com/rhysd/actionlint/releases/tag/v1.6.14 --- pkgs/development/tools/analysis/actionlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 9e94fe79d35..b4d9dd9698d 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.13"; + version = "1.6.14"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-EZqWamNfv4+f1Ajm6StEdDLOwwWdJr1mrzd3+ba3YHI="; + sha256 = "sha256-eBIAm+mgjOLePxJ6b9d3cr3k0vqaDqLzorZg/ZplpcM="; }; - vendorSha256 = "sha256-fADaYrGtg4B7XqD2MUMw30xfGT70Hx+iue79AIDsSRc="; + vendorSha256 = "sha256-wKK597mk51jT6s1eKA4AjiCvI4IkZ9WjMXxaY8AWwkU="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; From 73d8f22fe7785f588a8300225a9113a75c4b5f2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 11:34:02 +0200 Subject: [PATCH 19/59] grype: 0.40.0 -> 0.40.1 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index e57ae69b187..47aa65264ff 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-Lpv4A8g/yfurma5NKQFWPy5vfuOyp/dSLf4pQCFOKLY="; + hash = "sha256-op0oNtHljAjEmWCjvWHk/jGf8De6IdX7Y0dfPl7dkN0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -26,7 +26,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-4dw7OPrBwpMTHY6MpAJ1p9sEauBw+k3aYmoa0ezn9Rw="; + vendorSha256 = "sha256-5huViLIs6SZoO0cAIf2sI20qlQUsFi+Rv68PvfbVgBw="; nativeBuildInputs = [ installShellFiles From 09746789bb5464558b53bf0ac42101ec1f592e75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 11:38:10 +0200 Subject: [PATCH 20/59] syft: 0.46.3 -> 0.49.0 --- pkgs/tools/admin/syft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 73c2553ba71..68951293639 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.46.3"; + version = "0.49.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4Yo9CIAVEOtAvsvGzSXerTwCbvylo7MjwJwWU6uJAX8="; + sha256 = "sha256-VsiQa3W/5eG5/U4sGRvYPa0MDYrayXIJtbutPnH/vUI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-K4bPldGOQVkmAavEbVxMjOhiHgfSrNpQ2ljFLqyceCw="; + vendorSha256 = "sha256-NENKogPlp6upMkRULnkkqMep9U7cI+CR+6TDF38T2vk="; nativeBuildInputs = [ installShellFiles ]; From cdd336866b707d57dcfbb625e248ccaea6345a64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 11:46:33 +0200 Subject: [PATCH 21/59] python310Packages.ultraheat-api: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/ultraheat-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ultraheat-api/default.nix b/pkgs/development/python-modules/ultraheat-api/default.nix index 1d359d748b3..9eee34d1543 100644 --- a/pkgs/development/python-modules/ultraheat-api/default.nix +++ b/pkgs/development/python-modules/ultraheat-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ultraheat-api"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ultraheat_api"; inherit version; - hash = "sha256-J0mQolWdXatIG/ORTBNyo6HrAfydvYqXK7LxInQWcX0="; + hash = "sha256-6idbapqxPgA6st2ayuEiHc6WDDmsb3AJU1FnJjOukaM="; }; propagatedBuildInputs = [ From f28e56011c243d1618cd366f0c43d83daf7e2f88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 12:42:27 +0200 Subject: [PATCH 22/59] python310Packages.censys: 2.1.6 -> 2.1.6 --- .../python-modules/censys/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 754d7ca0f2a..272be648d2c 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -5,8 +5,10 @@ , importlib-metadata , parameterized , poetry-core +, pytest-mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests , requests-mock , responses @@ -15,20 +17,21 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.3"; + version = "2.1.6"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-Zv3ViOrdQby+7UQrHy6174W2qh1vx21R0yOA7ecr0lU="; + hash = "sha256-jCQWjGx35erhkj1gjBjdGytvKNarrTODH6fJpFMQqLE="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -40,16 +43,19 @@ buildPythonPackage rec { checkInputs = [ parameterized + pytest-mock pytestCheckHook requests-mock responses ]; + pythonRelaxDeps = [ + "backoff" + "requests" + "rich" + ]; + postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'backoff = "^1.11.1"' 'backoff = "*"' \ - --replace 'requests = ">=2.26.0"' 'requests = "*"' \ - --replace 'rich = "^10.16.2"' 'rich = "*"' substituteInPlace pytest.ini \ --replace "--cov" "" ''; @@ -60,7 +66,9 @@ buildPythonPackage rec { mkdir -p $HOME ''; - pythonImportsCheck = [ "censys" ]; + pythonImportsCheck = [ + "censys" + ]; meta = with lib; { description = "Python API wrapper for the Censys Search Engine (censys.io)"; From eeb24ae88fa87e60428c136414588a1309282da1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 16:39:55 +0000 Subject: [PATCH 23/59] docker-distribution: 2.7.1 -> 2.8.1 --- pkgs/applications/virtualization/docker/distribution.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix index 96722fe393f..8253a2304da 100644 --- a/pkgs/applications/virtualization/docker/distribution.nix +++ b/pkgs/applications/virtualization/docker/distribution.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "distribution"; - version = "2.7.1"; + version = "2.8.1"; rev = "v${version}"; goPackagePath = "github.com/docker/distribution"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "docker"; repo = "distribution"; inherit rev; - sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw"; + sha256 = "sha256-M8XVeIvD7LtWa9l+6ovwWu5IwFGYt0xDfcIwcU/KH/E="; }; meta = with lib; { From e5e8b08da699239423ccf39c2893e316f7bf5398 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 17:25:33 +0000 Subject: [PATCH 24/59] flint: 2.8.5 -> 2.9.0 --- pkgs/development/libraries/flint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 79b0e4caa1f..eeb2cf1127e 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -13,11 +13,11 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa stdenv.mkDerivation rec { pname = "flint"; - version = "2.8.5"; + version = "2.9.0"; src = fetchurl { url = "https://www.flintlib.org/flint-${version}.tar.gz"; - sha256 = "sha256-WRH+3/kREA8VeB8146T6k0/mDkrqAqjBDMiRgQHB7tg="; + sha256 = "sha256-L8CQ1RAzyTII5sENQGOXpTyYOuU0O5WOsl9ypXpM52o="; }; buildInputs = [ From c9a997e632d1b1e10f77d7add1978e78a60bebb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 20:17:27 +0000 Subject: [PATCH 25/59] fabric-installer: 0.10.2 -> 0.11.0 --- pkgs/tools/games/minecraft/fabric-installer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/minecraft/fabric-installer/default.nix b/pkgs/tools/games/minecraft/fabric-installer/default.nix index 4ba2dc542aa..f0068f5c829 100644 --- a/pkgs/tools/games/minecraft/fabric-installer/default.nix +++ b/pkgs/tools/games/minecraft/fabric-installer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fabric-installer"; - version = "0.10.2"; + version = "0.11.0"; src = fetchurl { url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar"; - sha256 = "sha256-xjnL1nURAr4z2OZKEqiC/E6+rSvDpxrfGwm/5Bvxxno="; + sha256 = "sha256-aLpC6k+Cum0QfdIa1sUXS4BBKFTudJGbcjS1LSFP0Qo="; }; dontUnpack = true; From d314a46ba48306b8a0f75745bea2014f623cf9ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 20:33:36 +0000 Subject: [PATCH 26/59] python310Packages.pytelegrambotapi: 4.5.1 -> 4.6.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 13678edc865..0474ed4e67c 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.5.1"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ClzdkvH1uz1qh/q3prfn8n0eosY3y3mUscbb4EKbmJQ="; + hash = "sha256-sa6kw8hnWGt++qgNVNs7cQ9LJK64CVv871aP8n08pRA="; }; propagatedBuildInputs = [ From 72404d713a0ecad5f61dd291f5a6ce563ad00c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Tue, 21 Jun 2022 12:22:12 -0300 Subject: [PATCH 27/59] kde/plasma: 5.25.0 -> 5.25.1 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 432 ++++++++++++++++---------------- 2 files changed, 217 insertions(+), 217 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 57d42b3016e..f58b02da6fb 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 0b570c9dda8..73298c78399 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/bluedevil-5.25.0.tar.xz"; - sha256 = "18iaxyfjgs7zk972aajxww372sj6azqx5flnxbs7m9zmrg687d2v"; - name = "bluedevil-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/bluedevil-5.25.1.tar.xz"; + sha256 = "1fdbxz2lk43svp6f0srjhpfhipfimf0nqjnvv62bqzpasv74p13g"; + name = "bluedevil-5.25.1.tar.xz"; }; }; breeze = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/breeze-5.25.0.tar.xz"; - sha256 = "0kph45sasp0zvccp4sblglg9b851a8jxi8zsjbj2vpfrwrmyyv4l"; - name = "breeze-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/breeze-5.25.1.tar.xz"; + sha256 = "13qwxvbdmf3qx7nfarr33q22rn43xsby7l8bjjfn6862l7pqhash"; + name = "breeze-5.25.1.tar.xz"; }; }; breeze-grub = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/breeze-grub-5.25.0.tar.xz"; - sha256 = "1i5a32spn0kdrdnbd3za3fjchk006l46ybn41h2fbrzq908yh44w"; - name = "breeze-grub-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/breeze-grub-5.25.1.tar.xz"; + sha256 = "11ic3cjfvgs2jkwbkzr2xd568ym7x2l99w488qhdhw9fzkk56rrh"; + name = "breeze-grub-5.25.1.tar.xz"; }; }; breeze-gtk = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/breeze-gtk-5.25.0.tar.xz"; - sha256 = "0hnyslgngqsywaqbfx845wfdpdvqymizvjyryi10sbki80fmdbmc"; - name = "breeze-gtk-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/breeze-gtk-5.25.1.tar.xz"; + sha256 = "0lzh7lrqiw537phfkz6bvqfbyqc4h4rb5bkxcb4s1ryynamy36yh"; + name = "breeze-gtk-5.25.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/breeze-plymouth-5.25.0.tar.xz"; - sha256 = "1b3qlw99d2rqpay47188bc0yqzp95s8g6skx7znxq8cxgg7ck24j"; - name = "breeze-plymouth-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/breeze-plymouth-5.25.1.tar.xz"; + sha256 = "0xprjl0bszs2dmn27pvklwxx5qbcsdmrr256jlvljvq5hs5vd9ly"; + name = "breeze-plymouth-5.25.1.tar.xz"; }; }; discover = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/discover-5.25.0.tar.xz"; - sha256 = "0ws0hvxnbf3mwy5lsyv56b73vjdswhy8lh01sx33xmgpbnyykqni"; - name = "discover-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/discover-5.25.1.tar.xz"; + sha256 = "1cpmi4qfxlprvj5qamjkxj4lq8038fv1fyldsfhnyi9s4zw6ww9s"; + name = "discover-5.25.1.tar.xz"; }; }; drkonqi = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/drkonqi-5.25.0.tar.xz"; - sha256 = "123snx7hfk9m7ds1vk047g3q5lkfmn00w5668xvpqr7yqw9w78fh"; - name = "drkonqi-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/drkonqi-5.25.1.tar.xz"; + sha256 = "147azxas0idb0ymcwg15davb5p84czysmsfxmcbrcqlxjkby3dy0"; + name = "drkonqi-5.25.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kactivitymanagerd-5.25.0.tar.xz"; - sha256 = "1iwrjf090s47mwl6rlk3fjk96bkrz56mvbk6d474b1f2n2ymqibm"; - name = "kactivitymanagerd-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kactivitymanagerd-5.25.1.tar.xz"; + sha256 = "1jjby09p8hak52syjzaf4wz9hyjz8rylz4jzranrkk3n85znqwk0"; + name = "kactivitymanagerd-5.25.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kde-cli-tools-5.25.0.tar.xz"; - sha256 = "0j3cib7yzmixsq2v2kymdz9sip8qxgq1x3ns86xlcwcl4fh77mqy"; - name = "kde-cli-tools-5.25.0.tar.xz"; - }; - }; - kdecoration = { - version = "5.25.0"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kdecoration-5.25.0.tar.xz"; - sha256 = "1g7l8vbcbrh20nq4s4ac1a0bmf0kb4r0b4mzqcndn6yjwab4z7c8"; - name = "kdecoration-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kde-cli-tools-5.25.1.tar.xz"; + sha256 = "03v7ws48ywjkaqj87zcw7d0dfi36abpz9bnv9s9qp2y4mnk9x198"; + name = "kde-cli-tools-5.25.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kde-gtk-config-5.25.0.tar.xz"; - sha256 = "1dg45brjwh7v83d9pm21vhn27mx0lsnbp7ry9f1mkzy509v461fb"; - name = "kde-gtk-config-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kde-gtk-config-5.25.1.tar.xz"; + sha256 = "17sqznjz5sn3xih6l83sx62p0s2sk3p1svqg297x3jq67a9299yj"; + name = "kde-gtk-config-5.25.1.tar.xz"; + }; + }; + kdecoration = { + version = "5.25.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.25.1/kdecoration-5.25.1.tar.xz"; + sha256 = "15gik2c0370f2rmd7jv3pbxbsjng25g6cwzamq3xaa3gqh6l2b33"; + name = "kdecoration-5.25.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kdeplasma-addons-5.25.0.tar.xz"; - sha256 = "0i5pxg95v7dr3in7mswnx53zkg5c05q3ijb1yqdlj4a3k6ln26nr"; - name = "kdeplasma-addons-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kdeplasma-addons-5.25.1.tar.xz"; + sha256 = "14p69kpyaszir8y4zxnyhxmall291rwcy770w4d0mlc04difki8d"; + name = "kdeplasma-addons-5.25.1.tar.xz"; }; }; kgamma5 = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kgamma5-5.25.0.tar.xz"; - sha256 = "0rzlf8dr6zj7bcbgdga0d6h9k7aw7d2ra7awzvyq7w2rx8i40ra0"; - name = "kgamma5-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kgamma5-5.25.1.tar.xz"; + sha256 = "1pc8abx3j91iqb93rsc13bq8sr610zxa91dhy8hr301fmvv9dbg2"; + name = "kgamma5-5.25.1.tar.xz"; }; }; khotkeys = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/khotkeys-5.25.0.tar.xz"; - sha256 = "0m2fr3mfqqaprcqd0b31ilz4r0d2mlvc4jwn6ax1fww4inzfa261"; - name = "khotkeys-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/khotkeys-5.25.1.tar.xz"; + sha256 = "14i9bdqjf5myacybsplsais70x3rnjnfj9807xxgwnqy5dqbz8hg"; + name = "khotkeys-5.25.1.tar.xz"; }; }; kinfocenter = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kinfocenter-5.25.0.tar.xz"; - sha256 = "1wzl0qbpj4zkhv56l86fqf7agp29jf7ljxn0na6x1sd7wqqj2hp6"; - name = "kinfocenter-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kinfocenter-5.25.1.tar.xz"; + sha256 = "0pyirq0zz8y1pvznw5idjsxwslp0bchfjp72l855z5bwfwh7dmfq"; + name = "kinfocenter-5.25.1.tar.xz"; }; }; kmenuedit = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kmenuedit-5.25.0.tar.xz"; - sha256 = "080mffhym2yxpk2jdaynz7gzhr0s2ca0qhg8xhilzvf4r3qlmv1j"; - name = "kmenuedit-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kmenuedit-5.25.1.tar.xz"; + sha256 = "0v7k9dcawylgdbjklmjn4mv10z6cm6hhp3za9ni88wlgb2vh9mmk"; + name = "kmenuedit-5.25.1.tar.xz"; }; }; kscreen = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kscreen-5.25.0.tar.xz"; - sha256 = "0cna20n9yizkm60wrr03bd048gd7q0wznn1h5sz5y3m4svvxm2qb"; - name = "kscreen-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kscreen-5.25.1.tar.xz"; + sha256 = "1dflaaba001wk5r9n523b1mxib7pd0x5b6dnhis62zn9v5apqhaa"; + name = "kscreen-5.25.1.tar.xz"; }; }; kscreenlocker = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kscreenlocker-5.25.0.tar.xz"; - sha256 = "0hi077325694dqxikvsf3vrhabk6bja02n3fy9jxv5znaaf6a0hf"; - name = "kscreenlocker-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kscreenlocker-5.25.1.tar.xz"; + sha256 = "1bhl8a1jhzr2iycq6fzkj1sb4bybyqlnxs8rnfw0s4mmcs17lmm7"; + name = "kscreenlocker-5.25.1.tar.xz"; }; }; ksshaskpass = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/ksshaskpass-5.25.0.tar.xz"; - sha256 = "0bkngywr50sd0vzw73zzbwlnzv2fwpni7w7c8m6xfl64vb8629bh"; - name = "ksshaskpass-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/ksshaskpass-5.25.1.tar.xz"; + sha256 = "1mxmjiprcckqn4sgqyj9nk32prvgymscmpv0kfkcsg60phqyz91m"; + name = "ksshaskpass-5.25.1.tar.xz"; }; }; ksystemstats = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/ksystemstats-5.25.0.tar.xz"; - sha256 = "0dcx198iamdh6llqk9z5mzc76cgra93m4w669jwrzgwnib8is8ji"; - name = "ksystemstats-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/ksystemstats-5.25.1.tar.xz"; + sha256 = "0cp6hsy24g2yhijiyavx5av5djdrypvwrcpzswp8mr86p6b1ii8n"; + name = "ksystemstats-5.25.1.tar.xz"; }; }; kwallet-pam = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kwallet-pam-5.25.0.tar.xz"; - sha256 = "19lxih5ywrvk76wir4xa4zp0adp7am412g02wya8zw21pabni2zi"; - name = "kwallet-pam-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kwallet-pam-5.25.1.tar.xz"; + sha256 = "1n9bnlsm4l051hp73hsp9wa14q77pplr855w3j620qz0az2zxwwx"; + name = "kwallet-pam-5.25.1.tar.xz"; }; }; kwayland-integration = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kwayland-integration-5.25.0.tar.xz"; - sha256 = "0lgnlfm48jm5rbmdwipkmagy0r1x9v1y10vidpcd26ldaql2lixk"; - name = "kwayland-integration-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kwayland-integration-5.25.1.tar.xz"; + sha256 = "1r80rj7f8xskiwp7lfzxp92q39gm2y6xy3ip4hv0sgjr2014fb21"; + name = "kwayland-integration-5.25.1.tar.xz"; }; }; kwin = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kwin-5.25.0.tar.xz"; - sha256 = "03r8zmwjc74hc506kzasx9a3cbygnacdw1mjmkk39wl4599w4xai"; - name = "kwin-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kwin-5.25.1.tar.xz"; + sha256 = "1srwdx1pw8kjcdmj531f43789fqsa0wj1kkhp0g42wbwj0y9af8x"; + name = "kwin-5.25.1.tar.xz"; }; }; kwrited = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kwrited-5.25.0.tar.xz"; - sha256 = "1cxfgf26kdbp84wk190s6j4hi62gp928nvyiclgxja1ha4f3yzsb"; - name = "kwrited-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kwrited-5.25.1.tar.xz"; + sha256 = "0gpql9kzwvv0n2ccq6jwwf9agd1abxc8q45plj48sv09b31bxvhz"; + name = "kwrited-5.25.1.tar.xz"; }; }; layer-shell-qt = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/layer-shell-qt-5.25.0.tar.xz"; - sha256 = "1wyijkk45mzrd2glsilv0748vi5vcdyhkbfm367v9rbyszwhsv9j"; - name = "layer-shell-qt-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/layer-shell-qt-5.25.1.tar.xz"; + sha256 = "0lh1dy1z08k6c40xdxcbmpdzzm18dq98gb14q6b6snh1jcrvg95c"; + name = "layer-shell-qt-5.25.1.tar.xz"; }; }; libkscreen = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/libkscreen-5.25.0.tar.xz"; - sha256 = "0b6qsni1nls29apdkhavxy980mxk46wrp9fizarsvvsgkahl5m8v"; - name = "libkscreen-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/libkscreen-5.25.1.tar.xz"; + sha256 = "1zbdbacmbnczskk8cpr99ph9cn28izvr25x5v5l455dk077qf25g"; + name = "libkscreen-5.25.1.tar.xz"; }; }; libksysguard = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/libksysguard-5.25.0.tar.xz"; - sha256 = "1z210jv0354midbqbcipdirilrhpcmhy5s5cy7jvgmmivarr0mrl"; - name = "libksysguard-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/libksysguard-5.25.1.tar.xz"; + sha256 = "1xn454ch9ggx67c69hjvhhykprrdys38ych1ap8l3b1j2731vyn6"; + name = "libksysguard-5.25.1.tar.xz"; }; }; milou = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/milou-5.25.0.tar.xz"; - sha256 = "166m0w8yn6dz00g6h40zyjklr6zf0yrskg6q48593l8f35kmqzdl"; - name = "milou-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/milou-5.25.1.tar.xz"; + sha256 = "0al6d26b96j3kx37p34gmqamc1pz7l3shyqf7dxf7j71hh0mrk09"; + name = "milou-5.25.1.tar.xz"; }; }; oxygen = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/oxygen-5.25.0.tar.xz"; - sha256 = "0kq8h3zi07h0j0y6n0q6nkbf3sa2pxvyvy7hyxbbvl4b8s4h3asf"; - name = "oxygen-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/oxygen-5.25.1.tar.xz"; + sha256 = "1ax0vw7mzlln09aajis5vc78snbi3508lg6qbx6vw9m59lpq140v"; + name = "oxygen-5.25.1.tar.xz"; }; }; oxygen-sounds = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/oxygen-sounds-5.25.0.tar.xz"; - sha256 = "1qk4ff5knjpznj5zbpvzd3wjbpbzmijaxrwqsr7q663i0rjx82b4"; - name = "oxygen-sounds-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/oxygen-sounds-5.25.1.tar.xz"; + sha256 = "14z23yzqcvwjyy0qbm20xgijrndiw8pk1xf4wdbslny454k0l1q7"; + name = "oxygen-sounds-5.25.1.tar.xz"; }; }; plasma-browser-integration = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-browser-integration-5.25.0.tar.xz"; - sha256 = "1qcaxchwlqsjs9fwksc185n3pr7c8wp74m0abbbv1g0qkwwkfww5"; - name = "plasma-browser-integration-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-browser-integration-5.25.1.tar.xz"; + sha256 = "140j74dbsx0jicz1407h4n1hqsnnvh3mk07w4y7slvf3392fqp6i"; + name = "plasma-browser-integration-5.25.1.tar.xz"; }; }; plasma-desktop = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-desktop-5.25.0.tar.xz"; - sha256 = "1ib8j6pv720ky3v7pcyjzdn4cyi0201kcrpxj4adv2hsj3qc3lv3"; - name = "plasma-desktop-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-desktop-5.25.1.tar.xz"; + sha256 = "1j1d0j4sdnyfcpv9z4ch6z5z0d7ylkbqcwkhwx0qqs7if8p6f355"; + name = "plasma-desktop-5.25.1.tar.xz"; }; }; plasma-disks = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-disks-5.25.0.tar.xz"; - sha256 = "10fz7biz0p7ipdxjllwjcja8d3mf7wf4af0gi0yh0pwr5yj8yn68"; - name = "plasma-disks-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-disks-5.25.1.tar.xz"; + sha256 = "1ji4gkm36zk4ybdnqzynni0q66nniryfa4p60wqmqr7x97h4376s"; + name = "plasma-disks-5.25.1.tar.xz"; }; }; plasma-firewall = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-firewall-5.25.0.tar.xz"; - sha256 = "0m8lh6lfr7a9w33wcj4li01b82vfw7smv5l1sigri5zx0ahpkqdc"; - name = "plasma-firewall-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-firewall-5.25.1.tar.xz"; + sha256 = "0vip17v0860grmqh9sv7vjisnxgpxqs5hw8yw0fdign0dp3yjn33"; + name = "plasma-firewall-5.25.1.tar.xz"; }; }; plasma-integration = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-integration-5.25.0.tar.xz"; - sha256 = "1a069wcjfxw1rvb285lln19yg18f1k0003snmrmfbisbv5f7475q"; - name = "plasma-integration-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-integration-5.25.1.tar.xz"; + sha256 = "09xpbjp5k28bjvs8nszkzk9mw72zv0v171y495ffn8af6yq35cgj"; + name = "plasma-integration-5.25.1.tar.xz"; }; }; plasma-mobile = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-mobile-5.25.0.tar.xz"; - sha256 = "00d63zb8n3iza8q2a1pgk0v63bzzq3yky71ij3bmm08a405w2ad8"; - name = "plasma-mobile-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-mobile-5.25.1.tar.xz"; + sha256 = "04dg6xyzj9zg9g80f6l1chg8f9pj0wz4c8szj3mx1cs98lp3bvcy"; + name = "plasma-mobile-5.25.1.tar.xz"; }; }; plasma-nano = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-nano-5.25.0.tar.xz"; - sha256 = "0hcki7qz1xldnm70x5qwrp7knqzyq3kzwjasiqpbz9vc5l4rxxyz"; - name = "plasma-nano-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-nano-5.25.1.tar.xz"; + sha256 = "0acdz8qqkk4rwsfglk06am8s89zyz0jafhqq574bw83znq13xhfy"; + name = "plasma-nano-5.25.1.tar.xz"; }; }; plasma-nm = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-nm-5.25.0.tar.xz"; - sha256 = "10350qnsap1m1jcmga331pis8076lpk9kkg9141xrlsy8kbf36ad"; - name = "plasma-nm-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-nm-5.25.1.tar.xz"; + sha256 = "011i4d612ljvy2b9vv4lqr2ad5yq0qv18nqqjdy3wmj7w1nm4ww9"; + name = "plasma-nm-5.25.1.tar.xz"; }; }; plasma-pa = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-pa-5.25.0.tar.xz"; - sha256 = "0shp4y08ry8ql02akdmwzzn7yaiddbhsp3h2jqmh401q14n374m8"; - name = "plasma-pa-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-pa-5.25.1.tar.xz"; + sha256 = "1nrsw3f2dj1sd3ibyym7142shwxnsi72j4nkhx02206fcjm5p9d1"; + name = "plasma-pa-5.25.1.tar.xz"; }; }; plasma-sdk = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-sdk-5.25.0.tar.xz"; - sha256 = "0z72gyxp5ddcn9ilyflp781a60vgpck3l91prxaphhgn3js0al9r"; - name = "plasma-sdk-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-sdk-5.25.1.tar.xz"; + sha256 = "1cy9c4h6yxqjnylnpy2ai7vsx3c1b9p6ga3771jdb1zgqw55lgg7"; + name = "plasma-sdk-5.25.1.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-systemmonitor-5.25.0.tar.xz"; - sha256 = "131hzqhhc4a0531p2xjabcbjp9cgkzir2sxvx8mb7xa5i213qjfr"; - name = "plasma-systemmonitor-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-systemmonitor-5.25.1.tar.xz"; + sha256 = "1l6m5jnqk56r20mv24s567qj4fbv6ixnzsw75pssngn5zmccm6xy"; + name = "plasma-systemmonitor-5.25.1.tar.xz"; }; }; plasma-tests = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-tests-5.25.0.tar.xz"; - sha256 = "1cgkfg1psnl74h2v5napv4fzxa7d997d8zzkkpy5sg89isxidcjq"; - name = "plasma-tests-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-tests-5.25.1.tar.xz"; + sha256 = "1vdvyirk53xv77mdj9kd3n8sk9rfgrz7c31h93bs1hybpbkqbc4g"; + name = "plasma-tests-5.25.1.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-thunderbolt-5.25.0.tar.xz"; - sha256 = "04h1rmc4ha62sgljs1gy4kafip611rd54sx6siagz5wicjq0fahi"; - name = "plasma-thunderbolt-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-thunderbolt-5.25.1.tar.xz"; + sha256 = "19wjs5sapq4v4wwmhd4fk1pdc4zkn0p0w91vc29mzw7vy51id5w0"; + name = "plasma-thunderbolt-5.25.1.tar.xz"; }; }; plasma-vault = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-vault-5.25.0.tar.xz"; - sha256 = "1afqvnfbznazbyik8m1sj04a2qfihvhjn7pv1kbpzj83yca00zvq"; - name = "plasma-vault-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-vault-5.25.1.tar.xz"; + sha256 = "15pad4p9lf6z4nkm0zk82k1zn0x724l68hajvwrhw4qjrr8p2p68"; + name = "plasma-vault-5.25.1.tar.xz"; }; }; plasma-workspace = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-workspace-5.25.0.tar.xz"; - sha256 = "1hbv0w6vkqdrr3dr3cndg8c049x9fpxg9siw2ggbxz30kvc64m2n"; - name = "plasma-workspace-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-5.25.1.tar.xz"; + sha256 = "1pin9x3sz0x39af0cvfna518sx383sr2564f85c7znvyw4qdys0k"; + name = "plasma-workspace-5.25.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-workspace-wallpapers-5.25.0.tar.xz"; - sha256 = "0lvqf53a4cy3vzm2kmxwnjlrvhfdb7s9vqq1x3cmagaq9d6zkb70"; - name = "plasma-workspace-wallpapers-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-wallpapers-5.25.1.tar.xz"; + sha256 = "0cpqgp45rbsaynasf1k974fvwwrfv93r68hn6bvka99nh6j4vpki"; + name = "plasma-workspace-wallpapers-5.25.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plymouth-kcm-5.25.0.tar.xz"; - sha256 = "0h6qrqz2mvb0b1x5z74a8knh7dr8g5lwz8dzwypbsa7ahfj877x5"; - name = "plymouth-kcm-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plymouth-kcm-5.25.1.tar.xz"; + sha256 = "08sf692fsdffaj91kgw3mg4bgxyy080kx992zb6drnkjmxq6pi93"; + name = "plymouth-kcm-5.25.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.25.0"; + version = "1-5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/polkit-kde-agent-1-5.25.0.tar.xz"; - sha256 = "0ph3i46xn2273anhbszxjn51rkngsmy588ayhjqx0a19wmfw7qk9"; - name = "polkit-kde-agent-1-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/polkit-kde-agent-1-5.25.1.tar.xz"; + sha256 = "0aawaq09l1ifn7wd9ggj50vv19vj30w8bmfdzwjhj9zgym2s8dc4"; + name = "polkit-kde-agent-1-5.25.1.tar.xz"; }; }; powerdevil = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/powerdevil-5.25.0.tar.xz"; - sha256 = "1fqgnc5l2vxf310i41l4ggcjwjq1jp8c4wngfb8jl3nn6lqkmdki"; - name = "powerdevil-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/powerdevil-5.25.1.tar.xz"; + sha256 = "0m57mp577liv3cmd4afm834mif688akdir9i89xjmvwdg8cws7n4"; + name = "powerdevil-5.25.1.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/qqc2-breeze-style-5.25.0.tar.xz"; - sha256 = "0jw2zk9rrfdb3g983c85c4q539277p0cl2y165zb63p2hrcy44cz"; - name = "qqc2-breeze-style-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/qqc2-breeze-style-5.25.1.tar.xz"; + sha256 = "00ij7ci9xh125g9n8f1qmlpjjy93hydqi3gf29bfz4vh2lnvfd4l"; + name = "qqc2-breeze-style-5.25.1.tar.xz"; }; }; sddm-kcm = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/sddm-kcm-5.25.0.tar.xz"; - sha256 = "0mj101qsmp3405ir6qnkfc8gm6f3vzy0gdg6zv465mh8fs8yvcf4"; - name = "sddm-kcm-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/sddm-kcm-5.25.1.tar.xz"; + sha256 = "1m371dqj72f3lxyn8bjz0bgxycrz5ik1byzqqhrjkfy3an68vs36"; + name = "sddm-kcm-5.25.1.tar.xz"; }; }; systemsettings = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/systemsettings-5.25.0.tar.xz"; - sha256 = "1a3x0gig7ixk52hqa7jr85l7xypj8rjaashk8xnq9zmvxlk6idng"; - name = "systemsettings-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/systemsettings-5.25.1.tar.xz"; + sha256 = "1kichbhmsnr3kmlzic4dp3ajbkwrn8q9idjwwffnr48rz1pnb3j3"; + name = "systemsettings-5.25.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/xdg-desktop-portal-kde-5.25.0.tar.xz"; - sha256 = "1632pglnz8yv86sgrmmr8zv3h38mw8bk21cshw63bbcfvxmvl88m"; - name = "xdg-desktop-portal-kde-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/xdg-desktop-portal-kde-5.25.1.tar.xz"; + sha256 = "15b9wradlqlcipn9q09czc698xsb4q7j6pwgnv8fbaq5na6xgh0s"; + name = "xdg-desktop-portal-kde-5.25.1.tar.xz"; }; }; } From 868b2b1fbe6d0e6ca3ffe10ac9bf4afc620a1dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Tue, 21 Jun 2022 19:05:28 -0300 Subject: [PATCH 28/59] Revert "powerdevil: fix brightness wonkiness on some laptops" This reverts commit a29f64c22f331e1a1c650d4289dd891303c3766e. --- pkgs/desktops/plasma-5/powerdevil.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index df575fcb987..bb511c21ba6 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, kdoctools, bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, @@ -9,15 +9,6 @@ mkDerivation { pname = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - patches = [ - # Backported fix for https://bugs.kde.org/show_bug.cgi?id=454161 - # FIXME: remove for next release - (fetchpatch { - name = "brightness-overflow-fix"; - url = "https://invent.kde.org/plasma/powerdevil/-/commit/2ebe655d220c9167b66893a823b2fff2e2b8a531.patch"; - sha256 = "sha256-Sf2q0CImLYjy1fTp9AWbCeRG05liUkemhfEXL/0MIQI="; - }) - ]; buildInputs = [ kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth kglobalaccel ki18n kio kidletime kwayland libkscreen From 83c44f79272fdf560581df6daa499e8d9a2c8152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Wed, 22 Jun 2022 09:06:43 -0300 Subject: [PATCH 29/59] kde-rounded-corners: bump to unstable, fix build with kwin 5.25 --- .../themes/kwin-decorations/kde-rounded-corners/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index b77c136e406..3d0c298cada 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.1.1"; + version = "unstable-2022-06-17"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; - rev = "v${version}"; - hash = "sha256-cXpJabeOHnat7OljtRzduUdOaA6Z3z6vV3aBKwiIrR0="; + rev = "015ef5cd65e9ec89e4a1ae057f2251eda03715e2"; + hash = "sha256-NJ7icavofSUPPww1Ro7p0yY2EQ78S4KVCuj9yPuYwd8="; }; postConfigure = '' From 62a4d12769213ee86c0b6ead55d700e9cdf29276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Wed, 22 Jun 2022 20:40:55 -0300 Subject: [PATCH 30/59] kdevelop: move to kde/gear release 22.04.2 Also, use python 3.9 to build kdev-python plugin, broken on python 3.10. --- pkgs/applications/kde/default.nix | 5 +++++ .../kdevelop5 => kde/kdevelop}/kdev-php.nix | 10 ++-------- .../kdevelop5 => kde/kdevelop}/kdev-python.nix | 18 +++++++++--------- .../kdevelop}/kdevelop-pg-qt.nix | 8 ++------ .../kdevelop5 => kde/kdevelop}/kdevelop.nix | 16 +++++++--------- .../kdevelop5 => kde/kdevelop}/wrapper.nix | 0 pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 13 ------------- 8 files changed, 27 insertions(+), 46 deletions(-) rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/kdev-php.nix (54%) rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/kdev-python.nix (58%) rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/kdevelop-pg-qt.nix (87%) rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/kdevelop.nix (87%) rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/wrapper.nix (100%) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index c390e004c8c..cb661d438cf 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -122,6 +122,11 @@ let kdenlive = callPackage ./kdenlive {}; kdepim-runtime = callPackage ./kdepim-runtime {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; + kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix {}; + kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix {}; + kdev-php = callPackage ./kdevelop/kdev-php.nix {}; + kdev-python = callPackage ./kdevelop/kdev-python.nix {}; + kdevelop = callPackage ./kdevelop/wrapper.nix {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; kdiamond = callPackage ./kdiamond.nix {}; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/kde/kdevelop/kdev-php.nix similarity index 54% rename from pkgs/applications/editors/kdevelop5/kdev-php.nix rename to pkgs/applications/kde/kdevelop/kdev-php.nix index 8308830efcc..46c4af8c1c0 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/kde/kdevelop/kdev-php.nix @@ -1,13 +1,7 @@ -{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: +{ mkDerivation, lib, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kdev-php"; - version = "5.6.2"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-8Qg9rsK4x1LeGgRB0Pn3InSx4tKccjAF7Xjc+Lpxfgw="; - }; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix similarity index 58% rename from pkgs/applications/editors/kdevelop5/kdev-python.nix rename to pkgs/applications/kde/kdevelop/kdev-python.nix index 374b4224ca6..66335429bdd 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/kde/kdevelop/kdev-python.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: - -stdenv.mkDerivation rec { +{ mkDerivation, lib, cmake, extra-cmake-modules +, threadweaver, ktexteditor, kdevelop-unwrapped, python39 +}: +let + # FIXME: stick with python 3.9 until MR supporting 3.10 is ready: + # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16 + python = python39; +in +mkDerivation rec { pname = "kdev-python"; - version = "5.6.2"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-IPm3cblhJi3tmGpPMrjSWa2fe8SLsp6sCl1YU74dkX8="; - }; cmakeFlags = [ "-DPYTHON_EXECUTABLE=${python}/bin/python" diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix similarity index 87% rename from pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix rename to pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix index e1478ef6a03..f96e8cf6b67 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix @@ -1,15 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config, extra-cmake-modules, qtbase }: -let +stdenv.mkDerivation rec { pname = "kdevelop-pg-qt"; version = "2.2.1"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix similarity index 87% rename from pkgs/applications/editors/kdevelop5/kdevelop.nix rename to pkgs/applications/kde/kdevelop/kdevelop.nix index 37ede94fa19..4e7f576398e 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -1,21 +1,18 @@ - -{ mkDerivation, lib, fetchurl, cmake, gettext, pkg-config, extra-cmake-modules +{ mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules , qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons , plasma-framework, krunner, kdevelop-pg-qt, shared-mime-info, libkomparediff2 -, libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost +, libksysguard, konsole, llvmPackages_13, makeWrapper, kpurpose, boost +, qtwebengine, cppcheck }: +let + llvmPackages = llvmPackages_13; +in mkDerivation rec { pname = "kdevelop"; - version = "5.6.2"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-D4a8P+U/dhwePj91RFd6DEFDO+i/8xDPLnKfdvQ2O/Y="; - }; nativeBuildInputs = [ cmake gettext pkg-config extra-cmake-modules makeWrapper @@ -32,6 +29,7 @@ mkDerivation rec { kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose + cppcheck qtwebengine ]; # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b diff --git a/pkgs/applications/editors/kdevelop5/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix similarity index 100% rename from pkgs/applications/editors/kdevelop5/wrapper.nix rename to pkgs/applications/kde/kdevelop/wrapper.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bd19a8d3059..f1a7cce4e36 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1646,7 +1646,8 @@ mapAliases ({ ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config - kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy + kdenlive kdeplasma-addons kdevelop-pg-qt kdevelop-unwrapped kdev-php + kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kfloppy kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4694c54a65b..accc422b8a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27742,19 +27742,6 @@ with pkgs; kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { }; - kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - - kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { - llvmPackages = llvmPackages_10; - }; - - kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { - python = python3; - }; - - kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - kepubify = callPackage ../tools/misc/kepubify { }; kermit = callPackage ../tools/misc/kermit { }; From 2bf8d8c0162507d08f9fc48e36ce7225f4879bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Wed, 22 Jun 2022 20:44:59 -0300 Subject: [PATCH 31/59] plasma-mobile: add plasma-workspace to buildInputs --- pkgs/desktops/plasma-5/plasma-mobile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index be628de6540..7ce5f827589 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -23,7 +23,7 @@ mkDerivation { appstream libdbusmenu pam wayland kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt - networkmanager-qt maliit-framework maliit-keyboard + networkmanager-qt maliit-framework maliit-keyboard plasma-workspace ]; postPatch = '' From d6b20ea2cf2172eb72edb4f401929a2d7b7a7c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Wed, 22 Jun 2022 20:51:48 -0300 Subject: [PATCH 32/59] kf5/plasma-framework: backport patch to fix thumbnails in task manager --- .../libraries/kde-frameworks/plasma-framework.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index cf118beaabc..83a7cc2546d 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, fetchpatch, extra-cmake-modules, kdoctools, kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, @@ -9,6 +9,14 @@ mkDerivation { pname = "plasma-framework"; + patches = [ + # FIXME: remove on kf5.96 + (fetchpatch { + name = "fix-thumbnails-task-manager.patch"; + url = "https://invent.kde.org/frameworks/plasma-framework/-/commit/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch"; + sha256 = "sha256-0162bi3J5bl5BmmUSrhxxy8MpLtSXkdHGK8wMcS5BB8="; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons From 42f1d29ec67a1c65ea3bb4175dd9042a88e8b2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Fri, 24 Jun 2022 19:49:39 -0300 Subject: [PATCH 33/59] kio-extras: add optional dependencies kactivities-stats enables "Recent Files"/"Recent Locations"/"recentlyused:/" kioslaves, taglib enables audio metadata reading, and libtirpc enables NFS kio. --- pkgs/applications/kde/kio-extras.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 29a3bdc97bb..d9e8cf88949 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,9 +1,9 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, - exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, + exiv2, kactivities, kactivities-stats, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio, - khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, - ilmbase, openslp, phonon, qtsvg, samba, solid, gperf + khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, libtirpc, + ilmbase, openslp, phonon, qtsvg, samba, solid, gperf, taglib }: mkDerivation { @@ -14,10 +14,10 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ - exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons + exiv2 kactivities kactivities-stats karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml - kpty syntax-highlighting libmtp libssh openexr openslp - phonon qtsvg samba solid gperf + kpty syntax-highlighting libmtp libssh openexr libtirpc openslp + phonon qtsvg samba solid gperf taglib ]; # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras From daaacc7e69feb6c1e9f4f2d484cde2c697c0b57e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jun 2022 04:05:20 +0000 Subject: [PATCH 34/59] python310Packages.numexpr: 2.8.1 -> 2.8.3 --- pkgs/development/python-modules/numexpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index ffc422e9b42..6c76a8fc88e 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.1"; + version = "2.8.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zXeapE3ZhsTvEBY1GSOWArAnvgalJ5RmViB6zx9YETs="; + hash = "sha256-y2R8nZx4Xa4HWb9sh1zeK+xHK1w/emAVc0sWGudm0UE="; }; nativeBuildInputs = [ From 09de9278896475109418be21784b061c4577532e Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sun, 26 Jun 2022 12:45:53 +0800 Subject: [PATCH 35/59] vivaldi: 5.3.2679.58-1 -> 5.3.2679.61-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index be134d46573..35f0712d9ab 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.3.2679.58-1"; + version = "5.3.2679.61-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "085r5mrj8kp65fv0fw3azcgl9a7wxw4vcmnma36ihml8r53f8iaw"; + sha256 = "0cxsdcksv29dxync8rxrn30kr68qzf615085nhkk0ava7jdlvz9g"; }; unpackPhase = '' From 0261c281310a6d0c4a127d4eec421a591606f731 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 26 Jun 2022 09:16:02 +0300 Subject: [PATCH 36/59] ngtcp2: 0.5.0 -> 0.6.0 --- pkgs/development/libraries/ngtcp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 68dabef6d9f..02812e00432 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hpIGsQBJCOyaEqopdES/hRXc2makIERonUju9D/HvgE="; + sha256 = "sha256-1cbbH411kn2OnxLWXQvmae0JW4HzXnEHYnucQEVAslk="; }; outputs = [ "out" "dev" "doc" ]; From e0ccaad6b15455def47429e38fde4ff97fa02d4a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 26 Jun 2022 09:19:46 +0300 Subject: [PATCH 37/59] nghttp3: 0.4.1 -> 0.5.0 --- pkgs/development/libraries/nghttp3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 32e3917e72c..e0392901ecc 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1+0ln0J8dqHqmE+fsawhbfbbMNlCkDpJx4xomUuoHdE="; + sha256 = "sha256-EEwo4KIBNVb/O1htUN8GkuiU/P3r/DyEn6L9l1r1I6E="; }; outputs = [ "out" "dev" "doc" ]; From feef954b41dc8df5b20b80f6c4027e61152f039c Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 26 Jun 2022 11:47:35 +0300 Subject: [PATCH 38/59] shod: init at 2.4.0 --- .../window-managers/shod/default.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/window-managers/shod/default.nix diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/applications/window-managers/shod/default.nix new file mode 100644 index 00000000000..f9e6216a86a --- /dev/null +++ b/pkgs/applications/window-managers/shod/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, writeText +, fontconfig +, libX11 +, libXft +, libXinerama +, libXpm +, libXrender +, conf ? null +}: + +stdenv.mkDerivation rec { + pname = "shod"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "shod"; + rev = "v${version}"; + sha256 = "sha256-jrPuI3ADppqaJ2y9GksiJZZd4LtN1P5yjWwlf9VuYDc="; + }; + + buildInputs = [ + fontconfig + libX11 + libXft + libXinerama + libXpm + libXrender + ]; + + postPatch = + let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "config.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} config.h"; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A mouse-based window manager that can tile windows inside floating containers"; + longDescription = '' + shod is a multi-monitor floating reparenting X11 window manager that + supports tiled and tabbed containers. shod sets no keybindings, reads no + configuration, and works only via mouse with a given key modifier (Alt by + default) and by responding to client messages sent by the shodc utility + (shod's remote controller). + ''; + homepage = "https://github.com/phillbush/shod"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 229a23d2349..2443efa7dff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28728,6 +28728,8 @@ with pkgs; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; + shod = callPackage ../applications/window-managers/shod { }; + shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; shogun = callPackage ../applications/science/machine-learning/shogun { From 9da7bf74da888fe3b3715e93e5c2fa66905ba54c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jun 2022 09:44:29 +0000 Subject: [PATCH 39/59] python310Packages.aioymaps: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/aioymaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioymaps/default.nix b/pkgs/development/python-modules/aioymaps/default.nix index c23451b9db9..e1da7baaa6b 100644 --- a/pkgs/development/python-modules/aioymaps/default.nix +++ b/pkgs/development/python-modules/aioymaps/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioymaps"; - version = "1.2.2"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZWolVsh6MSEA3h62ERaCLSVAr+vl53yysPjulMtW4QI="; + sha256 = "sha256-pW8FoMdA8XdQZmLRwk5SBBgFhYhgEMJPA9+b+8aicuE="; }; propagatedBuildInputs = [ From 57617daaff5ed1f519b1ae4e54d48364a2649972 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 26 Jun 2022 12:06:36 +0200 Subject: [PATCH 40/59] Revert "nixos/hedgedoc: Do not set StateDirectory to an absolute path" --- nixos/modules/services/web-apps/hedgedoc.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 0310c15a4d2..22270609dbc 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -1031,8 +1031,7 @@ in ''; serviceConfig = { WorkingDirectory = cfg.workDir; - StateDirectory = [ (builtins.replaceStrings [ "/var/lib/" ] [ "" ] cfg.workDir) ]; - ReadWritePaths = [ cfg.configuration.uploadsPath ]; + StateDirectory = [ cfg.workDir cfg.configuration.uploadsPath ]; ExecStart = "${cfg.package}/bin/hedgedoc"; EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; Environment = [ From 6c5f014da715f06af0e96dbe8013161126ff8397 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 26 Jun 2022 13:37:16 +0200 Subject: [PATCH 41/59] zrepl: set release version on build --- pkgs/tools/backup/zrepl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix index 0bbc7267af8..e7094704319 100644 --- a/pkgs/tools/backup/zrepl/default.nix +++ b/pkgs/tools/backup/zrepl/default.nix @@ -24,6 +24,8 @@ buildGoModule rec { makeWrapper ]; + ldflags = [ "-X github.com/zrepl/zrepl/version.zreplVersion=${version}" ]; + postInstall = '' mkdir -p $out/lib/systemd/system substitute dist/systemd/zrepl.service $out/lib/systemd/system/zrepl.service \ From c1d137b2820c1eab1c41ac4fb2c0220da5279600 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 26 Jun 2022 13:40:51 +0200 Subject: [PATCH 42/59] zrepl: add strip flags --- pkgs/tools/backup/zrepl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix index e7094704319..74d74b79476 100644 --- a/pkgs/tools/backup/zrepl/default.nix +++ b/pkgs/tools/backup/zrepl/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { makeWrapper ]; - ldflags = [ "-X github.com/zrepl/zrepl/version.zreplVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/zrepl/zrepl/version.zreplVersion=${version}" ]; postInstall = '' mkdir -p $out/lib/systemd/system From 1216772f5da8c6d6efaecb798f92f035a8d93cf1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 9 Apr 2022 16:23:59 +0200 Subject: [PATCH 43/59] haskell.compiler.ghc922Binary: init at 9.2.2 Since the musl / alpine bindist now uses the GMP backend, we need to learn to tell Hadrian bindists about GMP. Hadrian bindists no longer have the buildinfo files, instead we need to patch the package db before installing and recache it afterwards which is not too hard, luckily. Same goes for libiconv and base as well as libffi and rts on darwin (those bindists are all produced using hadrian). See also: https://gitlab.haskell.org/ghc/ghc/-/issues/21554#note_431000 Note that pkgsMusl.haskell.compiler.ghc922Binary still has severe issues: It can't produce shared libraries because the bindist ships none (and using the GMP backend has a hard requirement for shared objects, apparently) and ghci segfaults for unknown reasons at the moment. However, I've successfully compiled hadrian with it so far, so perhaps it's good enough. --- .../compilers/ghc/9.2.2-binary.nix | 448 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 22 + 2 files changed, 470 insertions(+) create mode 100644 pkgs/development/compilers/ghc/9.2.2-binary.nix diff --git a/pkgs/development/compilers/ghc/9.2.2-binary.nix b/pkgs/development/compilers/ghc/9.2.2-binary.nix new file mode 100644 index 00000000000..53b56b04479 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.2.2-binary.nix @@ -0,0 +1,448 @@ +{ lib, stdenv +, fetchurl, perl, gcc +, ncurses5 +, ncurses6, gmp, libiconv, numactl, libffi +, llvmPackages +, coreutils +, targetPackages + + # minimal = true; will remove files that aren't strictly necessary for + # regular builds and GHC bootstrapping. + # This is "useful" for staying within hydra's output limits for at least the + # aarch64-linux architecture. +, minimal ? false +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + downloadsUrl = "https://downloads.haskell.org/ghc"; + + # Copy sha256 from https://downloads.haskell.org/~ghc/9.2.2/SHA256SUMS + version = "9.2.2"; + + # Information about available bindists that we use in the build. + # + # # Bindist library checking + # + # The field `archSpecificLibraries` also provides a way for us get notified + # early when the upstream bindist changes its dependencies (e.g. because a + # newer Debian version is used that uses a new `ncurses` version). + # + # Usage: + # + # * You can find the `fileToCheckFor` of libraries by running `readelf -d` + # on the compiler binary (`exePathForLibraryCheck`). + # * To skip library checking for an architecture, + # set `exePathForLibraryCheck = null`. + # * To skip file checking for a specific arch specfic library, + # set `fileToCheckFor = null`. + ghcBinDists = { + # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) + # nixpkgs uses for the respective system. + defaultLibc = { + i686-linux = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + sha256 = "24234486ed4508161c6f88f4750a36d38b135b0c6e5fe78efe2d85c612ecaf9e"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, + # which link it against `libtinfo.so.5` (ncurses 5). + # Other bindists are linked `libtinfo.so.6` (ncurses 6). + { nixPackage = ncurses5; fileToCheckFor = "libtinfo.so.5"; } + ]; + }; + x86_64-linux = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; + sha256 = "fb61dea556a2023dc2d50ee61a22144bb23e4229a378e533065124c218f40cfc"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + ]; + }; + armv7l-linux = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; + sha256 = "ce5a7c3beb19d8c13a9e60bd39d3ba8ef0060b954ea42eb23f1ef8d077fa9e8b"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + ]; + }; + aarch64-linux = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; + sha256 = "f3621ccba7ae48fcd67a9505f61bb5ccfb05c4cbfecd5a6ea65fe3f150af0e98"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + { nixPackage = numactl; fileToCheckFor = null; } + ]; + }; + x86_64-darwin = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + sha256 = "934abbd6083d3aeb5ff081955682d7711d9e79db57b1613eb229c325dd06f83f"; + }; + exePathForLibraryCheck = null; # we don't have a library check for darwin yet + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = null; } + { nixPackage = libiconv; fileToCheckFor = null; } + ]; + }; + aarch64-darwin = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz"; + sha256 = "d1f04f7cc062ed134f863305c67dfe2c42df46ed658dd34f9dd552186f194e5c"; + }; + exePathForLibraryCheck = null; # we don't have a library check for darwin yet + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = null; } + { nixPackage = libiconv; fileToCheckFor = null; } + ]; + }; + }; + # Binary distributions for the musl libc for the respective system. + musl = { + x86_64-linux = { + variantSuffix = "-musl"; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.12-linux-gmp.tar.xz"; + sha256 = "624523826e24eae33c03490267cddecc1d80c047f2a3f4b03580f1040112d5c0"; + }; + isStatic = true; + # We can't check the RPATH for statically linked executable + exePathForLibraryCheck = null; + archSpecificLibraries = [ + { nixPackage = gmp.override { withStatic = true; }; fileToCheckFor = null; } + ]; + }; + }; + }; + + distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc"; + + binDistUsed = ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); + + gmpUsed = (builtins.head ( + builtins.filter ( + drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "") + ) binDistUsed.archSpecificLibraries + )).nixPackage; + + # GHC has other native backends (like PowerPC), but here only the ones + # we ship bindists for matter. + useLLVM = !(stdenv.targetPlatform.isx86 + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)); + + libPath = + lib.makeLibraryPath ( + # Add arch-specific libraries. + map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries + ); + + libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + + runtimeDeps = [ + targetPackages.stdenv.cc + targetPackages.stdenv.cc.bintools + coreutils # for cat + ] + ++ lib.optionals useLLVM [ + (lib.getBin llvmPackages.llvm) + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; + +in + +stdenv.mkDerivation rec { + inherit version; + pname = "ghc-binary${binDistUsed.variantSuffix}"; + + src = fetchurl binDistUsed.src; + + nativeBuildInputs = [ perl ]; + + # Set LD_LIBRARY_PATH or equivalent so that the programs running as part + # of the bindist installer can find the libraries they expect. + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location. + ${libEnvVar} = libPath; + + postUnpack = + # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, + # so that we know when ghc bindists upgrade that and we need to update the + # version used in `libPath`. + lib.optionalString + (binDistUsed.exePathForLibraryCheck != null) + # Note the `*` glob because some GHCs have a suffix when unpacked, e.g. + # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`. + # As a result, don't shell-quote this glob when splicing the string. + (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in + lib.concatStringsSep "\n" [ + ('' + echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" + if ! test -e ${buildExeGlob}; then + echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + '') + (lib.concatMapStringsSep + "\n" + ({ fileToCheckFor, nixPackage }: + lib.optionalString (fileToCheckFor != null) '' + echo "Checking bindist for ${fileToCheckFor} to ensure that is still used" + if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then + echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + + echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}" + if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then + echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + '' + ) + binDistUsed.archSpecificLibraries + ) + ]) + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + patchShebangs ghc-${version}/configure + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name ghc-bignum.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${lib.getLib gmpUsed}/lib@" {} \; + + # we need to modify the package db directly for hadrian bindists + find . -name 'ghc-bignum*.conf' \ + -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; + '' + lib.optionalString stdenv.isDarwin '' + # we need to modify the package db directly for hadrian bindists + # (all darwin bindists are hadrian-based for 9.2.2) + find . -name 'base*.conf' \ + -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \; + + # To link RTS in the end we also need libffi now + find . -name 'rts*.conf' \ + -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libffi}/lib' \ + -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \ + -i {} \; + '' + + # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in + # FFI_LIB_DIR is a good indication of places it must be needed. + lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) '' + find . -name package.conf.in \ + -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + lib.optionalString stdenv.isLinux '' + find . -type f -executable -exec patchelf \ + --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; + '' + + # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path + # substitution. Which can break the build if the store path / prefix happens + # to contain this string. This will be fixed with 9.2.3 bindists. + # https://gitlab.haskell.org/ghc/ghc/-/issues/21402 + '' + # Detect hadrian Makefile by checking for the target that has the problem + if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then + echo Hadrian bindist, applying workaround for xxx path substitution. + # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch + substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0' + else + echo Not a hadrian bindist, not applying xxx path workaround. + fi + ''; + + # fix for `configure: error: Your linker is affected by binutils #16177` + preConfigure = lib.optionalString + stdenv.targetPlatform.isAarch32 + "LD=ld.gold"; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-includes=${lib.getDev gmpUsed}/include" + # Note `--with-gmp-libraries` does nothing for GHC bindists: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 + ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + # From: https://github.com/NixOS/nixpkgs/pull/43369/commits + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # Patch scripts to include runtime dependencies in $PATH. + postInstall = '' + for i in "$out/bin/"*; do + test ! -h "$i" || continue + isScript "$i" || continue + sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" + done + ''; + + # Apparently necessary for the ghc Alpine (musl) bindist: + # When we strip, and then run the + # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + # below, running ghc (e.g. during `installCheckPhase)` gives some apparently + # corrupted rpath or whatever makes the loader work on nonsensical strings: + # running install tests + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found + # This is extremely bogus and should be investigated. + dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + (if stdenv.hostPlatform.isAarch64 then + # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs + # are 2 directories deep from $out/lib, so pooling symlinks there makes + # a short rpath. + '' + (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6) + (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10) + (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1) + for p in $(find "$out/lib" -type f -name "*\.so*"); do + (cd $out/lib; ln -s $p) + done + + for p in $(find "$out/lib" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p + fi + done + '' + else + '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '') + lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + '' + + lib.optionalString minimal '' + # Remove profiling files + find $out -type f -name '*.p_o' -delete + find $out -type f -name '*.p_hi' -delete + find $out -type f -name '*_p.a' -delete + # `-f` because e.g. musl bindist does not have this file. + rm -f $out/lib/ghc-*/bin/ghc-iserv-prof + # Hydra will redistribute this derivation, so we have to keep the docs for + # legal reasons (retaining the legal notices etc) + # As a last resort we could unpack the docs separately and symlink them in. + # They're in $out/share/{doc,man}. + '' + # Recache package db which needs to happen for Hadrian bindists + # where we modify the package db before installing + + '' + "$out/bin/ghc-pkg" --package-db="$out/lib/"ghc-*/package.conf.d recache + ''; + + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + + doInstallCheck = true; + installCheckPhase = '' + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + env -i $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { + targetPrefix = ""; + enableShared = true; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = rec { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + license = lib.licenses.bsd3; + # HACK: since we can't encode the libc / abi in platforms, we need + # to make the platform list dependent on the evaluation platform + # in order to avoid eval errors with musl which supports less + # platforms than the default libcs (i. e. glibc / libSystem). + # This is done for the benefit of Hydra, so `packagePlatforms` + # won't return any platforms that would cause an evaluation + # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as + # long as the evaluator runs on a platform that supports + # `pkgsMusl`. + platforms = builtins.attrNames ghcBinDists.${distSetName}; + hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; + maintainers = lib.teams.haskell.members; + }; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 79815b65f60..68a32309956 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -8,6 +8,8 @@ let "ghc8102BinaryMinimal" "ghc8107Binary" "ghc8107BinaryMinimal" + "ghc922Binary" + "ghc922BinaryMinimal" "ghcjs" "ghcjs810" "integer-simple" @@ -76,6 +78,14 @@ in { minimal = true; }; + ghc922Binary = callPackage ../development/compilers/ghc/9.2.2-binary.nix { + llvmPackages = pkgs.llvmPackages_12; + }; + ghc922BinaryMinimal = callPackage ../development/compilers/ghc/9.2.2-binary.nix { + llvmPackages = pkgs.llvmPackages_12; + minimal = true; + }; + ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { bootPkgs = # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar @@ -212,6 +222,18 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; packageSetConfig = bootstrapPackageSet; }; + ghc922Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc922Binary; + ghc = bh.compiler.ghc922Binary; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; + packageSetConfig = bootstrapPackageSet; + }; + ghc922BinaryMinimal = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc922BinaryMinimal; + ghc = bh.compiler.ghc922BinaryMinimal; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; + packageSetConfig = bootstrapPackageSet; + }; ghc884 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc884; ghc = bh.compiler.ghc884; From 4d21bcc49f14b14b468f46b37c883677407114c9 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 26 Jun 2022 13:51:32 +0200 Subject: [PATCH 44/59] bsp-layout: remove devins2518 as a maintainer --- pkgs/tools/misc/bsp-layout/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/tools/misc/bsp-layout/default.nix index c241eac0d19..48f68bebe6c 100644 --- a/pkgs/tools/misc/bsp-layout/default.nix +++ b/pkgs/tools/misc/bsp-layout/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/phenax/bsp-layout"; license = licenses.mit; - maintainers = with maintainers; [ devins2518 totoroot ]; + maintainers = with maintainers; [ totoroot ]; platforms = platforms.linux; }; } From 53c202dc53b81d88227ba2c60455c47a24dd24d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Fri, 24 Jun 2022 23:53:39 +0200 Subject: [PATCH 45/59] pixelorama: init at 0.10.1 --- .../editors/pixelorama/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/editors/pixelorama/default.nix diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix new file mode 100644 index 00000000000..9846d10491c --- /dev/null +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchFromGitHub, godot-headless, godot-export-templates }: + +let + preset = + if stdenv.isLinux then + if stdenv.is64bit then "Linux/X11 64-bit" + else "Linux/X11 32-bit" + else if stdenv.isDarwin then "Mac OSX" + else throw "unsupported platform"; +in stdenv.mkDerivation rec { + pname = "pixelorama"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "Orama-Interactive"; + repo = "Pixelorama"; + rev = "v${version}"; + sha256 = "sha256-+Sfhv66skHawe6jzfzQyFxejN5TvTdmWunzl0/7yy4M="; + }; + + nativeBuildInputs = [ + godot-headless + ]; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + mkdir -p $HOME/.local/share/godot/ + ln -s "${godot-export-templates}/share/godot/templates" "$HOME/.local/share/godot/templates" + mkdir -p build + godot-headless -v --export "${preset}" ./build/pixelorama + godot-headless -v --export-pack "${preset}" ./build/pixelorama.pck + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D -m 755 -t $out/libexec ./build/pixelorama + install -D -m 644 -t $out/libexec ./build/pixelorama.pck + install -D -m 644 -t $out/share/applications ./Misc/Linux/com.orama_interactive.Pixelorama.desktop + install -d -m 755 $out/bin + ln -s $out/libexec/pixelorama $out/bin/pixelorama + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://orama-interactive.itch.io/pixelorama"; + description = "A free & open-source 2D sprite editor, made with the Godot Engine!"; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ felschr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da373b207d7..281811cc459 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27321,6 +27321,8 @@ with pkgs; pixelnuke = callPackage ../applications/graphics/pixelnuke { }; + pixelorama = callPackage ../applications/editors/pixelorama { }; + pixeluvo = callPackage ../applications/graphics/pixeluvo { }; pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; From 899a6c99cdcd043028146f67de38726fb662ba77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jun 2022 12:39:25 +0000 Subject: [PATCH 46/59] python310Packages.casbin: 1.16.6 -> 1.16.8 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 6350fda9650..cc840630607 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.16.6"; + version = "1.16.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-i7XwB1qV2WQD1dWxi4ncXsAwGUR5tWQhp+Z/jVvv1oo="; + sha256 = "sha256-l98QfrRg7ghZ+jT9J2BNILUcinOKwhpnIMS+W8NQFr4="; }; propagatedBuildInputs = [ From cdecf66640f2bec6f6cb41dea0c06d416bd8a902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Fri, 24 Jun 2022 23:03:04 +0200 Subject: [PATCH 47/59] ldtk: init at 1.1.3 --- pkgs/applications/editors/ldtk/default.nix | 58 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/editors/ldtk/default.nix diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix new file mode 100644 index 00000000000..175026440da --- /dev/null +++ b/pkgs/applications/editors/ldtk/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, unzip +, appimage-run }: + +stdenv.mkDerivation rec { + pname = "ldtk"; + version = "1.1.3"; + + src = fetchurl { + url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip"; + sha256 = "sha256-qw7+4k4IH2+9DX4ny8EBbSlyXBrk/y91W04+zWPGupk="; + }; + + nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; + + buildInputs = [ appimage-run ]; + + unpackPhase = '' + runHook preUnpack + + unzip $src + appimage-run -x src 'LDtk ${version} installer.AppImage' + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 'LDtk ${version} installer.AppImage' $out/share/ldtk.AppImage + makeWrapper ${appimage-run}/bin/appimage-run $out/bin/ldtk \ + --add-flags $out/share/ldtk.AppImage + install -Dm644 src/ldtk.png $out/share/icons/hicolor/1024x1024/apps/ldtk.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ldtk"; + exec = "ldtk"; + icon = "ldtk"; + terminal = false; + desktopName = "LDtk"; + comment = "2D level editor"; + categories = [ "Utility" ]; + mimeTypes = [ "application/json" ]; + }) + ]; + + meta = with lib; { + homepage = "https://ldtk.io/"; + description = "Modern, lightweight and efficient 2D level editor"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ felschr ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da373b207d7..71b431666c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3923,6 +3923,8 @@ with pkgs; languagetool = callPackage ../tools/text/languagetool { }; + ldtk = callPackage ../applications/editors/ldtk { }; + lepton = callPackage ../tools/graphics/lepton { }; lepton-eda = callPackage ../applications/science/electronics/lepton-eda { }; From ec996b2d0ce827fe4f046a9c29401092767f62ba Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Jun 2022 04:07:33 +0200 Subject: [PATCH 48/59] =?UTF-8?q?malcontent:=200.10.4=20=E2=86=92=200.10.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just translations: https://gitlab.freedesktop.org/pwithnall/malcontent/-/compare/0.10.4...0.10.5 --- pkgs/development/libraries/malcontent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 791fae96f0f..4154f0315cd 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.10.4"; + version = "0.10.5"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "sha256-s2wQLb3tCfO3p8yYG8Nc6pu+y2TLfrmo7Ug1LgDLEdw="; + sha256 = "sha256-UPKAStB6wTd3qbbISHMgNw1bJjIRgn89tHnsw4ZptvQ="; }; patches = [ From ee491c539338c64c4311134d0505967cccfb0062 Mon Sep 17 00:00:00 2001 From: HeHongbo Date: Sun, 26 Jun 2022 22:54:22 +0800 Subject: [PATCH 49/59] drone: 2.12.0 -> 2.12.1 --- .../tools/continuous-integration/drone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index d043f25f455..313099d45e0 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,9 +3,9 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.12.0"; + version = "2.12.1"; - vendorSha256 = "sha256-y9knuU/+hkXBLgMmJ5Trp0A3lEiLC1I2Dh85/CFBXow="; + vendorSha256 = "sha256-hKJFYjIJVuGBiSIeTitI7kZdGjSRUTCPMhH72O0wm3I="; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-Bpv08iD0wRiscwNE8TIBgZMlChQFQEegbjkzDv4mIYU="; + sha256 = "sha256-ZngZzpFjQLkiBDNrmgPXPCfDoeZbX/ynBXkuNrrGz3E="; }; tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ]; From 676188646f681f142fddc30f74b2c32591a0671d Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 27 Jun 2022 00:01:57 +0900 Subject: [PATCH 50/59] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 9 +++++++++ .../transitive-broken.yaml | 1 + .../haskell-modules/hackage-packages.nix | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index aa4a3fc2790..6c882587c57 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -358,6 +358,7 @@ broken-packages: - binary-derive - binary-ext - binary-indexed-tree + - binary-io - binary-protocol - binary-tree - binary-typed @@ -366,6 +367,7 @@ broken-packages: - bindings-apr - bindings-bfd - bindings-cctools + - bindings-common - bindings-dc1394 - bindings-eskit - bindings-EsounD @@ -1777,6 +1779,7 @@ broken-packages: - goatee - gochan - godot-haskell + - godot-megaparsec - gofer-prelude - gogol-core - gooey @@ -2332,6 +2335,7 @@ broken-packages: - houseman - hp2any-core - hpack-convert + - hpapi - hpasteit - HPath - hpc-coveralls @@ -2705,6 +2709,7 @@ broken-packages: - IsNull - iso8601-duration - isobmff + - isomorphism-class - isotope - itcli - itemfield @@ -2868,6 +2873,7 @@ broken-packages: - lambdabot-utils - lambdabot-xmpp - lambda-bridge + - lambda-calculator - lambda-canvas - lambdacms-core - lambda-cube @@ -4155,6 +4161,7 @@ broken-packages: - quenya-verb - querystring-pickle - questioner + - quibble-core - QuickAnnotate - quickcheck-arbitrary-template - quickcheck-property-comb @@ -5831,7 +5838,9 @@ broken-packages: - zendesk-api - zeno - zeolite-lang + - zeromq4-clone-pattern - zeromq4-conduit + - zeromq4-patterns - zeromq-haskell - zettelkast - ZFS diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index bfbf5057955..fe20afdc4e7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3810,6 +3810,7 @@ dont-distribute-packages: - test-simple - testbench - text-all + - text-builder-dev_0_3_3 - text-generic-pretty - text-json-qq - text-locale-encoding diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3edcceea335..706c6a36ee2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -42605,6 +42605,8 @@ self: { ]; description = "Read and write values of types that implement Binary"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "binary-list" = callPackage @@ -43181,6 +43183,8 @@ self: { libraryHaskellDepends = [ base ]; description = "This package is obsolete. Look for bindings-DSL instead."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bindings-dc1394" = callPackage @@ -113675,7 +113679,9 @@ self: { executableHaskellDepends = [ base criterion megaparsec text ]; description = "Megaparsec parser for Godot `tscn` and `gdextension` files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "bench"; + broken = true; }) {}; "gofer-prelude" = callPackage @@ -142142,6 +142148,8 @@ self: { description = "Binding for the PAPI library"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) papi;}; "hpaste" = callPackage @@ -160572,6 +160580,8 @@ self: { ]; description = "Isomorphism typeclass solving the conversion problem"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "isotope" = callPackage @@ -167987,7 +167997,9 @@ self: { ]; description = "A lambda calculus interpreter"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "lambda-calculator"; + broken = true; }) {}; "lambda-calculus-interpreter" = callPackage @@ -229133,6 +229145,8 @@ self: { ]; description = "Convenient SQL query language for Haskell (but only for single tables)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "quic" = callPackage @@ -310921,7 +310935,9 @@ self: { ]; description = "Haskell implementation of the ZeroMQ clone pattern"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-clone-pattern-exe"; + broken = true; }) {}; "zeromq4-conduit" = callPackage @@ -310986,7 +311002,9 @@ self: { ]; description = "Haskell implementation of several ZeroMQ patterns"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-patterns-exe"; + broken = true; }) {}; "zeromq4-simple" = callPackage From ca12710b06449ce3910284ac4c5ff861bddcd4b2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 26 Jun 2022 17:11:35 +0200 Subject: [PATCH 51/59] extra-container: 0.8 -> 0.10 --- .../virtualization/extra-container/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index dad7a3d1be7..a3d185a0099 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "extra-container"; - version = "0.8"; + version = "0.10"; src = fetchFromGitHub { owner = "erikarvstedt"; repo = pname; rev = version; - hash = "sha256-/AetqDPkz32JMdjbSdzZCBVmGbvzjeAb8Wv82iTgHFE="; + hash = "sha256-vtCZ0w1Kaiw9bIrzwEb4Jnv7QoQLp8JDjaGmAP91hpE="; }; buildCommand = '' @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { install $src/eval-config.nix -Dt $share # Use existing PATH for systemctl and machinectl - scriptPath="export PATH=${lib.makeBinPath [ nixos-container openssh ]}:\$PATH" + scriptPath="export PATH=${lib.makeBinPath [ openssh ]}:\$PATH" - sed -i \ - -e "s|evalConfig=.*|evalConfig=$share/eval-config.nix|" \ - -e "s|LOCALE_ARCHIVE=.*|LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive|" \ - -e "2i$scriptPath" \ - $out/bin/extra-container + sed -i " + s|evalConfig=.*|evalConfig=$share/eval-config.nix| + s|LOCALE_ARCHIVE=.*|LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive| + 2i$scriptPath + 2inixosContainer=${nixos-container}/bin + " $out/bin/extra-container ''; meta = with lib; { From bb5ec4625ac3237631c7a0957c78cc79735fd2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 26 Jun 2022 11:25:57 -0300 Subject: [PATCH 52/59] nixos/thunar: init - Add a module for the thunar file manager, which depends on the xfconf dbus service, and also has a dbus service and a systemd unit. - Renames the option services.xserver.desktopManager.xfce.thunarPlugins to programs.thunar.plugins. --- .../doc/manual/configuration/xfce.chapter.md | 11 +++-- .../from_md/configuration/xfce.chapter.xml | 14 ++++-- .../from_md/release-notes/rl-2211.section.xml | 12 +++++ .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/thunar.nix | 44 +++++++++++++++++++ .../services/x11/desktop-managers/xfce.nix | 20 ++++----- 7 files changed, 85 insertions(+), 19 deletions(-) create mode 100644 nixos/modules/programs/thunar.nix diff --git a/nixos/doc/manual/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md index b0ef6682aae..ee60d465e3b 100644 --- a/nixos/doc/manual/configuration/xfce.chapter.md +++ b/nixos/doc/manual/configuration/xfce.chapter.md @@ -24,11 +24,16 @@ Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your [](#opt-environment.systemPackages) from `pkgs.xfce`. -## Thunar Plugins {#sec-xfce-thunar-plugins .unnumbered} +## Thunar {#sec-xfce-thunar-plugins .unnumbered} + +Thunar (the Xfce file manager) is automatically enabled when Xfce is +enabled. To enable Thunar without enabling Xfce, use the configuration +option [](#opt-programs.thunar.enable) instead of simply adding +`pkgs.xfce.thunar` to [](#opt-environment.systemPackages). If you\'d like to add extra plugins to Thunar, add them to -[](#opt-services.xserver.desktopManager.xfce.thunarPlugins). -You shouldn\'t just add them to [](#opt-environment.systemPackages). +[](#opt-programs.thunar.plugins). You shouldn\'t just add them to +[](#opt-environment.systemPackages). ## Troubleshooting {#sec-xfce-troubleshooting .unnumbered} diff --git a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml index f96ef2e8c48..42e70d1d81d 100644 --- a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml @@ -27,12 +27,18 @@ services.picom = { pkgs.xfce.
- Thunar Plugins + Thunar + + Thunar (the Xfce file manager) is automatically enabled when Xfce + is enabled. To enable Thunar without enabling Xfce, use the + configuration option + instead of simply adding pkgs.xfce.thunar to + . + If you'd like to add extra plugins to Thunar, add them to - . - You shouldn't just add them to - . + . You shouldn't just + add them to .
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 53233754f00..1ccf6cfd92a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -299,6 +299,18 @@ as coreboot’s fork is no longer available. + + + There is a new module for the thunar + program (the Xfce file manager), which depends on the + xfconf dbus service, and also has a dbus + service and a systemd unit. The option + services.xserver.desktopManager.xfce.thunarPlugins + has been renamed to + programs.thunar.plugins, and in a future + release it may be removed. + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index abe0c7bdeaa..d39c57eb6d4 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -114,4 +114,6 @@ Use `configure.packages` instead. - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available. +- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed. + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c1e41c8951c..b757e05edce 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -217,6 +217,7 @@ ./programs/sway.nix ./programs/system-config-printer.nix ./programs/thefuck.nix + ./programs/thunar.nix ./programs/tmux.nix ./programs/traceroute.nix ./programs/tsm-client.nix diff --git a/nixos/modules/programs/thunar.nix b/nixos/modules/programs/thunar.nix new file mode 100644 index 00000000000..343f8469867 --- /dev/null +++ b/nixos/modules/programs/thunar.nix @@ -0,0 +1,44 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.programs.thunar; + +in { + meta = { + maintainers = teams.xfce.members; + }; + + options = { + programs.thunar = { + enable = mkEnableOption "Thunar, the Xfce file manager"; + + plugins = mkOption { + default = []; + type = types.listOf types.package; + description = "List of thunar plugins to install."; + example = literalExpression "with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]"; + }; + + }; + }; + + config = mkIf cfg.enable ( + let package = pkgs.xfce.thunar.override { thunarPlugins = cfg.plugins; }; + + in { + environment.systemPackages = [ + package + ]; + + services.dbus.packages = [ + package + pkgs.xfce.xfconf + ]; + + systemd.packages = [ + package + ]; + } + ); +} diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 88b21e59aaa..3c2dac386f5 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -36,6 +36,12 @@ in [ "services" "xserver" "desktopManager" "xfce" "extraSessionCommands" ] [ "services" "xserver" "displayManager" "sessionCommands" ]) (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "") + + # added 2022-06-26 + # thunar has its own module + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "xfce" "thunarPlugins" ] + [ "programs" "thunar" "plugins" ]) ]; options = { @@ -46,15 +52,6 @@ in description = "Enable the Xfce desktop environment."; }; - thunarPlugins = mkOption { - default = []; - type = types.listOf types.package; - example = literalExpression "[ pkgs.xfce.thunar-archive-plugin ]"; - description = '' - A list of plugin that should be installed with Thunar. - ''; - }; - noDesktop = mkOption { type = types.bool; default = false; @@ -110,8 +107,6 @@ in xfce4-settings xfce4-taskmanager xfce4-terminal - - (thunar.override { thunarPlugins = cfg.thunarPlugins; }) ] # TODO: NetworkManager doesn't belong here ++ optional config.networking.networkmanager.enable networkmanagerapplet ++ optional config.powerManagement.enable xfce4-power-manager @@ -130,6 +125,8 @@ in xfdesktop ] ++ optional cfg.enableScreensaver xfce4-screensaver; + programs.thunar.enable = true; + environment.pathsToLink = [ "/share/xfce4" "/lib/xfce4" @@ -170,7 +167,6 @@ in # Systemd services systemd.packages = with pkgs.xfce; [ - (thunar.override { thunarPlugins = cfg.thunarPlugins; }) xfce4-notifyd ]; From ef0f060348ca0732c3d241ff869f1f2e111a1c2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jun 2022 16:11:26 +0000 Subject: [PATCH 53/59] python310Packages.types-tabulate: 0.8.10 -> 0.8.11 --- pkgs/development/python-modules/types-tabulate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 13f7453a8fc..dd3a6b461c7 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.10"; + version = "0.8.11"; src = fetchPypi { inherit pname version; - hash = "sha256-BmdTn8ZjMKJdqmtOUtSUt4Niip/tVKP/MVB23NFaHs0="; + hash = "sha256-F6X6O1ykU4FXePyYZejs0BGLB7K5+v8+Kwb+RIF03V4="; }; # Module doesn't have tests From 019bb41bdce273a06de38cf81420dc3fcd775ec9 Mon Sep 17 00:00:00 2001 From: Christian Bourjau Date: Thu, 23 Jun 2022 23:45:43 +0200 Subject: [PATCH 54/59] cli11: 1.9.1 -> 2.2.0 Major release needed for the latest `micromamba` release. Breaking changes are few, though: https://github.com/CLIUtils/CLI11/blob/main/CHANGELOG.md Also add catch2 which is required for compiling and running the tests --- pkgs/development/tools/misc/cli11/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index dbab7c880ef..67cdfb2c68e 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -1,35 +1,30 @@ -{ - lib, stdenv, - fetchFromGitHub, - cmake, - gtest, - python3, - boost +{ lib +, stdenv +, fetchFromGitHub +, boost +, catch2 +, cmake +, gtest +, python3 }: stdenv.mkDerivation rec { pname = "cli11"; - version = "1.9.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "0hbch0vk8irgmiaxnfqlqys65v1770rxxdfn3d23m2vqyjh0j9l6"; + sha256 = "sha256-emTIaoUyTINbAAn9tw1r3zLTQt58N8A1zoP+0y41yKo="; }; nativeBuildInputs = [ cmake ]; - checkInputs = [ boost python3 ]; + checkInputs = [ boost python3 catch2 ]; doCheck = true; - preConfigure = '' - rm -rfv extern/googletest - ln -sfv ${gtest.src} extern/googletest - sed -i '/TrueFalseTest/d' tests/CMakeLists.txt - ''; - meta = with lib; { description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; From fcc334d7d65c9cdf9d5d53f080dd5e45f98f4882 Mon Sep 17 00:00:00 2001 From: Christian Bourjau Date: Thu, 23 Jun 2022 23:51:01 +0200 Subject: [PATCH 55/59] micromamba: 0.22.0 -> 0.24.0 Update of micromamba only contains bugfixes and improvements: https://github.com/mamba-org/mamba/blob/master/CHANGELOG.md The build dependencies now include `python3`, `tl-expected` and `cli11>=2.2`. --- .../package-management/micromamba/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 1f95e41e610..70443695e0f 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake -, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc, spdlog, termcolor, ghc_filesystem +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cli11 +, cmake +, curl +, ghc_filesystem +, libarchive +, libsolv +, libyamlcpp +, nlohmann_json +, python3 +, reproc +, spdlog +, termcolor +, tl-expected }: let @@ -9,7 +24,8 @@ let ]; patches = [ - # Patch added by the mamba team + # Apply the same patch as in the "official" boa-forge build: + # https://github.com/mamba-org/boa-forge/tree/master/libsolv (fetchpatch { url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/conda_variant_priorization.patch"; sha256 = "1iic0yx7h8s662hi2jqx68w5kpyrab4fr017vxd4wyxb6wyk35dd"; @@ -28,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - sha256 = "sha256-9/vkn8wks2nyzIn5hnK+zvX18Du2B8YZ3/ugrmEGVH8="; + sha256 = "sha256-CszDmt3SElHo1D2sNy2tPhZ43YD3pDjT8+fp2PVk+7Y="; }; nativeBuildInputs = [ cmake ]; @@ -50,6 +66,8 @@ stdenv.mkDerivation rec { spdlog' termcolor ghc_filesystem + python3 + tl-expected ]; cmakeFlags = [ From e99c8429400555044c13d0bd39bd6fc945119468 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jun 2022 16:34:23 +0000 Subject: [PATCH 56/59] python310Packages.gdown: 4.5.0 -> 4.5.1 --- pkgs/development/python-modules/gdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index d18bcfe1f11..3368706c8c1 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.5.0"; + version = "4.5.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rJ7CoZDOl+cW1FsPzkE7+AiBSpzDD9J8RkiQW25Xkno="; + sha256 = "sha256-ghcGEGPYr8qtnY4tVBD7wJicKz8JRqa9m/65RhYWzGo="; }; propagatedBuildInputs = [ From 0cf6e38a676db1aad8ce0559949b6f3868f84798 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Jun 2022 19:00:00 +0200 Subject: [PATCH 57/59] python310Packages.types-setuptools: 57.4.17 -> 57.4.18 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 1114b06157a..28c29d0c5de 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.17"; + version = "57.4.18"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nVVvyvaAihzq1KqkHlwHph8BUqh1gR4SOXOOuk4LexY="; + sha256 = "sha256-juA9gj/n/aC9Nfrq4z01y1wltJcmPmpYs0xM/QX0C88="; }; # Module doesn't have tests From 1a32663efcdb2742c440419ee73b6626ae02f5aa Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 26 Jun 2022 19:12:18 +0200 Subject: [PATCH 58/59] treewide: rename maintainer `earvstedt` -> `erikarvstedt` The maintainer name now matches the Github username, which simplifies maintainer notifications. --- maintainers/maintainer-list.nix | 2 +- nixos/modules/services/misc/paperless.nix | 2 +- nixos/tests/containers-custom-pkgs.nix | 2 +- nixos/tests/paperless.nix | 2 +- pkgs/applications/blockchains/btcpayserver/default.nix | 2 +- pkgs/applications/blockchains/nbxplorer/default.nix | 2 +- pkgs/applications/graphics/tesseract/tesseract3.nix | 2 +- pkgs/applications/graphics/tesseract/tesseract4.nix | 2 +- pkgs/applications/office/paperless-ngx/default.nix | 2 +- pkgs/development/python-modules/djangoql/default.nix | 2 +- pkgs/development/python-modules/filemagic/default.nix | 2 +- pkgs/development/python-modules/fuzzywuzzy/default.nix | 2 +- pkgs/development/python-modules/inotify-simple/default.nix | 2 +- pkgs/development/python-modules/langdetect/default.nix | 2 +- pkgs/development/python-modules/pdftotext/default.nix | 2 +- pkgs/development/python-modules/pytest-env/default.nix | 2 +- pkgs/development/python-modules/python-dotenv/default.nix | 2 +- pkgs/tools/backup/rsbep/default.nix | 2 +- pkgs/tools/virtualization/extra-container/default.nix | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 88ad688b9de..8ca06ace337 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3518,7 +3518,7 @@ githubId = 424946; name = "James Earl Douglas"; }; - earvstedt = { + erikarvstedt = { email = "erik.arvstedt@gmail.com"; matrix = "@erikarvstedt:matrix.org"; github = "erikarvstedt"; diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index bfaf842fb46..17cd555d7e1 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -83,7 +83,7 @@ let }; in { - meta.maintainers = with maintainers; [ earvstedt Flakebi ]; + meta.maintainers = with maintainers; [ erikarvstedt Flakebi ]; imports = [ (mkRenamedOptionModule [ "services" "paperless-ng" ] [ "services" "paperless" ]) diff --git a/nixos/tests/containers-custom-pkgs.nix b/nixos/tests/containers-custom-pkgs.nix index 9894e664376..e8740ac6313 100644 --- a/nixos/tests/containers-custom-pkgs.nix +++ b/nixos/tests/containers-custom-pkgs.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let in { name = "containers-custom-pkgs"; meta = { - maintainers = with lib.maintainers; [ adisbladis earvstedt ]; + maintainers = with lib.maintainers; [ adisbladis erikarvstedt ]; }; nodes.machine = { config, ... }: { diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix index 51fe7c20785..12883cd62c6 100644 --- a/nixos/tests/paperless.nix +++ b/nixos/tests/paperless.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ lib, ... }: { name = "paperless"; - meta.maintainers = with lib.maintainers; [ earvstedt Flakebi ]; + meta.maintainers = with lib.maintainers; [ erikarvstedt Flakebi ]; nodes.machine = { pkgs, ... }: { environment.systemPackages = with pkgs; [ imagemagick jq ]; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index f93a8f329ef..59879df6167 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -26,7 +26,7 @@ buildDotnetModule rec { meta = with lib; { description = "Self-hosted, open-source cryptocurrency payment processor"; homepage = "https://btcpayserver.org"; - maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 4d684f6a935..3810d6f2251 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -22,7 +22,7 @@ buildDotnetModule rec { meta = with lib; { description = "Minimalist UTXO tracker for HD Cryptocurrency Wallets"; - maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 0e5f38ae791..16365674706 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ viric earvstedt ]; + maintainers = with lib.maintainers; [ viric erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index d1f936fab07..36c4c694a16 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ viric earvstedt ]; + maintainers = with lib.maintainers; [ viric erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 18b22217004..75bc494d3a8 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -196,6 +196,6 @@ py.pkgs.pythonPackages.buildPythonApplication rec { description = "A supercharged version of paperless: scan, index, and archive all of your physical documents"; homepage = "https://paperless-ngx.readthedocs.io/en/latest/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lukegb gador earvstedt ]; + maintainers = with maintainers; [ lukegb gador erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index f0550a296aa..0e38c82cab7 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Advanced search language for Django"; homepage = "https://github.com/ivelum/djangoql"; license = licenses.mit; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix index ef8f6933e8f..96ee0a95b28 100644 --- a/pkgs/development/python-modules/filemagic/default.nix +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -25,6 +25,6 @@ buildPythonPackage { description = "File type identification using libmagic"; homepage = "https://github.com/aliles/filemagic"; license = licenses.asl20; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 0bcf8efc359..9059ba977b7 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { description = "Fuzzy string matching for Python"; homepage = "https://github.com/seatgeek/fuzzywuzzy"; license = licenses.gpl2; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index fe5f8ae9f11..8fdc7c4926c 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "A simple Python wrapper around inotify"; homepage = "https://github.com/chrisjbillington/inotify_simple"; license = licenses.bsd2; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix index 2b9f87fdd81..4eab3bd06e5 100644 --- a/pkgs/development/python-modules/langdetect/default.nix +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python port of Google's language-detection library"; homepage = "https://github.com/Mimino666/langdetect"; license = licenses.asl20; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index 4e1ea3622e8..efb26fa4955 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "Simple PDF text extraction"; homepage = "https://github.com/jalan/pdftotext"; license = licenses.mit; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 3e2fb0a05dc..72df18c8847 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "Pytest plugin used to set environment variables"; homepage = "https://github.com/MobileDynasty/pytest-env"; license = licenses.mit; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index d1b5d632b30..a805c3e6c62 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Add .env support to your django/flask apps in development and deployments"; homepage = "https://github.com/theskumar/python-dotenv"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix index 7f59b0af944..b30ddddb2b0 100644 --- a/pkgs/tools/backup/rsbep/default.nix +++ b/pkgs/tools/backup/rsbep/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Create resilient backups with Reed-Solomon error correction and byte-spreading"; homepage = "https://www.thanassis.space/rsbep.html"; license = licenses.gpl3Plus; - maintainers = [ maintainers.earvstedt ]; + maintainers = [ maintainers.erikarvstedt ]; }; } diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index a3d185a0099..eee1baca28a 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/erikarvstedt/extra-container"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.earvstedt ]; + maintainers = [ maintainers.erikarvstedt ]; }; } From b32c2a712bcda04ef8c4abbd28c8dde0cb80e972 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jun 2022 11:42:43 +0000 Subject: [PATCH 59/59] python310Packages.bimmer-connected: 0.9.6 -> 0.10.0 --- pkgs/development/python-modules/bimmer-connected/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 3aa2733ce10..5f494308ecf 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.9.6"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.6";