From d2990717f165acba5817d20f332159c797fad508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 29 May 2022 21:53:19 +0200 Subject: [PATCH 01/26] CONTRIBUTING.md: simplify rebasing instructions Makes the instructions easier to remember (and type) using the `git rebase --onto A...B` syntax to find the merge base between A and B (which has been in git for at least 10 years). We also assume that the merge base between staging and master is also the merge base between staging and the current branch (since it is based on master), and giving master as the branch makes git consider the commits in the current branch that are not in master, so there's no need to compute the merge base between master and the current branch. In the same spirit of discouraging copy-and-paste, use a placeholder name for the current branch instead of `$(git branch --show-current)`. --- CONTRIBUTING.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46e3ea5b2240..0268d640a9a2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,25 +62,26 @@ many CODEOWNERS will be inadvertently requested for review. To achieve this, rebasing should not be performed directly on the target branch, but on the merge base between the current and target branch. -In the following example, we see a rebase from `master` onto the merge base -between `master` and `staging`, so that a change can eventually be retargeted to -`staging`. The example uses `upstream` as the remote for `NixOS/nixpkgs.git` -while the `origin` remote is used for the remote you are pushing to. +In the following example, we assume that the current branch, called `feature`, +is based on `master`, and we rebase it onto the merge base between +`master` and `staging` so that the PR can eventually be retargeted to +`staging` without causing a mess. The example uses `upstream` as the remote for `NixOS/nixpkgs.git` +while `origin` is the remote you are pushing to. ```console -# Find the common base between two branches -common=$(git merge-base upstream/master upstream/staging) -# Find the common base between your feature branch and master -commits=$(git merge-base $(git branch --show-current) upstream/master) -# Rebase all commits onto the common base -git rebase --onto=$common $commits +# Rebase your commits onto the common merge base +git rebase --onto upstream/staging... upstream/master # Force push your changes -git push origin $(git branch --show-current) --force-with-lease +git push origin feature --force-with-lease ``` +The syntax `upstream/staging...` is equivalent to `upstream/staging...HEAD` and +stands for the merge base between `upstream/staging` and `HEAD` (hence between +`upstream/staging` and `upstream/master`). + Then change the base branch in the GitHub PR using the *Edit* button in the upper -right corner, and switch from `master` to `staging`. After the PR has been +right corner, and switch from `master` to `staging`. *After* the PR has been retargeted it might be necessary to do a final rebase onto the target branch, to resolve any outstanding merge conflicts. @@ -90,7 +91,7 @@ git rebase upstream/staging # Review and fixup possible conflicts git status # Force push your changes -git push origin $(git branch --show-current) --force-with-lease +git push origin feature --force-with-lease ``` ## Backporting changes From 735450e173f8e532d21e4e81ea377b40b04970ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 09:57:22 +0000 Subject: [PATCH 02/26] gnomeExtensions.arcmenu: 30 -> 35 --- pkgs/desktops/gnome/extensions/arcmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index be4738286794..74207e5bafe2 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "30"; + version = "35"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-BKV1x/MBqVeiqFzpXYt3y8zwK4f5rcGBwFZWqSSUarg="; + sha256 = "sha256-q869UCnekCHBbB0aGNmHl8Ln32hRWHLddu3oqIUinwo="; }; patches = [ From 82edfabb2909f52949584a94d4577531d25287d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 00:52:09 +0000 Subject: [PATCH 03/26] nss_wrapper: 1.1.11 -> 1.1.12 --- pkgs/development/libraries/nss_wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index a4538aa370cc..a6974295690e 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nss_wrapper"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; - sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; + sha256 = "sha256-zdBg/wnAO32i0wsMta00dSNNQ4rqJ5A9slwvFvVwIYY="; }; nativeBuildInputs = [ cmake pkg-config ]; From 99872acdebe5a7799b8e02b9cbeaa3e078a79b8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 05:28:59 +0000 Subject: [PATCH 04/26] phoronix-test-suite: 10.8.2 -> 10.8.4 --- pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index d6171bda5d8a..1456cb4b142f 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.8.2"; + version = "10.8.4"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-hmgTQ9IEFYMasW72w9HDF+I0XncZJeBpiukgoDqeqrY="; + sha256 = "sha256-HyCS1TbAoxk+/FPkpQ887mXA7xp40x5UBPHGY//3t/Q="; }; buildInputs = [ php ]; From 1369d3edb72fa17967a0ac465bca6774fc9a6137 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Aug 2022 12:58:53 +0200 Subject: [PATCH 05/26] MMA: 20.12 -> 21.09 --- pkgs/applications/audio/MMA/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 3034de750cf9..8f54e6e29710 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, python3, alsa-utils, timidity }: - stdenv.mkDerivation rec { - version = "20.12"; +stdenv.mkDerivation rec { + version = "21.09"; pname = "mma"; src = fetchurl { url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; - sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732"; + sha256 = "sha256-5YzdaZ499AGiKAPUsgBCj3AQ9s0WlfgAbHhOQSOLLO8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -38,8 +38,7 @@ cp util/mup2mma.py $out/bin/mup2mma cp util/pg2mma.py $out/bin/pg2mma cp util/synthsplit.py $out/bin/mma-synthsplit - cp -r {docs,egs,includes,lib,MMA,text} $out/share/mma - rmdir $out/share/mma/includes/aria + cp -r {docs,egs,includes,lib,MMA,text,plugins} $out/share/mma cp util/README.* $out/share/mma/docs mv $out/share/mma/docs/man/mma-libdoc.8 $out/share/man/man8 @@ -61,8 +60,9 @@ ''; meta = { - description = "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords"; - homepage = "https://www.mellowood.ca/mma/index.html"; + description = + "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords"; + homepage = "https://www.mellowood.ca/mma/index.html"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; From 40ba925d3ebda1e91a24feed00ffd75a0356215a Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Mon, 8 Aug 2022 21:07:30 +0100 Subject: [PATCH 06/26] wails: 2.0.0-beta.42 -> 2.0.0-beta.43 --- pkgs/development/tools/wails/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 2ff94ae2d744..97848a72d122 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -9,22 +9,21 @@ , gtk3 , webkitgtk , nodejs -, upx , zlib }: buildGoModule rec { pname = "wails"; - version = "2.0.0-beta.42"; + version = "2.0.0-beta.43"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZfzaDUUM3W2ZvmLJufeVZ3eK/grvSxbKbsReV7BmcGA="; + sha256 = "sha256-IX60xXU1sV39EI2nC/oL+s/RfE0apSJ2nMza6Av864I="; } + "/v2"; - vendorSha256 = "sha256-qmj7pZV9VaxWcC7EgbKZOjlDj6/66Qf5d222aj4TViw="; + vendorSha256 = "sha256-KB6fzyeeHCl164ZnDIy9auUC7Qzm8rVMo3XxXbeYCgY="; proxyVendor = true; @@ -49,7 +48,6 @@ buildGoModule rec { gtk3 webkitgtk nodejs - upx ]; ldflags = [ @@ -60,7 +58,7 @@ buildGoModule rec { # As Wails calls a compiler, certain apps and libraries need to be made available. postFixup = '' wrapProgram $out/bin/wails \ - --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs upx ]} \ + --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" From 10a43777e05970d00ce6b02de161d9d877f88ee5 Mon Sep 17 00:00:00 2001 From: "M. A" Date: Tue, 9 Aug 2022 12:47:43 +0000 Subject: [PATCH 07/26] snipe-it: 6.0.8 -> 6.0.9 https://github.com/snipe/snipe-it/releases/tag/v6.0.9 --- pkgs/servers/web-apps/snipe-it/default.nix | 4 +- .../web-apps/snipe-it/php-packages.nix | 346 +++++++++--------- 2 files changed, 170 insertions(+), 180 deletions(-) diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index 9da05a269c4f..031b9f10f33b 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -18,13 +18,13 @@ let in package.override rec { pname = "snipe-it"; - version = "6.0.8"; + version = "6.0.9"; src = fetchFromGitHub { owner = "snipe"; repo = pname; rev = "v${version}"; - sha256 = "01pjrx1x4xy05k292mx3w0vw9q565jg2n80hma2ajw3iknmyk91k"; + sha256 = "1i6aqq75xkl7y6ggw11b7rls2hl3jvnpygjzmik5q2b274s1aamp"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/snipe-it/php-packages.nix b/pkgs/servers/web-apps/snipe-it/php-packages.nix index 6ba3606332d3..28a69dba7d56 100644 --- a/pkgs/servers/web-apps/snipe-it/php-packages.nix +++ b/pkgs/servers/web-apps/snipe-it/php-packages.nix @@ -15,10 +15,10 @@ let "arietimmerman/laravel-scim-server" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "arietimmerman-laravel-scim-server-10be959682d47bb8c78255168262a7cbb7586146"; + name = "arietimmerman-laravel-scim-server-d0e3d7c0b5da2ec76283b8a2fa2e672a91596509"; src = fetchurl { - url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/10be959682d47bb8c78255168262a7cbb7586146"; - sha256 = "0sak3h8hp6wdjpkq3y8a7q1gp6h6a7wgdcj2iqag633wvhbzsx56"; + url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/d0e3d7c0b5da2ec76283b8a2fa2e672a91596509"; + sha256 = "0xznsbdph32q1nx5ibl90gfqa7j0bj0ikcvz8hfpxxk967k1ayfj"; }; }; }; @@ -45,10 +45,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-007ddbbded7b753c2ceda61f3648774597a2615f"; + name = "aws-aws-sdk-php-8f8742caa42b260950320c98ddc5da4926e2373d"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/007ddbbded7b753c2ceda61f3648774597a2615f"; - sha256 = "1pzyncmi951p3bmjqijjbpxw0phymaqflkplzvrz77d66dkx93nd"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/8f8742caa42b260950320c98ddc5da4926e2373d"; + sha256 = "0z87ncxqvcs6bjp1b0dw1gib0f1k35sxzag8vzcd4ssh9n1m29gm"; }; }; }; @@ -65,20 +65,20 @@ let "barryvdh/laravel-debugbar" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-debugbar-b96f9820aaf1ff9afe945207883149e1c7afb298"; + name = "barryvdh-laravel-debugbar-3372ed65e6d2039d663ed19aa699956f9d346271"; src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298"; - sha256 = "0ns718nw578b0ii9jra8b2x5nvivgc9jpzmkxa8m766br1g8hsw5"; + url = "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3372ed65e6d2039d663ed19aa699956f9d346271"; + sha256 = "08ll8z25mbq21q8gxdlgdb0pymx7z3xxc1la68m879l5r2ddhi05"; }; }; }; "barryvdh/laravel-dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-dompdf-e3f429e97087b2ef19b83e5ed313f080f2477685"; + name = "barryvdh-laravel-dompdf-1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/e3f429e97087b2ef19b83e5ed313f080f2477685"; - sha256 = "1gwcv7pdbca3qk5pvb96pjilbpmgf76ppn733986mb6n55yab9g8"; + url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; + sha256 = "0xvaq6mp9s8nxlpfisa50fr8rjb6vmivxdbr985q9vydadh1dsv2"; }; }; }; @@ -125,20 +125,20 @@ let "doctrine/annotations" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-annotations-5b668aef16090008790395c02c893b1ba13f7e08"; + name = "doctrine-annotations-648b0343343565c4a056bfc8392201385e8d89f0"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08"; - sha256 = "129dixpipqfi55yq1rcp7dwj1yl1w70i462rs16ma4bn5vzxqz5s"; + url = "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0"; + sha256 = "0mkxq1yaqp6an2gjcgsmg7hq37mrwcj27f94sfkfxq9x6qh02k57"; }; }; }; "doctrine/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-cache-4cf401d14df219fa6f38b671f5493449151c9ad8"; + name = "doctrine-cache-56cd022adb5514472cb144c087393c1821911d09"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/cache/zipball/4cf401d14df219fa6f38b671f5493449151c9ad8"; - sha256 = "1hklk08cld4i5113f0a87778xmqnivkrck718wjbp1z6k76sbnsh"; + url = "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09"; + sha256 = "1ri5pwrnq8pxjv8ljscvlaqzjj7ii87420af4dq133qm35jn4ffr"; }; }; }; @@ -165,10 +165,10 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-9e7f76dd1cde81c62574fdffa5a9c655c847ad21"; + name = "doctrine-dbal-9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/9e7f76dd1cde81c62574fdffa5a9c655c847ad21"; - sha256 = "0w1j3cj1dw7fyk05ywc2k0vz1laqwj2886hhi8y33vjwi2lp1lw6"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; + sha256 = "0jf1whbf0d5kizrlzdm29ld5lrk4fgmayr239vyl2dmdzzxyvkhf"; }; }; }; @@ -235,20 +235,20 @@ let "doctrine/reflection" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-reflection-fa587178be682efe90d005e3a322590d6ebb59a5"; + name = "doctrine-reflection-1034e5e71f89978b80f9c1570e7226f6c3b9b6fb"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/reflection/zipball/fa587178be682efe90d005e3a322590d6ebb59a5"; - sha256 = "1jn3bbzv0pn16aw0kkg0l765wi49zpf5vpirqwmw3viqj9bgj1b5"; + url = "https://api.github.com/repos/doctrine/reflection/zipball/1034e5e71f89978b80f9c1570e7226f6c3b9b6fb"; + sha256 = "08n0m6z8b66b0v8awl1w8s8ncg61sa25273ba42fbjmn24b3h6mp"; }; }; }; "dompdf/dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-5031045d9640b38cfc14aac9667470df09c9e090"; + name = "dompdf-dompdf-79573d8b8a141ec8a17312515de8740eed014fa9"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090"; - sha256 = "1ciw3mc6pq3rwpzsgc71gdbwppqjdfcr0fhq3435c27ni5y8z4c5"; + url = "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9"; + sha256 = "0glv4fhzk674jgk1v9rkhb4859x5h1aspr63qdn7ajls27c582l5"; }; }; }; @@ -325,10 +325,10 @@ let "facade/ignition" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "facade-ignition-1d71996f83c9a5a7807331b8986ac890352b7a0c"; + name = "facade-ignition-6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"; src = fetchurl { - url = "https://api.github.com/repos/facade/ignition/zipball/1d71996f83c9a5a7807331b8986ac890352b7a0c"; - sha256 = "0zc9x2d597709rp5fzsbx5gqn48qcsw70h1a63cqrw1nl95392gs"; + url = "https://api.github.com/repos/facade/ignition/zipball/6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"; + sha256 = "1mxn6kqwbgd3vs36ckwydpx7kvjky6fvnhmbvn0c2zp0hsliq7rw"; }; }; }; @@ -345,10 +345,10 @@ let "fideloper/proxy" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "fideloper-proxy-c073b2bd04d1c90e04dc1b787662b558dd65ade0"; + name = "fideloper-proxy-a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"; src = fetchurl { - url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0"; - sha256 = "05jzgjj4fy5p1smqj41b5qxj42zn0mnczvsaacni4fmq174mz4gy"; + url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"; + sha256 = "11whawpjkiphdfpfwm5c2v3finc3apl9gp8b4lwq76370i41plcf"; }; }; }; @@ -365,10 +365,10 @@ let "firebase/php-jwt" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "firebase-php-jwt-d28e6df83830252650da4623c78aaaf98fb385f3"; + name = "firebase-php-jwt-018dfc4e1da92ad8a1b90adc4893f476a3b41cb8"; src = fetchurl { - url = "https://api.github.com/repos/firebase/php-jwt/zipball/d28e6df83830252650da4623c78aaaf98fb385f3"; - sha256 = "0lp9z27mlav8bdcy69d3br93azjnwjimz98w19h6pykp7939aaap"; + url = "https://api.github.com/repos/firebase/php-jwt/zipball/018dfc4e1da92ad8a1b90adc4893f476a3b41cb8"; + sha256 = "1jzri64bl3hiwah9nk3yq8nfjfn4z0xb0znp1dwh65qzjy54f0jh"; }; }; }; @@ -395,10 +395,10 @@ let "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-ac1ec1cd9b5624694c3a40be801d94137afb12b4"; + name = "guzzlehttp-guzzle-1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4"; - sha256 = "0bpgi47jc2d1ca0h62ahg9bpkh355azncwgnzcb2vsaldcm4g27s"; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; + sha256 = "0a8491bb72y61r3ghqn32kabsj8rxhj9pddnkkr14x3wbc10zfr4"; }; }; }; @@ -415,20 +415,20 @@ let "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-c94a94f120803a18554c1805ef2e539f8285f9a2"; + name = "guzzlehttp-psr7-13388f00956b1503577598873fffb5ae994b5737"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2"; - sha256 = "05q47cx2dvqxxi5kan0d3q956lqrf3rnan5qbwc36hk4pb5n1sqs"; + url = "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737"; + sha256 = "05vc1q903nxfg11y9mcnlg253lm5d81jjg6wv76hjiwx8m47lbac"; }; }; }; "intervention/image" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "intervention-image-744ebba495319501b873a4e48787759c72e3fb8c"; + name = "intervention-image-04be355f8d6734c826045d02a1079ad658322dad"; src = fetchurl { - url = "https://api.github.com/repos/Intervention/image/zipball/744ebba495319501b873a4e48787759c72e3fb8c"; - sha256 = "1h0w1gmnsb54k2y12vdhardssz9l3fqddln08fx9spwva1w4ms59"; + url = "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad"; + sha256 = "1cbg43hm2jgwb7gm1r9xcr4cpx8ng1zr93zx6shk9xhjlssnv0bx"; }; }; }; @@ -445,10 +445,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-2af2314989845db68dfbb65a54b8748ffaf26204"; + name = "laravel-framework-96aecced5126d48e277e5339193c376fe82b6565"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/2af2314989845db68dfbb65a54b8748ffaf26204"; - sha256 = "1q43sxp927sgzgbgvszbqmf77fi350l748hya33bdwl5f3w5rigb"; + url = "https://api.github.com/repos/laravel/framework/zipball/96aecced5126d48e277e5339193c376fe82b6565"; + sha256 = "1s4bcjpfsjafqigj28xbwa3bycs2cd1h4jnbpn9c9zj87w4smhzm"; }; }; }; @@ -475,10 +475,10 @@ let "laravel/serializable-closure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-9e4b005daa20b0c161f3845040046dc9ddc1d74e"; + name = "laravel-serializable-closure-09f0e9fb61829f628205b7c94906c28740ff9540"; src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/9e4b005daa20b0c161f3845040046dc9ddc1d74e"; - sha256 = "1arjkh7rxjnifcccqrdyby308fg3vlp5mfz5bhhk9cs9q1xhrhna"; + url = "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540"; + sha256 = "1b0kdx0cs43ci4pyhhv874k5i0k42iiizz1mz0f6wk8lpzhk0r6r"; }; }; }; @@ -505,10 +505,10 @@ let "laravel/ui" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-ui-f11d295de1508c5bb56206a620b00b6616de414c"; + name = "laravel-ui-65ec5c03f7fee2c8ecae785795b829a15be48c2c"; src = fetchurl { - url = "https://api.github.com/repos/laravel/ui/zipball/f11d295de1508c5bb56206a620b00b6616de414c"; - sha256 = "1cjhzmvl5wwf2q46di5fnqf9kysfib4rfqf7h9pz8w7p74nl3r5c"; + url = "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c"; + sha256 = "0hr8kkbxvxxidnw86r1i92938wajhskv68zjn1627h1i16b10ysm"; }; }; }; @@ -545,10 +545,10 @@ let "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-cb36fee279f7fca01d5d9399ddd1b37e48e2eca1"; + name = "league-commonmark-155ec1c95626b16fda0889cf15904d24890a60d5"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/cb36fee279f7fca01d5d9399ddd1b37e48e2eca1"; - sha256 = "1djp6mzibix05ymi5zx8f5mg41690hk5n9k70n58fdna35sjbby6"; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/155ec1c95626b16fda0889cf15904d24890a60d5"; + sha256 = "1bl4f0s6adgilly5yivcyg6ya42f173vc734518vjrdmzzh1wk2m"; }; }; }; @@ -595,10 +595,10 @@ let "league/flysystem-aws-s3-v3" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972"; + name = "league-flysystem-aws-s3-v3-af286f291ebab6877bac0c359c6c2cb017eb061d"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972"; - sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab"; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d"; + sha256 = "1dyj1cvf2pbvkdw9i53qg6lycxv0di85qnjzcvy5lphrxambifxy"; }; }; }; @@ -635,10 +635,10 @@ let "league/uri" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-uri-c68ca445abb04817d740ddd6d0b3551826ef0c5a"; + name = "league-uri-2d7c87a0860f3126a39f44a8a9bf2fed402dcfea"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/uri/zipball/c68ca445abb04817d740ddd6d0b3551826ef0c5a"; - sha256 = "0sk98yk5q1qj97hsglgfsg7chbnf5hi1nhd5m09704z4b8jrcy6p"; + url = "https://api.github.com/repos/thephpleague/uri/zipball/2d7c87a0860f3126a39f44a8a9bf2fed402dcfea"; + sha256 = "1cibnnh81jvkn28050scyldnzbshqhy5464gqmdfw0ar1a6bz545"; }; }; }; @@ -655,10 +655,10 @@ let "livewire/livewire" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "livewire-livewire-9ea6237760f627b3b6a05d15137880780ac843b5"; + name = "livewire-livewire-020ad095cf1239138b097d22b584e2701ec3edfb"; src = fetchurl { - url = "https://api.github.com/repos/livewire/livewire/zipball/9ea6237760f627b3b6a05d15137880780ac843b5"; - sha256 = "11x48k1xprdp2xaihgskc1cxpjlg1ri1dkza3shzsaq883d9d6vy"; + url = "https://api.github.com/repos/livewire/livewire/zipball/020ad095cf1239138b097d22b584e2701ec3edfb"; + sha256 = "0kklhhk351fbw38dw810si3gpzppjnm8hn9f6h8arxhcgxc8vnx7"; }; }; }; @@ -675,10 +675,10 @@ let "maennchen/zipstream-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "maennchen-zipstream-php-c4c5803cc1f93df3d2448478ef79394a5981cc58"; + name = "maennchen-zipstream-php-211e9ba1530ea5260b45d90c9ea252f56ec52729"; src = fetchurl { - url = "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58"; - sha256 = "0ggx4sb5w7aah7h645ad59gsn6r9an5y4f8xhgwbbjxndmgx34dq"; + url = "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/211e9ba1530ea5260b45d90c9ea252f56ec52729"; + sha256 = "02llnd0f72lmqhn84ggv2kkdk6968bg29wv196386dabf7ilq4wg"; }; }; }; @@ -735,10 +735,10 @@ let "monolog/monolog" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "monolog-monolog-247918972acd74356b0a91dfaa5adcaec069b6c0"; + name = "monolog-monolog-5579edf28aee1190a798bfa5be8bc16c563bd524"; src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/247918972acd74356b0a91dfaa5adcaec069b6c0"; - sha256 = "1rhldsdvm9s64b9qgnx610ad3wd28g1892ph3rf4fljnjd415hgh"; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524"; + sha256 = "014sys8bv57jbpag7xlc7vplc1qy4h5jppy258hpr0xfbh27cg3w"; }; }; }; @@ -775,10 +775,10 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-97a34af22bde8d0ac20ab34b29d7bfe360902055"; + name = "nesbot-carbon-a9000603ea337c8df16cc41f8b6be95a65f4d0f5"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055"; - sha256 = "0dagm5dr9pbyvxhmspdwmpwgnxf65mjk24a32cw8h5wqfn0p99i8"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/a9000603ea337c8df16cc41f8b6be95a65f4d0f5"; + sha256 = "0rjlq01108i309q9lyfv0vvb9vmsnqy5ylk9h8wvhd7916vw3jnc"; }; }; }; @@ -805,10 +805,10 @@ let "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-210577fe3cf7badcc5814d99455df46564f3c077"; + name = "nikic-php-parser-34bea19b6e03d8153165d8f30bba4c3be86184c1"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077"; - sha256 = "191ijb7bybqnl1jayx6bipqh91dc9acg9zsbh89fk4h1ff87b1qp"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1"; + sha256 = "1yj97j9cdx48566qwjl5q8hkjkrd1xl59aczb1scspxay37l9w72"; }; }; }; @@ -825,10 +825,10 @@ let "nyholm/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nyholm-psr7-1461e07a0f2a975a52082ca3b769ca912b816226"; + name = "nyholm-psr7-f734364e38a876a23be4d906a2a089e1315be18a"; src = fetchurl { - url = "https://api.github.com/repos/Nyholm/psr7/zipball/1461e07a0f2a975a52082ca3b769ca912b816226"; - sha256 = "1i6v8r9c2gxsjafyy03g339hkc0wcbsdlg47gy6rswg7qc1r91g1"; + url = "https://api.github.com/repos/Nyholm/psr7/zipball/f734364e38a876a23be4d906a2a089e1315be18a"; + sha256 = "0w8i5l1qg8dkc1zsyz1gpwn2awgkhlm295l1b8smmzabqdc65dcx"; }; }; }; @@ -855,10 +855,10 @@ let "paragonie/constant_time_encoding" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "paragonie-constant_time_encoding-9229e15f2e6ba772f0c55dd6986c563b937170a8"; + name = "paragonie-constant_time_encoding-58c3f47f650c94ec05a151692652a868995d2938"; src = fetchurl { - url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/9229e15f2e6ba772f0c55dd6986c563b937170a8"; - sha256 = "1cn71hyvjd100w0dyqibjxwkc8wn5525jmpv5fyh1ag04lr5ld90"; + url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938"; + sha256 = "0i9km0lzvc7df9758fm1p3y0679pzvr5m9x3mrz0d2hxlppsm764"; }; }; }; @@ -945,10 +945,10 @@ let "phpoffice/phpspreadsheet" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpoffice-phpspreadsheet-21e4cf62699eebf007db28775f7d1554e612ed9e"; + name = "phpoffice-phpspreadsheet-69991111e05fca3ff7398e1e7fca9ebed33efec6"; src = fetchurl { - url = "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/21e4cf62699eebf007db28775f7d1554e612ed9e"; - sha256 = "1zzhy52chi1ndypfv08y5hy7ibcwi2qjibdxp0f1d5smyj2y49fz"; + url = "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/69991111e05fca3ff7398e1e7fca9ebed33efec6"; + sha256 = "091g479mzh4w057m6v7xpn8i8l8k4abvvyd9l51c2sf7mskjz1n0"; }; }; }; @@ -985,10 +985,10 @@ let "pragmarx/google2fa" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "pragmarx-google2fa-26c4c5cf30a2844ba121760fd7301f8ad240100b"; + name = "pragmarx-google2fa-80c3d801b31fe165f8fe99ea085e0a37834e1be3"; src = fetchurl { - url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b"; - sha256 = "1jmc7s3hbczvb0h4kfmya67l969nfww3lmc4slvzsz0zd769434h"; + url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3"; + sha256 = "0qfjgkl02ifc0zicv3d5d6zs8mwpq68bg211jy3psgghnqpxyhlm"; }; }; }; @@ -1095,10 +1095,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-05c544b339b112226ad14803e1e5b09a61957454"; + name = "psy-psysh-77fc7270031fbc28f9a7bea31385da5c4855cb7a"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/05c544b339b112226ad14803e1e5b09a61957454"; - sha256 = "17d0sdrl0vp267iyxpnwshk4y0d9a1b8l8fj6agfh0plff3gab1c"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/77fc7270031fbc28f9a7bea31385da5c4855cb7a"; + sha256 = "058wlfpslslxh59844ybwk2knplfxd67mc9k4gia3vmakc2n7ysb"; }; }; }; @@ -1245,10 +1245,10 @@ let "squizlabs/php_codesniffer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "squizlabs-php_codesniffer-5e4e71592f69da17871dba6e80dd51bce74a351a"; + name = "squizlabs-php_codesniffer-1359e176e9307e906dc3d890bcc9603ff6d90619"; src = fetchurl { - url = "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a"; - sha256 = "09jajz88dxmpllf0xzlc0gdyqclhsva66ilx6jlsad275m0s9jdp"; + url = "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619"; + sha256 = "0bgb02zirxg0swfil3hacp7ry4cv5rwnbjkrj4l3hqln97cvmn21"; }; }; }; @@ -1265,10 +1265,10 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b"; + name = "symfony-console-4d671ab4ddac94ee439ea73649c69d9d200b5000"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b"; - sha256 = "1q3wf6p8chvhdmfjpjm4q4xl4762p660psn14br419f7km9lwnxq"; + url = "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000"; + sha256 = "13p16qi328f7jds94vh2gswpq2zgkh99zr7x0ihvy9ysmdc4vln2"; }; }; }; @@ -1282,16 +1282,6 @@ let }; }; }; - "symfony/debug" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-debug-6637e62480b60817b9a6984154a533e8e64c6bd5"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/debug/zipball/6637e62480b60817b9a6984154a533e8e64c6bd5"; - sha256 = "0p0llad0zxbswjp06f99jgv1qrf088vpgyf9liy68ng6q83ghim4"; - }; - }; - }; "symfony/deprecation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -1305,20 +1295,20 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-c1fcde614dfe99d62a83b796a53b8bad358b266a"; + name = "symfony-error-handler-c116cda1f51c678782768dce89a45f13c949455d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/c1fcde614dfe99d62a83b796a53b8bad358b266a"; - sha256 = "0b4c7n2yy26swjzbsj0n03qjsb5qi6w09v0nl0s70fjrs9fvb0qb"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d"; + sha256 = "16bvys7dkhja7bjf42k7rxd7d96fbsp1aj3n50a6b6fj3q2jkxwm"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-dec8a9f58d20df252b9cd89f1c6c1530f747685d"; + name = "symfony-event-dispatcher-8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d"; - sha256 = "0mf1h2v8xgfn8k55y9yhwr9pb9jia4va5a91xfchyvfyzd5x4sm4"; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; + sha256 = "10vdzpy7gvmy0w4lpr4h4xj2gr224k5llc7f356x1jzbijxg8ckh"; }; }; }; @@ -1345,130 +1335,130 @@ let "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-ff2818d1c3d49860bcae1f2cbb5eb00fcd3bf9e2"; + name = "symfony-http-foundation-e7793b7906f72a8cc51054fbca9dcff7a8af1c1e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/ff2818d1c3d49860bcae1f2cbb5eb00fcd3bf9e2"; - sha256 = "1f9q79rmyxmh7bh55pggi3wkpqza8ya5l5qpynpvxn284rxzfdsh"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/e7793b7906f72a8cc51054fbca9dcff7a8af1c1e"; + sha256 = "1wd6ja7wfc6gkmbvpvlmg1d2fbnscnqsx5m2c2qzfnr64pm8wnxm"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-cf7e61106abfc19b305ca0aedc41724ced89a02a"; + name = "symfony-http-kernel-255ae3b0a488d78fbb34da23d3e0c059874b5948"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/cf7e61106abfc19b305ca0aedc41724ced89a02a"; - sha256 = "1z1wh7rqf8s9cwpmf540f5q5fbf1ya0iawlvhl60rlqxh9f74ykc"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/255ae3b0a488d78fbb34da23d3e0c059874b5948"; + sha256 = "0mjkq7badxnrwh8f7xwrpgxsaikb2zb9pf2576v5g3mj4ipf8m2b"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-af49bc163ec3272f677bde3bc44c0d766c1fd662"; + name = "symfony-mime-02265e1e5111c3cd7480387af25e82378b7ab9cc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/af49bc163ec3272f677bde3bc44c0d766c1fd662"; - sha256 = "058is0f9b3v3vgk5p30a75g9pj9v76mrlglpv3p3kbazp1klw22q"; + url = "https://api.github.com/repos/symfony/mime/zipball/02265e1e5111c3cd7480387af25e82378b7ab9cc"; + sha256 = "0fm8smz4y87igkwl7sgp05xzxknbsjb16qma6v6k543ba8p46fzy"; }; }; }; "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-30885182c981ab175d4d034db0f6f469898070ab"; + name = "symfony-polyfill-ctype-6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab"; - sha256 = "0dfh24f8g048vbj88vx0lvw48nq5dsamy5kva72ab1h7vw9hvpwb"; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; + sha256 = "18235xiqpjx9nzx3pzylm5yzqr6n1j8wnnrzgab1hpbvixfrbqba"; }; }; }; "symfony/polyfill-iconv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-iconv-f1aed619e28cb077fc83fac8c4c0383578356e40"; + name = "symfony-polyfill-iconv-143f1881e655bebca1312722af8068de235ae5dc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40"; - sha256 = "0fjx1a0kvkj0677nc6h49phqlk0hsgkzbs401lmhj6b6cdc7hvzp"; + url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc"; + sha256 = "19v4r40vx62a181l6zfs7n40w9f7npy7jw5x6dssg40hl4a0i3p2"; }; }; }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-81b86b50cf841a64252b439e738e97f4a34e2783"; + name = "symfony-polyfill-intl-grapheme-433d05519ce6990bf3530fba6957499d327395c2"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783"; - sha256 = "1dxymfi577yridk6dn8v2z1hyrpaxr8sp4g6dxxy913ilf6igx7r"; + url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2"; + sha256 = "11169jh39mhr591b61iara8hvq4pnfzgkynlqg90iv510c74d1cg"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-749045c69efb97c70d25d7463abba812e91f3a44"; + name = "symfony-polyfill-intl-idn-59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44"; - sha256 = "0ni1zlnp5xpxyzbax7v3mn20x35i69nsmch2sx322cs6dwb0ggbn"; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; + sha256 = "1bcdl48ji0dmswwvw2b66qxdxxawbx8bgicc02la92gacps08n5v"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-8590a5f561694770bdcd3f9b5c69dde6945028e8"; + name = "symfony-polyfill-intl-normalizer-219aa369ceff116e673852dce47c3a41794c14bd"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8"; - sha256 = "1c60xin00q0d2gbyaiglxppn5hqwki616v5chzwyhlhf6aplwsh3"; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd"; + sha256 = "1cwckrazq4p4i9ysjh8wjqw8qfnp0rx48pkwysch6z7vkgcif22w"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-0abb51d2f102e00a4eefcf46ba7fec406d245825"; + name = "symfony-polyfill-mbstring-9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825"; - sha256 = "1z17f7465fn778ak68mzz5kg2ql1n6ghgqh3827n9mcipwbp4k58"; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; + sha256 = "0y289x91c9lgr8vlixj5blayf9lsgi4nn2gyn3a99brvn2jnh6q8"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-9a142215a36a3888e30d0a9eeea9766764e96976"; + name = "symfony-polyfill-php72-bf44a9fd41feaac72b074de600314a93e2ae78e2"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976"; - sha256 = "06ipbcvrxjzgvraf2z9fwgy0bzvzjvs5z1j67grg1gb15x3d428b"; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2"; + sha256 = "11knb688wcf8yvrprgp4z02z3nb6s5xj3wrv77n2qjkc7nc8q7l7"; }; }; }; "symfony/polyfill-php73" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php73-cc5db0e22b3cb4111010e48785a97f670b350ca5"; + name = "symfony-polyfill-php73-e440d35fa0286f77fb45b79a03fedbeda9307e85"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5"; - sha256 = "04z6fah8rn5b01w78j0vqa0jys4mvji66z4ql6wk1r1bf6j0048y"; + url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85"; + sha256 = "1c7w7j375a1fxq5m4ldy72jg5x4dpijs8q9ryqxvd6gmj1lvncqy"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-4407588e0d3f1f52efb65fbe92babe41f37fe50c"; + name = "symfony-polyfill-php80-cfa0ae98841b9e461207c13ab093d76b0fa7bace"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c"; - sha256 = "187whknxl9rs0ddkjph6zmla5kh3k7w6hnvgfc44zig17jxsjdff"; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace"; + sha256 = "1kbh4j01kxxc39ls9kzkg7dj13cdlzwy599b96harisysn47jw2n"; }; }; }; "symfony/polyfill-php81" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php81-5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"; + name = "symfony-polyfill-php81-13f6d1271c663dc5ae9fb843a8f16521db7687a1"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"; - sha256 = "0igxnmib8vkjp9x81j66hl4pf8i0nj86k4hdh8gzcymq01si0mxm"; + url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1"; + sha256 = "01dqzkdppaw7kh1vkckkzn54aql4iw6m9vyg99ahhzmqc2krs91x"; }; }; }; @@ -1505,70 +1495,70 @@ let "symfony/service-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-service-contracts-24d9dc654b83e91aa59f9d167b131bc3b5bea24c"; + name = "symfony-service-contracts-4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c"; - sha256 = "1flrnq7dw7rg8b901fbi7gv6k25hqbhffpd15w751fmzsrpzaphl"; + url = "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; + sha256 = "0lh0vxy0h4wsjmnlf42s950bicsvkzz6brqikfnfb5kmvi0xhcm6"; }; }; }; "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8"; + name = "symfony-string-4432bc7df82a554b3e413a8570ce2fea90e94097"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8"; - sha256 = "1bgcrma3c11i0427cisd4kcp0pgqkia1cc3s1ix12xksi8q6mkjb"; + url = "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097"; + sha256 = "08abxmddl3nphkqf6a58r8w1d5la2f3m9rkbhdfv2k78h2nn19v7"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-f5c0f6d1f20993b2606f3a5f36b1dc8c1899170b"; + name = "symfony-translation-1639abc1177d26bcd4320e535e664cef067ab0ca"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/f5c0f6d1f20993b2606f3a5f36b1dc8c1899170b"; - sha256 = "0z21vwrapv2p8n4psnc17ka0b2vkrhv6bn4gk0pslj9dl4a0li4j"; + url = "https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca"; + sha256 = "0q7f4hfv8n7px5fhh0f8ii6lbfj9xp7fas5ls7yazm4980c06a1x"; }; }; }; "symfony/translation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-contracts-1211df0afa701e45a04253110e959d4af4ef0f07"; + name = "symfony-translation-contracts-136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07"; - sha256 = "09d057ycwa7l34ph32agkcbam8jwpxh6fr1ay17xf9haczlgs1ad"; + url = "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; + sha256 = "1z1514i3gsxdisyayzh880i8rj954qim7c183cld91kvvqcqi7x0"; }; }; }; "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-cdcadd343d31ad16fc5e006b0de81ea307435053"; + name = "symfony-var-dumper-af52239a330fafd192c773795520dc2dd62b5657"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/cdcadd343d31ad16fc5e006b0de81ea307435053"; - sha256 = "074xgg7z22kxlprahd272gb7krkh9k1rw548s6c3igmk6yylzs9n"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657"; + sha256 = "1dxmwyg3wxq313zfrjwywkfsi38lq6i3prq69f47vbiqajfs55jn"; }; }; }; "tecnickcom/tc-lib-barcode" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "tecnickcom-tc-lib-barcode-aca01b1be997404aa14e327f70ef51299423b6c6"; + name = "tecnickcom-tc-lib-barcode-4907ef1e384dbb7d3100c897925e7dc071a419a3"; src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/aca01b1be997404aa14e327f70ef51299423b6c6"; - sha256 = "1rmanaspjzkpzsp66fxwgmdra042pc7v078ga2v2l88xnniay7xq"; + url = "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/4907ef1e384dbb7d3100c897925e7dc071a419a3"; + sha256 = "1wwrws42lh60zmx7d49dqwlli09j1q6m1669cdlya907icx6cxbd"; }; }; }; "tecnickcom/tc-lib-color" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "tecnickcom-tc-lib-color-ebe0b169122789e4ed6a78d7acd6cf162329c7e4"; + name = "tecnickcom-tc-lib-color-f9e45c59496418227184626ad31e83470153c11f"; src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/ebe0b169122789e4ed6a78d7acd6cf162329c7e4"; - sha256 = "1ig97rs6g30557wgpx0z6hssb00pmw1m0ksbizraw9cdkx5wkwrb"; + url = "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/f9e45c59496418227184626ad31e83470153c11f"; + sha256 = "04g9fkk4ifc8sj27jz3nj6rnqgfyls6b2p1ll59wm9d99rngyq72"; }; }; }; @@ -1665,10 +1655,10 @@ let "webmozart/assert" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "webmozart-assert-6964c76c7804814a842473e0c8fd15bab0f18e25"; + name = "webmozart-assert-11cb2199493b2f8a3b53e7f19068fc6aac760991"; src = fetchurl { - url = "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25"; - sha256 = "17xqhb2wkwr7cgbl4xdjf7g1vkal17y79rpp6xjpf1xgl5vypc64"; + url = "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991"; + sha256 = "18qiza1ynwxpi6731jx1w5qsgw98prld1lgvfk54z92b1nc7psix"; }; }; }; From ebf9a4ad8961ac1ef65b762bf374b42044b174aa Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 13 Aug 2022 23:49:37 +0300 Subject: [PATCH 08/26] =?UTF-8?q?miniflux:=202.0.37=20=E2=86=92=202.0.38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/miniflux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 4747db0b79c2..031e3b5a22ab 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.37"; + version = "2.0.38"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-cmzPm/kvl+eIQOhGFAqW7dyLcEi836ohJ7sbMNkdXCA="; + sha256 = "sha256-y6g5HGIgEgb+Z26aKgj90oHIrXmrTmrpQyflKPOS0No="; }; - vendorSha256 = "sha256-3VlyTYHE1ll2LwNTPKmpdNr1PKxzjhB2TWgr5Gl1RGE="; + vendorSha256 = "sha256-ED4Rq+ks+75PdJvIye17eI7MLEJdP9yXHhbonqw2oMI="; nativeBuildInputs = [ installShellFiles ]; From b146c4fcfb66c6ee97aefc97ce3c9182e2d79d77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 23:43:18 +0000 Subject: [PATCH 09/26] hyfetch: 1.3.0 -> 1.4.0 --- pkgs/tools/misc/hyfetch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix index 80582524eee2..59ecf3ff54c6 100644 --- a/pkgs/tools/misc/hyfetch/default.nix +++ b/pkgs/tools/misc/hyfetch/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "HyFetch"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { repo = "hyfetch"; owner = "hykilpikonna"; - rev = version; - sha256 = "sha256-8Mp3MV9HVzXzT/W6F/lD34tT0uOgqyydg31PlR3sMUA="; + rev = "refs/tags/${version}"; + sha256 = "sha256-15FeW3yaM7eUJ1O20H/bQquDRAsRWTJMzkzQ5Kv1ezE="; }; # TODO: Remove with next release bump since it has been fixed upstream (hykilpikonna/hyfetch@d797a8c) From e4f2c0b0c2c92b3589691f6a9d6d452d0badbbfa Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 14 Aug 2022 10:14:51 +0800 Subject: [PATCH 10/26] hyfetch: remove unneeded postPatch --- pkgs/tools/misc/hyfetch/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix index 59ecf3ff54c6..ec64cc56d1eb 100644 --- a/pkgs/tools/misc/hyfetch/default.nix +++ b/pkgs/tools/misc/hyfetch/default.nix @@ -11,11 +11,6 @@ buildPythonPackage rec { sha256 = "sha256-15FeW3yaM7eUJ1O20H/bQquDRAsRWTJMzkzQ5Kv1ezE="; }; - # TODO: Remove with next release bump since it has been fixed upstream (hykilpikonna/hyfetch@d797a8c) - postPatch = '' - chmod +x neofetch - ''; - propagatedBuildInputs = [ typing-extensions setuptools From 664b01f0829987affdaa361207bfd0b698db0ec2 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 14 Aug 2022 16:34:47 +0900 Subject: [PATCH 11/26] nixos/mirakurun: set the LOGO_DATA_DIR_PATH environment variable --- nixos/modules/services/video/mirakurun.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix index 90119361afab..6891b84ff455 100644 --- a/nixos/modules/services/video/mirakurun.nix +++ b/nixos/modules/services/video/mirakurun.nix @@ -189,6 +189,7 @@ in CHANNELS_CONFIG_PATH = "/etc/mirakurun/channels.yml"; SERVICES_DB_PATH = "/var/lib/mirakurun/services.json"; PROGRAMS_DB_PATH = "/var/lib/mirakurun/programs.json"; + LOGO_DATA_DIR_PATH = "/var/lib/mirakurun/logos"; NODE_ENV = "production"; }; From bb202ec7218af0327d8b9b87758a96a35e1e6e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 13 Aug 2022 20:49:43 +0000 Subject: [PATCH 12/26] randomx: 1.1.9 -> 1.1.10 --- pkgs/development/libraries/randomx/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 68e81866e1e6..b5da1ad6e198 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.9"; + version = "1.1.10"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "188fh4l8wda1y9vxa9asbk8nw35gyapw7gyn4w2p2qspdjhi5mnq"; + sha256 = "sha256-ZPphhZFzQL72xcEp9kNfZITY4oqK930ve/bbljTYNBs="; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6316fc0fe4c..37582f345118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20994,7 +20994,7 @@ with pkgs; qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; - randomx = callPackage ../development/libraries/randomx { }; + randomx = darwin.apple_sdk_11_0.callPackage ../development/libraries/randomx { }; remodel = callPackage ../development/tools/remodel { inherit (darwin.apple_sdk.frameworks) Security; From c8e49f8f29471e945cba60ba211919b5e7b943e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 14:37:34 +0000 Subject: [PATCH 13/26] minio: 2022-08-11T04-37-28Z -> 2022-08-13T21-54-44Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index e497f8099f9b..f70cf24e482c 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-08-11T04-37-28Z"; + version = "2022-08-13T21-54-44Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-gxDTHy/CDqeQhf/RZaaoloGEfAOg9djjIWdWyb+7fhM="; + sha256 = "sha256-+N/IFVyidbu4ns9Pw27D8lxAeSk+KpIIRZOkfxlJQ+Q="; }; - vendorSha256 = "sha256-LSAB+0+yNsxi5qCXEBVf3aE8Rt+UP63AIGBV5OhWJDY="; + vendorSha256 = "sha256-spWmI2an9NW5iMWw7yPDZQ2s0iVjNqnbRY867bBBwAE="; doCheck = false; From b932bf6fc697674c5d53bad8621a6ab15083b85c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 22:35:23 +0200 Subject: [PATCH 14/26] python310Packages.aiohue: 4.4.2 -> 4.5.0 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 99defb3f6964..657ebc1aa9a1 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.4.2"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-rHd5mQlD/4enGgFyVRVnLXG1Fcd+8hyQj+WnF8QFqm0="; + hash = "sha256-Lcs+Ieh5TEUE+sHqFAZr9rsAZMsI9t2/w87r36IUa1A="; }; propagatedBuildInputs = [ From 4929601fe98960014a7b8a9e6bb491432178e398 Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Sun, 14 Aug 2022 22:58:44 +0200 Subject: [PATCH 15/26] bitwuzla: unstable-2021-07-01 -> unstable-2022-08-07 --- pkgs/applications/science/logic/bitwuzla/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index a8820b55b746..82bfbd6dc3fe 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "bitwuzla"; - version = "unstable-2021-07-01"; + version = "unstable-2022-08-07"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; - rev = "58d720598e359b1fdfec4a469c76f1d1f24db51a"; - sha256 = "06ymqsdppyixb918161rmbgqvbnarj4nm4az88lkn3ri4gyimw04"; + rev = "b6fb61736a5cf70cd0b35ec4aeeadf23971610ce"; + hash = "sha256-T5VnnWrcZ8K1NjFf5eeg0TRpXBLRCxC67v8zWPwYF/Y="; }; nativeBuildInputs = [ cmake pkg-config ]; From a5c352edae438c7bfb9cd90bdab1e8b66518844b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 00:51:39 +0000 Subject: [PATCH 16/26] python310Packages.databricks-cli: 0.17.0 -> 0.17.1 --- pkgs/development/python-modules/databricks-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 22cbd96cae00..eafd7d2e8bc9 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SvoX2nPG6TygnF/fJPo1UpZYVLu8PxQoz00n7bdRtyw="; + sha256 = "sha256-ZfFcPfL/uqREwF8zK7KKuIn6wMnaGFOx6W/e/sPGnAw="; }; checkInputs = [ From 895a5fa6e1b6f690528a96837cee6e355b4012d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 02:32:55 +0000 Subject: [PATCH 17/26] python310Packages.homeconnect: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/homeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index 19692f988fc3..a3e5c2ddb1dc 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "homeconnect"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yEBi/9FVvLYYGMvsVZO94oGXEqXOdtHQ0G+6o2LEmOQ="; + hash = "sha256-wCx8Jh3NBTnYI+essH9toacjUaT4fS61SaAAZDCYZ4g="; }; propagatedBuildInputs = [ From 92f6f6b72b6ebd250a3480b59166cc43d959c1df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 04:24:16 +0000 Subject: [PATCH 18/26] python310Packages.p1monitor: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/p1monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index d1be6e639b38..efa35f67ddf2 100644 --- a/pkgs/development/python-modules/p1monitor/default.nix +++ b/pkgs/development/python-modules/p1monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-p1monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-0CPOK577tl86orjN9Xou8dPm425Yx1m8x6xfHaZEv10="; + hash = "sha256-3xvh/Ic2Mtczi5WREDXy+qQLpXhJQZf6fosT0h+fA0o="; }; nativeBuildInputs = [ From e066019096f11ab84b304e2f1e262f692385294e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 17 Jul 2022 16:30:18 +0800 Subject: [PATCH 19/26] hydra_unstable: 2022-06-30 -> 2022-08-08 --- pkgs/development/tools/misc/hydra/unstable.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index b6c4d6fb1c85..33a150be3460 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -84,6 +84,7 @@ let DigestSHA1 EmailMIME EmailSender + FileLibMagic FileSlurper FileWhich IOCompress @@ -126,13 +127,13 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2022-06-30"; + version = "2022-08-08"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "f2f82b3eeed652e7fc076adf6dcd5a72baaaed18"; - sha256 = "sha256-WPcwFX3q0Y0uMLVN853Xvn3e7RnOOHt8yTLbOBzz5oE="; + rev = "2b1c1e65d5fbbe25625a31ee93cb14c9a9edf969"; + sha256 = "sha256-mjCdJPB4t5OLGZ0r5usJTVs1BBr4cWeGGE7imyUfQnQ="; }; patches = [ From f1660d80277fda710668edff8ec5ab05c91422d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 06:38:53 +0000 Subject: [PATCH 20/26] aliyun-cli: 3.0.123 -> 3.0.124 --- pkgs/tools/admin/aliyun-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index b18b8a82088e..99f77ed14a54 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.123"; + version = "3.0.124"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-68u31s7SsRRT9OQpTqlhAs5Dx+ggbTTSeKYBByiqn6g="; + sha256 = "sha256-OorDK2/i0VjBy3lFuQGr5kmWvssGkBBSNlJEfGUbaxc="; }; vendorSha256 = "sha256-X5r89aI7UdVlzEJi8zaOzwTETwb+XH8dKO6rVe//FNs="; From 3ddd0f9002d8630a34a86cc30196a963d0b2c545 Mon Sep 17 00:00:00 2001 From: Mon Aaraj Date: Mon, 8 Aug 2022 17:32:48 +0300 Subject: [PATCH 21/26] maintainers: add monaaraj --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 479f32523969..8ef00b74cc26 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8818,6 +8818,13 @@ fingerprint = "1248 D3E1 1D11 4A85 75C9 8934 6794 D45A 488C 2EDE"; }]; }; + monaaraj = { + name = "Mon Aaraj"; + email = "owo69uwu69@gmail.com"; + matrix = "@mon:tchncs.de"; + github = "MonAaraj"; + githubId = 46468162; + }; monsieurp = { email = "monsieurp@gentoo.org"; github = "monsieurp"; From 9f1da18a1e9c48d43854811362b75236b61164cc Mon Sep 17 00:00:00 2001 From: Mon Aaraj Date: Mon, 8 Aug 2022 03:51:48 +0300 Subject: [PATCH 22/26] colemak-dh: init at unstable-2022-08-07 --- pkgs/data/misc/colemak-dh/default.nix | 37 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/data/misc/colemak-dh/default.nix diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/data/misc/colemak-dh/default.nix new file mode 100644 index 000000000000..f36832ff42d8 --- /dev/null +++ b/pkgs/data/misc/colemak-dh/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "colemak-dh"; + version = "unstable-2022-08-07"; + + src = fetchFromGitHub { + owner = "ColemakMods"; + repo = "mod-dh"; + rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09"; + sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; + sparseCheckout = "console"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/keymaps/i386/ + gzip -r ./console + cp -r ./console $out/share/keymaps/i386/colemak + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://colemakmods.github.io/mod-dh"; + description = "A Colemak mod for more comfortable typing"; + license = licenses.publicDomain; + platforms = platforms.linux; + maintainers = with maintainers; [ monaaraj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac08ea8a357..49e80f87a12f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -368,6 +368,8 @@ with pkgs; conftest = callPackage ../development/tools/conftest { }; + colemak-dh = callPackage ../data/misc/colemak-dh { }; + colmena = callPackage ../tools/admin/colmena { }; colorz = callPackage ../tools/misc/colorz { }; From 243053e521dc90b825a17bf5ee9f5dfe7f56af84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 12 Aug 2022 11:25:56 +0000 Subject: [PATCH 23/26] python310Packages.mistune: 0.8.4 -> 2.0.4 Remove mistune_0_8 because it's insecure. --- nixos/lib/make-options-doc/default.nix | 2 +- .../python-modules/m2r/default.nix | 2 + .../python-modules/md2gemini/default.nix | 4 +- .../python-modules/mistune/common.nix | 27 ------------- .../python-modules/mistune/default.nix | 39 +++++++++++++------ .../python-modules/mrkd/default.nix | 2 + pkgs/misc/present/default.nix | 2 +- pkgs/servers/mail/mailman/hyperkitty.nix | 2 +- pkgs/tools/admin/iredis/default.nix | 5 +-- pkgs/top-level/python-aliases.nix | 2 + pkgs/top-level/python-packages.nix | 6 +-- 11 files changed, 41 insertions(+), 52 deletions(-) delete mode 100644 pkgs/development/python-modules/mistune/common.nix diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 6649fc41d41a..3f98e2cf87b8 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -123,7 +123,7 @@ in rec { inherit self; includeSiteCustomize = true; }); - in self.withPackages (p: [ p.mistune_2_0 ])) + in self.withPackages (p: [ p.mistune ])) ]; options = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index b3077edcc5d4..fa9fdbe91bde 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -39,5 +39,7 @@ buildPythonPackage rec { description = "Markdown to reStructuredText converter"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + # https://github.com/miyakogi/m2r/issues/66 + broken = versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index 5d7b53f77a44..bc4e4fc4b2c6 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, mistune_2_0, cjkwrap, wcwidth +{ lib, buildPythonPackage, fetchPypi, mistune, cjkwrap, wcwidth , pytestCheckHook }: buildPythonPackage rec { pname = "md2gemini"; version = "1.9.0"; - propagatedBuildInputs = [ mistune_2_0 cjkwrap wcwidth ]; + propagatedBuildInputs = [ mistune cjkwrap wcwidth ]; checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "md2gemini" ]; diff --git a/pkgs/development/python-modules/mistune/common.nix b/pkgs/development/python-modules/mistune/common.nix deleted file mode 100644 index 24508372d9a4..000000000000 --- a/pkgs/development/python-modules/mistune/common.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, version -, sha256 -, format ? "setuptools" -, extraMeta ? {} -}: - -buildPythonPackage rec { - inherit version format; - pname = "mistune"; - - src = fetchPypi { - inherit pname version sha256; - }; - - buildInputs = [ nose ]; - pythonImportsCheck = [ "mistune" ]; - - meta = with lib; { - description = "The fastest markdown parser in pure Python"; - homepage = "https://github.com/lepture/mistune"; - license = licenses.bsd3; - } // extraMeta; -} diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 515844443f12..16a5e22ac6a4 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -1,15 +1,30 @@ -self: rec { - mistune_0_8 = self.callPackage ./common.nix { - version = "0.8.4"; - sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e"; - extraMeta = { - knownVulnerabilities = [ "CVE-2022-34749" ]; - }; +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mistune"; + version = "2.0.4"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808"; }; - mistune_2_0 = self.callPackage ./common.nix { - version = "2.0.4"; - sha256 = "sha256-nuCmYFPiJnq6dyxx4GiR+o8a9tSwHV6E4me0Vw1NmAg="; - format = "pyproject"; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "mistune" ]; + + meta = with lib; { + description = "A sane Markdown parser with useful plugins and renderers"; + homepage = "https://github.com/lepture/mistune"; + license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; }; - mistune = mistune_0_8; } diff --git a/pkgs/development/python-modules/mrkd/default.nix b/pkgs/development/python-modules/mrkd/default.nix index 22cd93910d6b..0d97a91a16f3 100644 --- a/pkgs/development/python-modules/mrkd/default.nix +++ b/pkgs/development/python-modules/mrkd/default.nix @@ -24,5 +24,7 @@ buildPythonPackage rec { description = "Write man pages using Markdown, and convert them to Roff or HTML"; homepage = "https://github.com/refi64/mrkd"; license = licenses.bsd2; + # https://github.com/refi64/mrkd/pull/6 + broken = versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix index 6eb489e1f8bd..0bd24f9ce197 100644 --- a/pkgs/misc/present/default.nix +++ b/pkgs/misc/present/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { pyyaml pyfiglet asciimatics - mistune_2_0 + mistune ]; pythonImportsCheck = [ "present" ]; diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 406e104e881c..7f221617878c 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { django-extensions djangorestframework flufl_lock - mistune_2_0 + mistune networkx psycopg2 python-dateutil diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/tools/admin/iredis/default.nix index a48d2eeb0235..7e2db982cf9f 100644 --- a/pkgs/tools/admin/iredis/default.nix +++ b/pkgs/tools/admin/iredis/default.nix @@ -15,8 +15,7 @@ buildPythonApplication rec { substituteInPlace setup.py \ --replace "click>=7.0,<8.0" "click" \ --replace "wcwidth==0.1.9" "wcwidth" \ - --replace "redis>=3.4.0,<4.0.0" "redis" \ - --replace "mistune>=2.0,<3.0" "mistune" + --replace "redis>=3.4.0,<4.0.0" "redis" ''; propagatedBuildInputs = [ @@ -24,7 +23,7 @@ buildPythonApplication rec { click configobj importlib-resources - mistune_2_0 + mistune packaging pendulum prompt-toolkit diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fd546e026b56..68c1ac090161 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -103,6 +103,8 @@ mapAliases ({ mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 + mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 + mistune_2_0 = mistune; # added 2022-08-12 net2grid = gridnet; # add 2022-04-22 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e144fb406536..e07c8e0a1bd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5574,11 +5574,7 @@ in { mistletoe = callPackage ../development/python-modules/mistletoe { }; - inherit (import ../development/python-modules/mistune self) - mistune - mistune_0_8 - mistune_2_0 - ; + mistune = callPackage ../development/python-modules/mistune { }; mitmproxy = callPackage ../development/python-modules/mitmproxy { }; From eb642f80f9aecc19312909e08601a3c2020b5ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 12 Aug 2022 11:37:14 +0000 Subject: [PATCH 24/26] m2r: use toPythonApplication --- .../python-modules/m2r/default.nix | 2 +- pkgs/tools/text/m2r/default.nix | 32 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 pkgs/tools/text/m2r/default.nix diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index fa9fdbe91bde..d85c2196e843 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { homepage = "https://github.com/miyakogi/m2r"; description = "Markdown to reStructuredText converter"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ AndersonTorres SuperSandro2000 ]; # https://github.com/miyakogi/m2r/issues/66 broken = versionAtLeast mistune.version "2"; }; diff --git a/pkgs/tools/text/m2r/default.nix b/pkgs/tools/text/m2r/default.nix deleted file mode 100644 index f6dda712d0b9..000000000000 --- a/pkgs/tools/text/m2r/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, docutils -, mistune -, pygments -}: - -buildPythonApplication rec { - pname = "m2r"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "miyakogi"; - repo = pname; - rev = "v${version}"; - hash = "sha256-JNLPEXMoiISh4RnKP+Afj9/PJp9Lrx9UYHsfuGAL7uI="; - }; - - buildInputs = [ - docutils - mistune - pygments - ]; - - meta = with lib; { - homepage = "https://github.com/miyakogi/m2r"; - description = "Markdown-to-RestructuredText converter"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49e80f87a12f..748bcbdcffe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8076,7 +8076,7 @@ with pkgs; mcfly = callPackage ../tools/misc/mcfly { }; - m2r = python3Packages.callPackage ../tools/text/m2r { }; + m2r = with python3Packages; toPythonApplication m2r; md2gemini = with python3.pkgs; toPythonApplication md2gemini; From 88132767ceb5cfdde740a25e4d0f7ce933f588b1 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 14 Aug 2022 22:38:35 -0400 Subject: [PATCH 25/26] git: actually add fetchgit tests to passthru.tests Nested attrsets don't get built when running `nix-build -A git.tests`, so we use the update operator to add the attributes from `tests.fetchgit` to `passthru.tests`. --- .../version-management/git-and-tools/git/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 9cab44840d4a..3fd055e7148c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -375,8 +375,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; }); buildbot-integration = nixosTests.buildbot; - inherit (tests) fetchgit; - }; + } // tests.fetchgit; }; meta = { From 47b3196aabdf11b43dafb35960f88885beb825e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Aug 2022 13:06:43 +0200 Subject: [PATCH 26/26] python3Packages.flask-appbuilder: fix build Apparently during the last python-updates run we mixed up the hashes of the src and the patch file, breaking the package build. --- .../python-modules/flask-appbuilder/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index e52ecfc6493d..2ef78ecf8d45 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-g+iHUL83PokXPGu7HJ8ffLocQr0uGpMqS5MbfIlZZ2E="; + hash = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A="; }; patches = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734 name = "flask-appbuilder-wtf3.patch"; url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch"; - sha256 = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A="; + hash = "sha256-24mlS3HIs77wKOlwdHah5oks31OOmCBHmcafZT2ITOc="; excludes = [ "requirements.txt" "setup.py" @@ -78,8 +78,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \ - --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3" \ - --replace "Flask-WTF>=0.14.2, <0.15.0" "Flask-WTF" \ + --replace "Flask-WTF>=0.14.2, <1.0.0" "Flask-WTF" \ --replace "WTForms<3.0.0" "WTForms" \ --replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \ --replace "prison>=0.2.1, <1.0.0" "prison"