From e1b299949eca2ce21bbf5e7a96c739b3d1d66007 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 05:06:27 +0000 Subject: [PATCH 01/48] codeql: 2.8.2 -> 2.8.5 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index abc2dc24474..4ec04d1e1a5 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.8.2"; + version = "2.8.5"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-F0tr4oQPgusLVCP5jSCYxl/xHbZLrVXd2FFYSJY3PPs="; + sha256 = "sha256-HZJBqm196RgWR/14mfrLYQlU+4W3t0b4TXme04XkfKw="; }; nativeBuildInputs = [ From 1fc0a5fbee15c7564eaf49805d158199c83eac56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Apr 2022 01:30:39 +0000 Subject: [PATCH 02/48] cht-sh: unstable-2022-04-17 -> unstable-2022-04-18 --- pkgs/tools/misc/cht.sh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 0364065be24..b34b1ee4d51 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2022-04-17"; + version = "unstable-2022-04-18"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "7f769d6f3697541e55fd3ea9b71f190296529e48"; - sha256 = "+V3q71neW9X0JPJHqvNGopvIJfUv0VD9GKkz7YqN6Eo="; + rev = "571377f2f79422398a701cb1864487124ec3dcc6"; + sha256 = "0e9YhYcxU9t0SFeT1TjoRGTM3h1xRC528ae69tvz+a0="; }; # Fix ".cht.sh-wrapped" in the help message From 820180c4f01a92dd5692d56ef0bc42d62e211727 Mon Sep 17 00:00:00 2001 From: deinferno <14363193+deinferno@users.noreply.github.com> Date: Sat, 23 Apr 2022 20:24:52 +0500 Subject: [PATCH 03/48] maintainers: add deinferno --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8587a1fb02c..8af090f5f89 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14111,6 +14111,12 @@ github = "deifactor"; githubId = 30192992; }; + deinferno = { + name = "deinferno"; + email = "14363193+deinferno@users.noreply.github.com"; + github = "deinferno"; + githubId = 14363193; + }; fzakaria = { name = "Farid Zakaria"; email = "farid.m.zakaria@gmail.com"; From 19acc905d095a69dea1dd1bfeaf8b2709d0133bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Apr 2022 03:59:24 +0000 Subject: [PATCH 04/48] pyinfra: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/pyinfra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 130486a55f1..d85a1733224 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-157NtpA85FS27Ln1Xsvq5/qumSsr0WSDOhG0UwMUnRE="; + sha256 = "sha256-AW2pOyLqyugTSM7PE4oR9ZwD1liNpdD636QA3ElafG0="; }; propagatedBuildInputs = [ From fa01814245e0f6a4dedb720027db87923a404ad3 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 19 Apr 2022 20:21:41 +0200 Subject: [PATCH 05/48] pgadmin4: 6.7 -> 6.8 Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 8 +- pkgs/tools/admin/pgadmin/package.json | 11 +- pkgs/tools/admin/pgadmin/yarn.lock | 253 +++++++++++++++++++++++--- pkgs/tools/admin/pgadmin/yarn.nix | 244 +++++++++++++++++++++++-- 4 files changed, 468 insertions(+), 48 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 84781688ec1..50988681884 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -11,11 +11,11 @@ let pname = "pgadmin"; - version = "6.7"; + version = "6.8"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "1g2yxwgj9fp1fkn8j2jrdhmr2b2s6y8sgv4jq55aaxm4hfkkqh6d"; + sha256 = "sha256-kS9GV/j28zkXTJZkRrG2JDgas210rQqXOJrwwxzepbw="; }; yarnDeps = mkYarnModules { @@ -49,13 +49,13 @@ python3.pkgs.buildPythonApplication rec { patchShebangs . # relax dependencies substituteInPlace requirements.txt \ - --replace "Pillow==8.3.*" "Pillow>=8.3.0" \ --replace "psycopg2==2.9.*" "psycopg2>=2.9" \ --replace "cryptography==3.*" "cryptography>=3.0" \ --replace "requests==2.25.*" "requests>=2.25.0" \ --replace "boto3==1.20.*" "boto3>=1.20" \ --replace "botocore==1.23.*" "botocore>=1.23" \ - --replace "pytz==2021.*" "pytz" + --replace "pytz==2021.*" "pytz" \ + --replace "Werkzeug==2.0.3" "werkzeug>=2.*" # don't use Server Mode (can be overridden later) substituteInPlace pkg/pip/setup_pip.py \ --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \ diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index e4a27bd10d7..d708b05e488 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/pkgs/tools/admin/pgadmin/package.json @@ -8,8 +8,8 @@ "license": "PostgreSQL", "devDependencies": { "@babel/core": "^7.10.2", - "@babel/eslint-parser": "^7.12.13", - "@babel/eslint-plugin": "^7.12.13", + "@babel/eslint-parser": "^7.17.0", + "@babel/eslint-plugin": "^7.17.7", "@babel/plugin-proposal-object-rest-spread": "^7.10.1", "@babel/plugin-syntax-jsx": "^7.16.0", "@babel/preset-env": "^7.10.2", @@ -82,11 +82,12 @@ "@date-io/core": "^1.3.6", "@date-io/date-fns": "1.x", "@emotion/sheet": "^1.0.1", - "@fortawesome/fontawesome-free": "^5.14.0", "@material-ui/core": "4.11.0", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "4.0.0-alpha.58", "@material-ui/pickers": "^3.2.10", + "@mui/icons-material": "^5.4.2", + "@mui/material": "^5.4.3", "@projectstorm/react-diagrams": "^6.6.1", "@simonwep/pickr": "^1.5.1", "@szhsin/react-menu": "^2.2.0", @@ -145,7 +146,7 @@ "path-fx": "^2.0.0", "pathfinding": "^0.4.18", "paths-js": "^0.4.9", - "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422", + "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613", "postcss": "^8.2.15", "raf": "^3.4.1", "rc-dock": "^3.2.9", @@ -154,6 +155,8 @@ "react-checkbox-tree": "^1.7.2", "react-dom": "^17.0.1", "react-draggable": "^4.4.4", + "react-rnd": "^10.3.5", + "react-router-dom": "^6.2.2", "react-select": "^4.2.1", "react-table": "^7.6.3", "react-timer-hook": "^3.0.5", diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 7dc709ab5ad..bfb47913f8f 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -91,19 +91,19 @@ json5 "^2.1.2" semver "^6.3.0" -"@babel/eslint-parser@^7.12.13": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz#6f2bde6b0690fcc0598b4869fc7c8e8b55b17687" - integrity sha512-XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw== +"@babel/eslint-parser@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6" + integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA== dependencies: - eslint-scope "5.1.0" - eslint-visitor-keys "^1.3.0" + eslint-scope "^5.1.1" + eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/eslint-plugin@^7.12.13": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz#e6d99efcd6b8551adf479e382a47218726179b1b" - integrity sha512-YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w== +"@babel/eslint-plugin@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz#4ee1d5b29b79130f3bb5a933358376bcbee172b8" + integrity sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw== dependencies: eslint-rule-composer "^0.3.0" @@ -1741,6 +1741,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.17.2", "@babel/runtime@^7.7.6": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" + integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.12.13", "@babel/template@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" @@ -1849,6 +1856,17 @@ "@emotion/weak-memoize" "^0.2.5" stylis "^4.0.3" +"@emotion/cache@^11.7.1": + version "11.7.1" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539" + integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/sheet" "^1.1.0" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + stylis "4.0.13" + "@emotion/core@^10.0.14": version "10.1.1" resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3" @@ -1882,6 +1900,13 @@ dependencies: "@emotion/memoize" "0.7.4" +"@emotion/is-prop-valid@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" + integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/memoize@0.7.4": version "0.7.4" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" @@ -1937,6 +1962,11 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698" integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g== +"@emotion/sheet@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2" + integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g== + "@emotion/styled-base@^10.0.27": version "10.0.31" resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a" @@ -2117,6 +2147,93 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" +"@mui/base@5.0.0-alpha.74": + version "5.0.0-alpha.74" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz#15509242e7911446d5957375b1b18cbb72b3a750" + integrity sha512-pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ== + dependencies: + "@babel/runtime" "^7.17.2" + "@emotion/is-prop-valid" "^1.1.2" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + "@popperjs/core" "^2.11.4" + clsx "^1.1.1" + prop-types "^15.7.2" + react-is "^17.0.2" + +"@mui/icons-material@^5.4.2": + version "5.5.1" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz#848a57972617411370775980cbc6990588d4aafb" + integrity sha512-40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA== + dependencies: + "@babel/runtime" "^7.17.2" + +"@mui/material@^5.4.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz#411e53a69da3f9d6664e99f1bdcdaf2760540fdc" + integrity sha512-eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/base" "5.0.0-alpha.74" + "@mui/system" "^5.5.3" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + "@types/react-transition-group" "^4.4.4" + clsx "^1.1.1" + csstype "^3.0.11" + hoist-non-react-statics "^3.3.2" + prop-types "^15.7.2" + react-is "^17.0.2" + react-transition-group "^4.4.2" + +"@mui/private-theming@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz#c232a39dd3c268fdef7e92ccc40d51bda9eec3ab" + integrity sha512-Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/utils" "^5.5.3" + prop-types "^15.7.2" + +"@mui/styled-engine@^5.5.2": + version "5.5.2" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz#1f92dd27d76f0b7df7aa52c7c7a710e59b2275a6" + integrity sha512-jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA== + dependencies: + "@babel/runtime" "^7.17.2" + "@emotion/cache" "^11.7.1" + prop-types "^15.7.2" + +"@mui/system@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz#c78d4c16009430389ffd3495d694945422d72ca5" + integrity sha512-J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/private-theming" "^5.5.3" + "@mui/styled-engine" "^5.5.2" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + clsx "^1.1.1" + csstype "^3.0.11" + prop-types "^15.7.2" + +"@mui/types@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a" + integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA== + +"@mui/utils@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz#f6e1f10c0e8f4d0bf750588c2c3a96ad819c5b65" + integrity sha512-t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag== + dependencies: + "@babel/runtime" "^7.17.2" + "@types/prop-types" "^15.7.4" + "@types/react-is" "^16.7.1 || ^17.0.0" + prop-types "^15.7.2" + react-is "^17.0.2" + "@nodelib/fs.scandir@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" @@ -2159,6 +2276,11 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23" integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA== +"@popperjs/core@^2.11.4": + version "2.11.4" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" + integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg== + "@popperjs/core@^2.8.3": version "2.9.0" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546" @@ -2436,6 +2558,11 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== +"@types/prop-types@^15.7.4": + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + "@types/q@^1.5.1": version "1.5.4" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" @@ -2448,6 +2575,13 @@ dependencies: "@types/react" "^16" +"@types/react-is@^16.7.1 || ^17.0.0": + version "17.0.3" + resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a" + integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw== + dependencies: + "@types/react" "*" + "@types/react-transition-group@^4.2.0": version "4.4.1" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1" @@ -2455,6 +2589,13 @@ dependencies: "@types/react" "*" +"@types/react-transition-group@^4.4.4": + version "4.4.4" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e" + integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug== + dependencies: + "@types/react" "*" + "@types/react@*", "@types/react@^16": version "16.14.10" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477" @@ -4540,6 +4681,11 @@ csstype@^2.5.2, csstype@^2.5.7: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39" integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q== +csstype@^3.0.11: + version "3.0.11" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" + integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw== + csstype@^3.0.2: version "3.0.8" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" @@ -5223,14 +5369,6 @@ eslint-rule-composer@^0.3.0: resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg== -eslint-scope@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" - integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -5251,7 +5389,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^2.0.0: +eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== @@ -5320,7 +5458,7 @@ esquery@^1.4.0: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0, esrecurse@^4.3.0: +esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== @@ -5498,6 +5636,11 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-memoize@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e" + integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw== + fast-safe-stringify@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" @@ -6059,6 +6202,13 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== +history@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b" + integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== + dependencies: + "@babel/runtime" "^7.7.6" + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -8351,9 +8501,9 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422": +"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613": version "1.0.0" - resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422" + resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613" dependencies: "@types/classnames" "^2.2.6" "@types/react" "^16.7.18" @@ -9023,6 +9173,13 @@ rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.5.0 react-is "^16.12.0" shallowequal "^1.1.0" +re-resizable@6.9.1: + version "6.9.1" + resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c" + integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ== + dependencies: + fast-memoize "^2.5.1" + react-aspen@^1.1.0, react-aspen@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038" @@ -9063,6 +9220,14 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.2" +react-draggable@4.4.3: + version "4.4.3" + resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3" + integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w== + dependencies: + classnames "^2.2.5" + prop-types "^15.6.0" + react-draggable@^4.4.4: version "4.4.4" resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f" @@ -9093,6 +9258,30 @@ react-property@1.0.1: resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6" integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ== +react-rnd@^10.3.5: + version "10.3.5" + resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz#b66e5e06f1eb6823e72eb4b552081b4b9241b139" + integrity sha512-LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw== + dependencies: + re-resizable "6.9.1" + react-draggable "4.4.3" + tslib "2.3.0" + +react-router-dom@^6.2.2: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" + integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw== + dependencies: + history "^5.2.0" + react-router "6.3.0" + +react-router@6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557" + integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ== + dependencies: + history "^5.2.0" + react-select@^4.2.1: version "4.3.1" resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81" @@ -9144,6 +9333,16 @@ react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-g loose-envify "^1.4.0" prop-types "^15.6.2" +react-transition-group@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" + integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react-transition-state@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/react-transition-state/-/react-transition-state-1.1.3.tgz#6d999dc640ffd3a7442021a14a58e13347f4e95f" @@ -10161,6 +10360,11 @@ stylehacks@^5.0.1: browserslist "^4.16.0" postcss-selector-parser "^6.0.4" +stylis@4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" + integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== + stylis@^4.0.3, stylis@^4.0.7: version "4.0.10" resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" @@ -10511,6 +10715,11 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tslib@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index eca056bc921..9e2ed892fcd 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/pkgs/tools/admin/pgadmin/yarn.nix @@ -74,19 +74,19 @@ }; } { - name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; + name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz"; path = fetchurl { - name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz"; - sha512 = "XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw=="; + name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz"; + sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA=="; }; } { - name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; + name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz"; path = fetchurl { - name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz"; - sha512 = "YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w=="; + name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz"; + sha512 = "JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw=="; }; } { @@ -1577,6 +1577,14 @@ sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ=="; }; } + { + name = "_babel_runtime___runtime_7.17.8.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.17.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz"; + sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; + }; + } { name = "_babel_template___template_7.14.5.tgz"; path = fetchurl { @@ -1673,6 +1681,14 @@ sha512 = "Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g=="; }; } + { + name = "_emotion_cache___cache_11.7.1.tgz"; + path = fetchurl { + name = "_emotion_cache___cache_11.7.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz"; + sha512 = "r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A=="; + }; + } { name = "_emotion_core___core_10.1.1.tgz"; path = fetchurl { @@ -1705,6 +1721,14 @@ sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="; }; } + { + name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; + path = fetchurl { + name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz"; + sha512 = "3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ=="; + }; + } { name = "_emotion_memoize___memoize_0.7.4.tgz"; path = fetchurl { @@ -1761,6 +1785,14 @@ sha512 = "GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="; }; } + { + name = "_emotion_sheet___sheet_1.1.0.tgz"; + path = fetchurl { + name = "_emotion_sheet___sheet_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz"; + sha512 = "u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g=="; + }; + } { name = "_emotion_styled_base___styled_base_10.0.31.tgz"; path = fetchurl { @@ -1929,6 +1961,70 @@ sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA=="; }; } + { + name = "_mui_base___base_5.0.0_alpha.74.tgz"; + path = fetchurl { + name = "_mui_base___base_5.0.0_alpha.74.tgz"; + url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz"; + sha512 = "pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ=="; + }; + } + { + name = "_mui_icons_material___icons_material_5.5.1.tgz"; + path = fetchurl { + name = "_mui_icons_material___icons_material_5.5.1.tgz"; + url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz"; + sha512 = "40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA=="; + }; + } + { + name = "_mui_material___material_5.5.3.tgz"; + path = fetchurl { + name = "_mui_material___material_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz"; + sha512 = "eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A=="; + }; + } + { + name = "_mui_private_theming___private_theming_5.5.3.tgz"; + path = fetchurl { + name = "_mui_private_theming___private_theming_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz"; + sha512 = "Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A=="; + }; + } + { + name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; + path = fetchurl { + name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; + url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz"; + sha512 = "jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA=="; + }; + } + { + name = "_mui_system___system_5.5.3.tgz"; + path = fetchurl { + name = "_mui_system___system_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz"; + sha512 = "J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw=="; + }; + } + { + name = "_mui_types___types_7.1.3.tgz"; + path = fetchurl { + name = "_mui_types___types_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz"; + sha512 = "DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA=="; + }; + } + { + name = "_mui_utils___utils_5.5.3.tgz"; + path = fetchurl { + name = "_mui_utils___utils_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz"; + sha512 = "t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag=="; + }; + } { name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; path = fetchurl { @@ -1977,6 +2073,14 @@ sha512 = "15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA=="; }; } + { + name = "_popperjs_core___core_2.11.4.tgz"; + path = fetchurl { + name = "_popperjs_core___core_2.11.4.tgz"; + url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz"; + sha512 = "q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg=="; + }; + } { name = "_popperjs_core___core_2.9.0.tgz"; path = fetchurl { @@ -2313,6 +2417,14 @@ sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="; }; } + { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + path = fetchurl { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz"; + sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="; + }; + } { name = "_types_q___q_1.5.4.tgz"; path = fetchurl { @@ -2329,6 +2441,14 @@ sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A=="; }; } + { + name = "_types_react_is___react_is_17.0.3.tgz"; + path = fetchurl { + name = "_types_react_is___react_is_17.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz"; + sha512 = "aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw=="; + }; + } { name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; path = fetchurl { @@ -2337,6 +2457,14 @@ sha512 = "vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ=="; }; } + { + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; + path = fetchurl { + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz"; + sha512 = "7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug=="; + }; + } { name = "_types_react___react_16.14.10.tgz"; path = fetchurl { @@ -4473,6 +4601,14 @@ sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q=="; }; } + { + name = "csstype___csstype_3.0.11.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz"; + sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="; + }; + } { name = "csstype___csstype_3.0.8.tgz"; path = fetchurl { @@ -5185,14 +5321,6 @@ sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg=="; }; } - { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; - }; - } { name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { @@ -5441,6 +5569,14 @@ sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; }; } + { + name = "fast_memoize___fast_memoize_2.5.2.tgz"; + path = fetchurl { + name = "fast_memoize___fast_memoize_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz"; + sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; + }; + } { name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; path = fetchurl { @@ -6081,6 +6217,14 @@ sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; } + { + name = "history___history_5.3.0.tgz"; + path = fetchurl { + name = "history___history_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz"; + sha512 = "ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ=="; + }; + } { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; path = fetchurl { @@ -8823,8 +8967,8 @@ let repo = fetchgit { url = "https://github.com/EnterpriseDB/pgadmin4-treeview/"; - rev = "bf7ac7be65898883e3e05c9733426152a1da6422"; - sha256 = "0nsn7s0d1kpgpb554hkz7nsifzdyff06qc78gqmzd8j3sfcbjk63"; + rev = "c966febebcdffaa46f1ccf0769fe5308f179d613"; + sha256 = "0fxjalh7g8fwy3fczbj9pvf8g06chq41gw1jidz106wadjr72081"; }; in runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } '' @@ -9553,6 +9697,14 @@ sha512 = "HWuTIKzBeZQQ7IBqdokE0wMp/xx39/KfUJ0gcquBigoldDCrf3YBcWFHrrQlJG7sI82Wg8mwp1uAKV3zMGfAgg=="; }; } + { + name = "re_resizable___re_resizable_6.9.1.tgz"; + path = fetchurl { + name = "re_resizable___re_resizable_6.9.1.tgz"; + url = "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz"; + sha512 = "KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ=="; + }; + } { name = "react_aspen___react_aspen_1.1.1.tgz"; path = fetchurl { @@ -9585,6 +9737,14 @@ sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="; }; } + { + name = "react_draggable___react_draggable_4.4.3.tgz"; + path = fetchurl { + name = "react_draggable___react_draggable_4.4.3.tgz"; + url = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz"; + sha512 = "jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w=="; + }; + } { name = "react_draggable___react_draggable_4.4.4.tgz"; path = fetchurl { @@ -9625,6 +9785,30 @@ sha512 = "1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ=="; }; } + { + name = "react_rnd___react_rnd_10.3.5.tgz"; + path = fetchurl { + name = "react_rnd___react_rnd_10.3.5.tgz"; + url = "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz"; + sha512 = "LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw=="; + }; + } + { + name = "react_router_dom___react_router_dom_6.3.0.tgz"; + path = fetchurl { + name = "react_router_dom___react_router_dom_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz"; + sha512 = "uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw=="; + }; + } + { + name = "react_router___react_router_6.3.0.tgz"; + path = fetchurl { + name = "react_router___react_router_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz"; + sha512 = "7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ=="; + }; + } { name = "react_select___react_select_4.3.1.tgz"; path = fetchurl { @@ -9673,6 +9857,14 @@ sha512 = "Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw=="; }; } + { + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz"; + sha512 = "/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg=="; + }; + } { name = "react_transition_state___react_transition_state_1.1.3.tgz"; path = fetchurl { @@ -10865,6 +11057,14 @@ sha512 = "Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA=="; }; } + { + name = "stylis___stylis_4.0.13.tgz"; + path = fetchurl { + name = "stylis___stylis_4.0.13.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz"; + sha512 = "xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="; + }; + } { name = "stylis___stylis_4.0.10.tgz"; path = fetchurl { @@ -11233,6 +11433,14 @@ sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM="; }; } + { + name = "tslib___tslib_2.3.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.2.0.tgz"; path = fetchurl { From cf6b75adb05c0f03fa08ed4efd2f79e763f6effe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Apr 2022 21:28:33 +0200 Subject: [PATCH 06/48] pgadmin: fix pgadmin4 command --- pkgs/tools/admin/pgadmin/default.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 50988681884..9f2c5c085f1 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -25,9 +25,27 @@ let yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; }; + + pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + flask = prev.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; + }; + disabledTests = (oldAttrs.disabledTests or []) ++ [ + "test_aborting" + ]; + }); + flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec { + # Nothing of interest changed from 0.2 to 0.3 + doCheck = false; + }); + }); + in -python3.pkgs.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { inherit pname version src; # from Dockerfile @@ -101,10 +119,10 @@ python3.pkgs.buildPythonApplication rec { cp -v ../pkg/pip/setup_pip.py setup.py ''; - nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ]; + nativeBuildInputs = with pythonPackages; [ cython pip ]; buildInputs = [ zlib - python3.pkgs.wheel + pythonPackages.wheel ]; # tests need an own data, log directory @@ -112,7 +130,7 @@ python3.pkgs.buildPythonApplication rec { # checks will be run through nixos/tests doCheck = false; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with pythonPackages; [ flask flask-gravatar flask_login From 5cf8ef4ba41161531fcfaae7e02c2c616d6902a7 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 20 Apr 2022 00:37:08 +0200 Subject: [PATCH 07/48] pgadmin: add werkzeug override Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 9f2c5c085f1..77cfff9aa39 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -33,7 +33,7 @@ let inherit version; sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; }; - disabledTests = (oldAttrs.disabledTests or []) ++ [ + disabledTests = (oldAttrs.disabledTests or [ ]) ++ [ "test_aborting" ]; }); @@ -41,6 +41,13 @@ let # Nothing of interest changed from 0.2 to 0.3 doCheck = false; }); + werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; + }; + }); }); in From eff62ac1963df80205482aa6d40962f1abdfa832 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 20 Apr 2022 00:45:38 +0200 Subject: [PATCH 08/48] pgadmin4: make regression test use the same packages Signed-off-by: Florian Brandes --- nixos/tests/pgadmin4.nix | 125 ++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 47 deletions(-) diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index 2f6dc3bd569..dd4be1d0616 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -5,49 +5,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: pgadmin4Dir = "/var/lib/pgadmin"; pgadmin4LogDir = "/var/log/pgadmin"; - python-with-needed-packages = pkgs.python3.withPackages (ps: with ps; [ - selenium - testtools - testscenarios - flask - flask-babelex - flask-babel - flask-gravatar - flask_login - flask_mail - flask_migrate - flask_sqlalchemy - flask_wtf - flask-compress - passlib - pytz - simplejson - six - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - boto3 - ]); in { name = "pgadmin4"; @@ -55,12 +12,86 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: nodes.machine = { pkgs, ... }: { imports = [ ./common/x11.nix ]; + # needed because pgadmin 6.8 will fail, if those dependencies get updated + nixpkgs.overlays = [ + (self: super: { + pythonPackages = super.python3.pkgs.overrideScope (final: prev: rec { + + flask = prev.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; + }; + disabledTests = (oldAttrs.disabledTests or [ ]) ++ [ + "test_aborting" + ]; + }); + flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec { + # Nothing of interest changed from 0.2 to 0.3 + doCheck = false; + }); + werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; + }; + }); + }); + }) + ]; + environment.systemPackages = with pkgs; [ pgadmin4 postgresql - python-with-needed-packages chromedriver chromium + (python3.withPackages + (ps: with pythonPackages; [ + selenium + testtools + testscenarios + flask + flask-babelex + flask-babel + flask-gravatar + flask_login + flask_mail + flask_migrate + flask_sqlalchemy + flask_wtf + flask-compress + passlib + pytz + simplejson + six + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + boto3 + ]) + ) ]; services.postgresql = { enable = true; @@ -121,7 +152,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: with subtest("run browser test"): machine.succeed( 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg browser --exclude \ + && python regression/runtests.py --pkg browser --exclude \ browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login' ) @@ -131,13 +162,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: machine.succeed( 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \ - && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg feature_tests' + && python regression/runtests.py --pkg feature_tests' ) with subtest("run resql test"): machine.succeed( 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg resql' + && python regression/runtests.py --pkg resql' ) ''; }) From eef222b8c2f220033fb76aa64cdfd9dcf9d6a3aa Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 24 Apr 2022 13:17:42 +0200 Subject: [PATCH 09/48] pgadmin4: fix tests this commit passes the build dependencies to the pgadmin nixos test for package and regression testing. Also added changelog and some clarifying comments. Signed-off-by: Florian Brandes --- nixos/tests/pgadmin4.nix | 68 ++++++----------- pkgs/tools/admin/pgadmin/default.nix | 106 +++++++++++++++------------ 2 files changed, 82 insertions(+), 92 deletions(-) diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index dd4be1d0616..6c37bc0502f 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -1,4 +1,20 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: +import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], ... }: + + /* + This test suite replaces the typical pytestCheckHook function in python + packages. Pgadmin4 test suite needs a running and configured postgresql + server. This is why this test exists. + + To not repeat all the python dependencies needed, this test is called directly + from the pgadmin4 derivation, which also passes the currently + used propagatedBuildInputs. + + Unfortunately, there doesn't seem to be an easy way to otherwise include + the needed packages here. + + Also any python Overrides need to be duplicated here, too. + + */ let pgadmin4SrcDir = "/pgadmin"; @@ -47,50 +63,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: postgresql chromedriver chromium + # include the same packages as in pgadmin minus speaklater3 (python3.withPackages - (ps: with pythonPackages; [ - selenium - testtools - testscenarios - flask - flask-babelex - flask-babel - flask-gravatar - flask_login - flask_mail - flask_migrate - flask_sqlalchemy - flask_wtf - flask-compress - passlib - pytz - simplejson - six - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - boto3 - ]) + (ps: buildDeps ++ + [ + # test suite package requirements + pythonPackages.testscenarios + pythonPackages.selenium + ]) ) ]; services.postgresql = { diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 77cfff9aa39..8b40687ec0b 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -1,17 +1,19 @@ -{ stdenv -, lib +{ lib , python3 , fetchurl , zlib , mkYarnModules , sphinx , nixosTests +, pkgs }: let pname = "pgadmin"; - version = "6.8"; + majorVersion = "6"; + minorVersion = "8"; + version = "${majorVersion}.${minorVersion}"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; @@ -26,6 +28,50 @@ let yarnNix = ./yarn.nix; }; + # move buildDeps here to easily pass to test suite + buildDeps = with pythonPackages; [ + flask + flask-gravatar + flask_login + flask_mail + flask_migrate + flask_sqlalchemy + flask_wtf + flask-compress + passlib + pytz + simplejson + six + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + flask-babelex + flask-babel + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + botocore + boto3 + ]; + + # override necessary on pgadmin4 6.8 pythonPackages = python3.pkgs.overrideScope (final: prev: rec { flask = prev.flask.overridePythonAttrs (oldAttrs: rec { version = "2.0.3"; @@ -68,7 +114,7 @@ pythonPackages.buildPythonApplication rec { postPatch = '' # patching Makefile, so it doesn't try to build sphinx documentation here # (will do so later) - substituteInPlace Makefile --replace "LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html" "true" + substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true" # fix document which refers a non-existing document and fails substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" "" patchShebangs . @@ -137,57 +183,21 @@ pythonPackages.buildPythonApplication rec { # checks will be run through nixos/tests doCheck = false; - propagatedBuildInputs = with pythonPackages; [ - flask - flask-gravatar - flask_login - flask_mail - flask_migrate - flask_sqlalchemy - flask_wtf - flask-compress - passlib - pytz - simplejson - six - speaklater3 - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - flask-babelex - flask-babel - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - botocore - boto3 - ]; + # speaklater3 is seperate because when passing buildDeps + # to the test, it fails there due to a collision with speaklater + propagatedBuildInputs = buildDeps ++ [pythonPackages.speaklater3]; - passthru = { - tests = { inherit (nixosTests) pgadmin4 pgadmin4-standalone; }; + passthru.tests = { + standalone = nixosTests.pgadmin4-standalone; + # regression and function tests of the package itself + package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; })); }; meta = with lib; { description = "Administration and development platform for PostgreSQL"; homepage = "https://www.pgadmin.org/"; license = licenses.mit; + changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${majorVersion}_${minorVersion}.html"; maintainers = with maintainers; [ gador ]; }; } From 0dd6926b29a4510d5e1d7540dd5d6a0fb485e578 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 27 Apr 2022 19:14:02 +0200 Subject: [PATCH 10/48] pgadmin: revert version string Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 8b40687ec0b..ac3af0c1edf 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -11,9 +11,7 @@ let pname = "pgadmin"; - majorVersion = "6"; - minorVersion = "8"; - version = "${majorVersion}.${minorVersion}"; + version = "6.8"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; @@ -84,7 +82,7 @@ let ]; }); flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec { - # Nothing of interest changed from 0.2 to 0.3 + # tests fail due to downgrades here doCheck = false; }); werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { @@ -185,7 +183,7 @@ pythonPackages.buildPythonApplication rec { # speaklater3 is seperate because when passing buildDeps # to the test, it fails there due to a collision with speaklater - propagatedBuildInputs = buildDeps ++ [pythonPackages.speaklater3]; + propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ]; passthru.tests = { standalone = nixosTests.pgadmin4-standalone; @@ -197,7 +195,7 @@ pythonPackages.buildPythonApplication rec { description = "Administration and development platform for PostgreSQL"; homepage = "https://www.pgadmin.org/"; license = licenses.mit; - changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${majorVersion}_${minorVersion}.html"; + changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major}_${versions.minor}.html"; maintainers = with maintainers; [ gador ]; }; } From 709cc7066b631ebc7b97d7213385045985e6e6c9 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 28 Apr 2022 15:03:31 +0200 Subject: [PATCH 11/48] pgadmin4: pass pythonEnv as variable Signed-off-by: Florian Brandes --- nixos/tests/pgadmin4.nix | 32 +++++----------------------- pkgs/tools/admin/pgadmin/default.nix | 2 +- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index 6c37bc0502f..b30299d307e 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], ... }: +import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }: /* This test suite replaces the typical pytestCheckHook function in python @@ -7,12 +7,13 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], ... }: To not repeat all the python dependencies needed, this test is called directly from the pgadmin4 derivation, which also passes the currently - used propagatedBuildInputs. + used propagatedBuildInputs and any python overrides. Unfortunately, there doesn't seem to be an easy way to otherwise include the needed packages here. - Also any python Overrides need to be duplicated here, too. + Due the the needed parameters a direct call to "nixosTests.pgadmin4" fails + and needs to be called as "pgadmin4.tests" */ @@ -31,30 +32,7 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], ... }: # needed because pgadmin 6.8 will fail, if those dependencies get updated nixpkgs.overlays = [ (self: super: { - pythonPackages = super.python3.pkgs.overrideScope (final: prev: rec { - - flask = prev.flask.overridePythonAttrs (oldAttrs: rec { - version = "2.0.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; - }; - disabledTests = (oldAttrs.disabledTests or [ ]) ++ [ - "test_aborting" - ]; - }); - flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec { - # Nothing of interest changed from 0.2 to 0.3 - doCheck = false; - }); - werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "2.0.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; - }; - }); - }); + pythonPackages = pythonEnv; }) ]; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index ac3af0c1edf..974ec1cd00e 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -188,7 +188,7 @@ pythonPackages.buildPythonApplication rec { passthru.tests = { standalone = nixosTests.pgadmin4-standalone; # regression and function tests of the package itself - package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; })); + package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; })); }; meta = with lib; { From 0c8e4f4f19094957758efb1be5ee4b1ebf524b45 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 28 Apr 2022 17:03:01 +0200 Subject: [PATCH 12/48] pgadmin: minor bugfix in version string Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 974ec1cd00e..d917acd656c 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -195,7 +195,7 @@ pythonPackages.buildPythonApplication rec { description = "Administration and development platform for PostgreSQL"; homepage = "https://www.pgadmin.org/"; license = licenses.mit; - changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major}_${versions.minor}.html"; + changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html"; maintainers = with maintainers; [ gador ]; }; } From 1c2c2009fc66d64d6fd217aa0601c610ed4f230e Mon Sep 17 00:00:00 2001 From: barinov274 Date: Wed, 27 Apr 2022 22:41:29 +1000 Subject: [PATCH 13/48] python39Packages.fonttools: 4.30.0 -> 4.33.3 --- pkgs/development/python-modules/fonttools/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index a70dfef0054..a667f631eb1 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -13,11 +13,12 @@ , sphinx , pytestCheckHook , glibcLocales +, setuptools-scm }: buildPythonPackage rec { pname = "fonttools"; - version = "4.30.0"; + version = "4.33.3"; disabled = pythonOlder "3.7"; @@ -25,9 +26,11 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "1y9f071bdl66rsx42j16j5v53h85xra5qlg860rz3m054s2rmin9"; + sha256 = "MUIZGnYwlfTat9655AOYgK5r6AvHj/xXghUvOZR8HIM="; }; + nativeBuildInputs = [ setuptools-scm ]; + # all dependencies are optional, but # we run the checks with them @@ -51,6 +54,8 @@ buildPythonPackage rec { unicodedata2 ]; + pythonImportsCheck = [ "fontTools" ]; + preCheck = '' # tests want to execute the "fonttools" executable from $PATH export PATH="$out/bin:$PATH" @@ -72,7 +77,6 @@ buildPythonPackage rec { "Tests/ufoLib" ]; - meta = with lib; { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; From 30262ff5978963cdb10d291f5d135e69932bebd6 Mon Sep 17 00:00:00 2001 From: barinov274 Date: Wed, 27 Apr 2022 22:43:05 +1000 Subject: [PATCH 14/48] python39Packages.ufo2ft: 2.26.0 -> 2.27.0 --- pkgs/development/python-modules/ufo2ft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 8f700107bce..b1e5ea7905a 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.26.0"; + version = "2.27.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1WQAs1ypWtLObgBzPtqtvHjkKnDWohu3PbI3bF7B0Sg="; + sha256 = "r5bE4M/blt5TKzP43MpijwYY6ll3aasszmGksY5WTTE="; }; patches = [ From 3538ce088a6f1239040e0ec719ae4c9b060ecb4e Mon Sep 17 00:00:00 2001 From: barinov274 Date: Wed, 27 Apr 2022 22:44:53 +1000 Subject: [PATCH 15/48] python39Packages.ufoLib2: add setuptoold-csm in nativeBuildInputs --- pkgs/development/python-modules/ufoLib2/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix index 21894203d1a..fab42e5169b 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufoLib2/default.nix @@ -5,6 +5,7 @@ , fonttools , pytestCheckHook , fs +, setuptools-scm }: buildPythonPackage rec { @@ -25,6 +26,8 @@ buildPythonPackage rec { fs ]; + nativeBuildInputs = [ setuptools-scm ]; + checkInputs = [ pytestCheckHook ]; From 113ca3c22cf9a5afb0577948b85fc523c717ba37 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 27 Apr 2022 23:40:52 +0200 Subject: [PATCH 16/48] tor: 0.4.6.10 -> 0.4.7.7 - disable sandbox for aarch64-linux for now --- pkgs/tools/security/tor/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 14e0be73f01..90485ae817e 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.6.10"; + version = "0.4.7.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw="; + sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q="; }; outputs = [ "out" "geoip" ]; @@ -45,9 +45,13 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; - # cross compiles correctly but needs the following - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--disable-tool-name-check"; + configureFlags = + # cross compiles correctly but needs the following + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] + ++ + # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599 + lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ] + ; NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s"; From 89ace3967e0fefef19666366d64d315bae9b8f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 30 Apr 2022 14:17:29 +0200 Subject: [PATCH 17/48] nixos/udev: systemd initrd improvements First, add the builtin udev rules to /etc/udev/rules.d so they are used. Then, add all networkd .link units to the initrd. This is done in the old stage 1 as well so I assume this is needed even when networkd is not used. I assume this is for things like changing the MAC address. Also limit the number of udev/lib binaries that is put into the initrd because the old initrd doesn't use all units either. --- nixos/modules/services/hardware/udev.nix | 39 +++++++++++++++++++----- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 8257eeb673b..2f386617187 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -8,6 +8,24 @@ let cfg = config.services.udev; + initrdUdevRules = pkgs.runCommand "initrd-udev-rules" {} '' + mkdir -p $out/etc/udev/rules.d + for f in 60-cdrom_id 60-persistent-storage 75-net-description 80-drivers 80-net-setup-link; do + ln -s ${config.boot.initrd.systemd.package}/lib/udev/rules.d/$f.rules $out/etc/udev/rules.d + done + ''; + + + # networkd link files are used early by udev to set up interfaces early. + # This must be done in stage 1 to avoid race conditions between udev and + # network daemons. + # TODO move this into the initrd-network module when it exists + initrdLinkUnits = pkgs.runCommand "initrd-link-units" {} '' + mkdir -p $out + ln -s ${udev}/lib/systemd/network/*.link $out/ + ${lib.concatMapStringsSep "\n" (file: "ln -s ${file} $out/") (lib.mapAttrsToList (n: v: "${v.unit}/${n}") (lib.filterAttrs (n: _: hasSuffix ".link" n) config.systemd.network.units))} + ''; + extraUdevRules = pkgs.writeTextFile { name = "extra-udev-rules"; text = cfg.extraRules; @@ -350,7 +368,10 @@ in ]; boot.initrd.systemd.storePaths = [ "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd" - "${config.boot.initrd.systemd.package}/lib/udev" + "${config.boot.initrd.systemd.package}/lib/udev/ata_id" + "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id" + "${config.boot.initrd.systemd.package}/lib/udev/scsi_id" + "${config.boot.initrd.systemd.package}/lib/udev/rules.d" ] ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages; # Generate the udev rules for the initrd @@ -364,13 +385,17 @@ in systemd = config.boot.initrd.systemd.package; binPackages = config.boot.initrd.services.udev.binPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ]; }; + "/etc/systemd/network".source = initrdLinkUnits; }; - # Insert custom rules - boot.initrd.services.udev.packages = mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile { - name = "initrd-udev-rules"; - destination = "/etc/udev/rules.d/99-local.rules"; - text = config.boot.initrd.services.udev.rules; - }); + # Insert initrd rules + boot.initrd.services.udev.packages = [ + initrdUdevRules + (mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile { + name = "initrd-udev-rules"; + destination = "/etc/udev/rules.d/99-local.rules"; + text = config.boot.initrd.services.udev.rules; + })) + ]; environment.etc = { From 53d9b6397c151d71ade76609a10e557c88987e2a Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Sun, 1 May 2022 13:36:45 +0200 Subject: [PATCH 18/48] bloop: 1.4.13 -> 1.5.0 --- .../tools/build-managers/bloop/default.nix | 62 +++++-------------- 1 file changed, 16 insertions(+), 46 deletions(-) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 0649b0c86c6..aa0e9adc2fc 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, coursier , autoPatchelfHook , installShellFiles , makeWrapper @@ -11,58 +10,34 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.13"; + version = "1.5.0"; - bloop-coursier-channel = fetchurl { - url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "VbvBAz7mXhgQtbrlB6uCSmZXLcdYaROJRSREbazAReo="; - }; + platform = + if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" + else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" + else throw "unsupported platform"; bloop-bash = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions"; - sha256 = "2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE="; + sha256 = "sha256-2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE="; }; bloop-fish = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions"; - sha256 = "eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4="; + sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4="; }; bloop-zsh = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions"; - sha256 = "WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c="; + sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c="; }; - bloop-coursier = stdenv.mkDerivation rec { - name = "${pname}-coursier-${version}"; - - platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" - else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" - else throw "unsupported platform"; - - dontUnpack = true; - installPhase = '' - runHook preInstall - - export COURSIER_CACHE=$(pwd) - export COURSIER_JVM_CACHE=$(pwd) - - mkdir channel - ln -s ${bloop-coursier-channel} channel/bloop.json - ${coursier}/bin/cs install --install-dir . --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop - - # Only keeping the binary, we'll wrap it ourselves - # This guarantees the output of this fixed-output derivation doesn't have references to itself - install -D -m 0755 .bloop.aux $out - - runHook postInstall - ''; - - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-AiF/ih15Jd0WuDP/0vU0vdaSo3FGjWXos+hNVBayFz4=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-LD23YpcNhWfioGDMqb1plqLy87ZHzT0zvIyc4O4WP5g=" - else throw "unsupported platform"; + bloop-binary = fetchurl rec { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; + sha256 = + if stdenv.isLinux && stdenv.isx86_64 then "sha256-jif9z05W17vjFgb146qWC3o44HmbnX05gWPlbXttYsE=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-YOnXgKXsGrTu9P4I0NZW6ollZVQUXnbW8WtZTJmy+w0=" + else throw "unsupported platform"; }; dontUnpack = true; @@ -74,14 +49,9 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - export COURSIER_CACHE=$(pwd) - export COURSIER_JVM_CACHE=$(pwd) + install -D -m 0755 ${bloop-binary} $out/.bloop-wrapped - install -D -m 0755 ${bloop-coursier} $out/.bloop-wrapped - - makeWrapper $out/.bloop-wrapped $out/bin/bloop \ - --set CS_NATIVE_LAUNCHER true \ - --set IS_CS_INSTALLED_LAUNCHER true + makeWrapper $out/.bloop-wrapped $out/bin/bloop #Install completions installShellCompletion --name bloop --bash ${bloop-bash} From 2bddfc7cd326eae64fc1dfb954ae151b7db15860 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 12:07:27 +0200 Subject: [PATCH 19/48] python39Packages.pyeapi: fix Python 3.10 support --- .../python-modules/pyeapi/default.nix | 39 +++++++++++++++---- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index a31123492d4..e856a33da02 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -1,10 +1,11 @@ { lib , buildPythonPackage -, pythonAtLeast , fetchFromGitHub +, fetchpatch +, mock , netaddr , pytestCheckHook -, mock +, pythonOlder }: buildPythonPackage rec { @@ -12,8 +13,7 @@ buildPythonPackage rec { version = "0.8.4"; format = "pyproject"; - # https://github.com/arista-eosplus/pyeapi/issues/189 - disabled = pythonAtLeast "3.10"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "arista-eosplus"; @@ -22,21 +22,44 @@ buildPythonPackage rec { sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; }; - propagatedBuildInputs = [ netaddr ]; + propagatedBuildInputs = [ + netaddr + ]; checkInputs = [ mock pytestCheckHook ]; - pytestFlagsArray = [ "test/unit" ]; + patches = [ + # Fix usage of collection, https://github.com/arista-eosplus/pyeapi/pull/223 + (fetchpatch { + name = "fix-collection-usage.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch"; + sha256 = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8="; + }) + ]; - pythonImportsCheck = [ "pyeapi" ]; + postPatch = '' + # https://github.com/arista-eosplus/pyeapi/pull/223 + substituteInPlace test/unit/test_utils.py \ + --replace "collections.Iterable" "collections.abc.Iterable" + substituteInPlace pyeapi/api/abstract.py \ + --replace "from collections" "from collections.abc" + ''; + + pytestFlagsArray = [ + "test/unit" + ]; + + pythonImportsCheck = [ + "pyeapi" + ]; meta = with lib; { description = "Client for Arista eAPI"; homepage = "https://github.com/arista-eosplus/pyeapi"; license = licenses.bsd3; - maintainers = [ maintainers.astro ]; + maintainers = with maintainers; [ astro ]; }; } From b2542b5b05d1e750e2ade0ae339250ec72640e7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 00:49:37 +0000 Subject: [PATCH 20/48] aws-google-auth: 0.0.37 -> 0.0.38 --- pkgs/tools/admin/aws-google-auth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index 9330291014d..aa1c77ef68e 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -20,15 +20,15 @@ buildPythonApplication rec { pname = "aws-google-auth"; - version = "0.0.37"; + version = "0.0.38"; # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 src = fetchFromGitHub { owner = "cevoaustralia"; repo = "aws-google-auth"; - rev = version; - sha256 = "1bh733n4m5rsslpbjvhdigx6768nrvacybkakrm9704d2md9vkqd"; + rev = "refs/tags/${version}"; + sha256 = "sha256-/Xe4RDA9sBEsBBV1VP91VX0VfO8alK8L70m9WrB7qu4="; }; propagatedBuildInputs = [ From a0ab345013c811a3d5841c6f126b7684a96d7e92 Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 2 May 2022 20:16:33 -0700 Subject: [PATCH 21/48] freeipmi: support cross compile --- pkgs/tools/system/freeipmi/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 09b7b312799..0820869fb0d 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }: +{ buildPackages, fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }: stdenv.mkDerivation rec { version = "1.6.9"; @@ -9,8 +9,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY="; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + buildInputs = [ libgcrypt readline libgpg-error ]; + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) + [ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ]; + doCheck = true; meta = { From 76fbad7ba64df65c3a36fb71def1215797ed964a Mon Sep 17 00:00:00 2001 From: barinov274 Date: Wed, 27 Apr 2022 22:47:09 +1000 Subject: [PATCH 22/48] python39Packages.fontmake: init at 3.3.0 --- .../python-modules/fontmake/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/fontmake/default.nix diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix new file mode 100644 index 00000000000..a075d64406e --- /dev/null +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glyphslib +, setuptools-scm +, ufo2ft +, fonttools +, fontmath +, lxml +, setuptools +}: + +buildPythonPackage rec { + pname = "fontmake"; + version = "3.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-lD7MvZdr9CeWdoZtD3+8stVJTeQN5/AQ4miA/I2TFoE="; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + glyphslib + ufo2ft + fonttools + fontmath + lxml + setuptools + ]; + + pythonImportsCheck = [ "fontmake" ]; + + meta = { + description = "Compiles fonts from various sources (.glyphs, .ufo, designspace) into binaries formats (.otf, .ttf)"; + homepage = "https://github.com/googlefonts/fontmake"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.BarinovMaxim ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 287d2928a30..a724a589947 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3107,6 +3107,8 @@ in { fonttools = callPackage ../development/python-modules/fonttools { }; + fontmake = callPackage ../development/python-modules/fontmake { }; + foobot-async = callPackage ../development/python-modules/foobot-async { }; foolscap = callPackage ../development/python-modules/foolscap { }; From a12295c1f9871d2a690b5aacd48c281865d43e59 Mon Sep 17 00:00:00 2001 From: barinov274 Date: Wed, 27 Apr 2022 22:49:00 +1000 Subject: [PATCH 23/48] pythonPackages39.openstep-plist: init at 0.3.0 --- .../python-modules/openstep-plist/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/openstep-plist/default.nix diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix new file mode 100644 index 00000000000..274294f5938 --- /dev/null +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pytestCheckHook +, cython +, pythonImportsCheckHook +}: + +buildPythonPackage rec { + pname = "openstep-plist"; + version = "0.3.0"; + + src = fetchPypi { + pname = "openstep_plist"; + inherit version; + sha256 = "sha256-KO4sGKjod5BwUFQ1MU2S1dG0DyiJ06mdroMbRDsugBk="; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools-scm cython ]; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "openstep_plist" ]; + + meta = { + description = "Parser for the 'old style' OpenStep property list format also known as ASCII plist"; + homepage = "https://github.com/fonttools/openstep-plist"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.BarinovMaxim ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a724a589947..fc8fe1b45e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3109,6 +3109,8 @@ in { fontmake = callPackage ../development/python-modules/fontmake { }; + openstep-plist = callPackage ../development/python-modules/openstep-plist { }; + foobot-async = callPackage ../development/python-modules/foobot-async { }; foolscap = callPackage ../development/python-modules/foolscap { }; From ae3522a453310117cc6bb1453fef324613da9b63 Mon Sep 17 00:00:00 2001 From: barinov274 Date: Wed, 27 Apr 2022 22:49:57 +1000 Subject: [PATCH 24/48] python39Packages.glyphslib: init at 6.0.4 --- .../python-modules/glyphslib/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/glyphslib/default.nix diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix new file mode 100644 index 00000000000..2d6b19bea35 --- /dev/null +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fonttools +, openstep-plist +, ufoLib2 +, pytestCheckHook +, unicodedata2 +, setuptools-scm +, ufonormalizer +, xmldiff +, defcon +, ufo2ft +, skia-pathops +}: + +buildPythonPackage rec { + pname = "glyphslib"; + version = "6.0.4"; + + format = "pyproject"; + + src = fetchPypi { + pname = "glyphsLib"; + inherit version; + sha256 = "sha256-PT66n1WEO5FNcwov8GaXT1YNrAi22X4HN7iVNkuehKI="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "glyphsLib" ]; + + propagatedBuildInputs = [ + fonttools + openstep-plist + ufoLib2 + unicodedata2 + ufonormalizer + xmldiff + defcon + ufo2ft + skia-pathops + ]; + + disabledTestPaths = [ + "tests/builder/designspace_gen_test.py" # this test tries to use non-existent font "CoolFoundry Examplary Serif" + "tests/builder/interpolation_test.py" # this test tries to use a font that previous test should made + ]; + + meta = { + description = "Bridge from Glyphs source files (.glyphs) to UFOs and Designspace files via defcon and designspaceLib"; + homepage = "https://github.com/googlefonts/glyphsLib"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.BarinovMaxim ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc8fe1b45e1..857967da613 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3111,6 +3111,8 @@ in { openstep-plist = callPackage ../development/python-modules/openstep-plist { }; + glyphslib = callPackage ../development/python-modules/glyphslib { }; + foobot-async = callPackage ../development/python-modules/foobot-async { }; foolscap = callPackage ../development/python-modules/foolscap { }; From 1eaa0f5a7bb4d18262810315f871115854f7e4e2 Mon Sep 17 00:00:00 2001 From: barinov274 Date: Fri, 29 Apr 2022 16:57:22 +1000 Subject: [PATCH 25/48] python39Packages.skia-pathops: init at 0.7.9 --- .../python-modules/skia-pathops/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/skia-pathops/default.nix diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix new file mode 100644 index 00000000000..53d1fb1227d --- /dev/null +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, cython +, ninja +, setuptools-scm +, setuptools +, fetchPypi +, gn +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "skia-pathops"; + version = "0.7.2"; + + src = fetchPypi { + pname = "skia-pathops"; + inherit version; + extension = "zip"; + sha256 = "sha256-Gdhcmv77oVr5KxPIiJlk935jgvWPQsYEC0AZ6yjLppA="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \ + 'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]' + ''; + + nativeBuildInputs = [ cython ninja setuptools-scm ]; + + propagatedBuildInputs = [ setuptools ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pathops" ]; + + meta = { + description = "Python access to operations on paths using the Skia library"; + homepage = "https://skia.org/dev/present/pathops"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.BarinovMaxim ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 857967da613..a9c840204b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3109,6 +3109,8 @@ in { fontmake = callPackage ../development/python-modules/fontmake { }; + skia-pathops = callPackage ../development/python-modules/skia-pathops { }; + openstep-plist = callPackage ../development/python-modules/openstep-plist { }; glyphslib = callPackage ../development/python-modules/glyphslib { }; From 251f3244a7a9d6dd93b29926d70fd55181cfd12d Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 3 May 2022 13:56:31 +0530 Subject: [PATCH 26/48] fclones: 0.22.0 -> 0.23.0 --- pkgs/tools/misc/fclones/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index e4e77ba90e2..874e3525f69 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gzNrZJz0nC1N7LUyN5q16Vva1SD0jh7cBVV36927pmY="; + sha256 = "sha256-ICuhBoiCBmoy+jW+OK5OU5oAopyyOxSB6uHpZv2dEKI="; }; - cargoSha256 = "sha256-yooY58PZbraDYc+mvmDgKZ3CdvVkbKM/f/DcU0xDiNo="; + cargoSha256 = "sha256-NXkXxRDJcfB2F7hXF5nBFnQ+IFhZTSHg915NyRyuS8c="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit From ebaa5279daf393a44b81b74be8a667af12f830ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 11:35:14 +0200 Subject: [PATCH 27/48] python310Packages.pyeapi: fix Python 3.10 support --- .../python-modules/pyeapi/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index e856a33da02..aa9e0983b7e 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -38,16 +38,21 @@ buildPythonPackage rec { url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch"; sha256 = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8="; }) + (fetchpatch { + name = "fix-collection-usage-2.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch"; + sha256 = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo="; + excludes = [ + ".github/workflows/ci.yml" + ]; + }) + (fetchpatch { + name = "fix-collection-usage-3.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch"; + sha256 = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE="; + }) ]; - postPatch = '' - # https://github.com/arista-eosplus/pyeapi/pull/223 - substituteInPlace test/unit/test_utils.py \ - --replace "collections.Iterable" "collections.abc.Iterable" - substituteInPlace pyeapi/api/abstract.py \ - --replace "from collections" "from collections.abc" - ''; - pytestFlagsArray = [ "test/unit" ]; From 009eb36cc8c88bb7bb9f6b777b47668908eedebf Mon Sep 17 00:00:00 2001 From: marius david Date: Sat, 5 Mar 2022 22:21:26 +0100 Subject: [PATCH 28/48] pythonPackages.gbulb: init at 0.6.3 --- .../python-modules/gbulb/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/gbulb/default.nix diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix new file mode 100644 index 00000000000..fe0c1b21d28 --- /dev/null +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pygobject3 +, pytestCheckHook +, gtk3 +, gobject-introspection +}: + +buildPythonPackage rec { + pname = "gbulb"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "beeware"; + repo = "gbulb"; + rev = "v${version}"; + sha256 = "sha256-QNpZf1zfe6r6MtmYMWSrXPsXm5iX36oMx4GnXiTYPaQ="; + }; + + propagatedBuildInputs = [ + pygobject3 + ]; + + checkInputs = [ + pytestCheckHook + gtk3 + gobject-introspection + ]; + + disabledTests = [ + "test_glib_events.TestBaseGLibEventLoop" # Somtimes fail due to imprecise timing + ]; + + pythonImportsCheck = [ "gbulb" ]; + + meta = with lib; { + description = "GLib implementation of PEP 3156"; + homepage = "https://github.com/beeware/gbulb"; + license = licenses.asl20; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16c87e27223..d025b6a8c12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3255,6 +3255,8 @@ in { gbinder-python = callPackage ../development/python-modules/gbinder-python { }; + gbulb = callPackage ../development/python-modules/gbulb { }; + gcovr = callPackage ../development/python-modules/gcovr { }; gcsfs = callPackage ../development/python-modules/gcsfs { }; From 2d23275e050eac5dcc91675ca210c2b4a6054ed0 Mon Sep 17 00:00:00 2001 From: marius david Date: Sat, 5 Mar 2022 22:23:35 +0100 Subject: [PATCH 29/48] skytemple: 1.3.2 -> 1.3.10 --- pkgs/applications/misc/skytemple/default.nix | 7 +++++-- .../python-modules/dungeon-eos/default.nix | 4 ++-- .../python-modules/py-desmume/default.nix | 17 +++-------------- .../python-modules/skytemple-files/default.nix | 4 ++-- .../python-modules/skytemple-rust/default.nix | 10 ++++++---- .../skytemple-ssb-debugger/default.nix | 4 ++-- 6 files changed, 20 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index e8c6445d5f8..0f331ef6e2c 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.3.2"; + version = "1.3.10"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg"; + sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; }; buildInputs = [ @@ -26,7 +26,10 @@ python3Packages.buildPythonApplication rec { packaging pycairo pygal + psutil + gbulb pypresence + sentry-sdk setuptools skytemple-dtef skytemple-eventserver diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix index 0b1e5ebc53f..f87bbf82b77 100644 --- a/pkgs/development/python-modules/dungeon-eos/default.nix +++ b/pkgs/development/python-modules/dungeon-eos/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "dungeon-eos"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl"; + sha256 = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY="; }; doCheck = false; # there are no tests diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index e9cff7eb824..0c700151f69 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -3,29 +3,18 @@ , alsa-lib, soundtouch, openal }: -let - desmume = fetchFromGitHub { - owner = "SkyTemple"; - repo = "desmume"; - rev = "8e7af8ada883b7e91344985236f7c7c04ee795d7"; - sha256 = "0svmv2rch9q347gbpbws4agymas8n014gh1ssaf91wx7jwn53842"; - }; -in buildPythonPackage rec { pname = "py-desmume"; - version = "0.0.3.post2"; + version = "0.0.4.post2"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1chsg70k8kqnlasn88b04ww3yl0lay1bjxvz6lhp6s2cvsxv03x1"; + sha256 = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY="; + fetchSubmodules = true; }; - postPatch = '' - cp -R --no-preserve=mode ${desmume} __build_desmume - ''; - buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ]; nativeBuildInputs = [ meson ninja pkg-config ]; propagatedBuildInputs = [ pillow pygobject3 ]; diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 7893cfb2e81..42012dbd4cf 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.3.3"; + version = "1.3.9"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "01j6khn60mdmz32xkpqrzwdqibmpdpi2wvwzxgdnaim9sq0fdqws"; + sha256 = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 793e22690e4..f14bf9330c4 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -2,24 +2,26 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "unstable-2021-08-11"; + version = "1.3.7"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; - rev = "e306e5edc096cb3fef25585d9ca5a2817543f1cd"; - sha256 = "0ja231gsy9i1z6jsaywawz93rnyjhldngi5i787nhnf88zrwx9ml"; + rev = version; + sha256 = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0gjvfblyv72m0nqv90m7qvbdnazsh5ind1pxwqz83vm4zjh9a873"; + sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); + GETTEXT_SYSTEM = true; + doCheck = false; # there are no tests pythonImportsCheck = [ "skytemple_rust" ]; diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index bb91bad3ff1..8ca4a45b371 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.3.0"; + version = "1.3.8.post2"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d"; + sha256 = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow="; }; buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; From 010e2e5b12e2464faa27554a6445cebe79c27466 Mon Sep 17 00:00:00 2001 From: hqurve Date: Thu, 28 Apr 2022 15:13:13 -0400 Subject: [PATCH 30/48] libreoffice: add templates to dolphin "create new" menu The libreoffice derivation does not copy the necessary files to the output. Hence, we need to unpack the source again --- .../libreoffice/soffice-template.desktop | 6 +++ .../office/libreoffice/wrapper.nix | 37 +++++++++++++------ 2 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/office/libreoffice/soffice-template.desktop diff --git a/pkgs/applications/office/libreoffice/soffice-template.desktop b/pkgs/applications/office/libreoffice/soffice-template.desktop new file mode 100644 index 00000000000..4adb91284a9 --- /dev/null +++ b/pkgs/applications/office/libreoffice/soffice-template.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=LibreOffice @app@... +Comment=Enter LibreOffice @app@ filename: +Type=Link +URL=.source/soffice.@ext@ +Icon=libreoffice-oasis-@type@ diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 08b01a4a051..fd9ef63dc73 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -1,19 +1,32 @@ -{ libreoffice, runCommand, dbus, bash }: -let - jdk = libreoffice.jdk; -in -(runCommand libreoffice.name { - inherit dbus libreoffice jdk bash; -} '' +{ lib, runCommand +, libreoffice, dbus, bash, substituteAll +, dolphinTemplates ? true +}: +runCommand libreoffice.name { + inherit (libreoffice) jdk meta; + inherit dbus libreoffice bash; +} ('' mkdir -p "$out/bin" - ln -s "${libreoffice}/share" "$out/share" substituteAll "${./wrapper.sh}" "$out/bin/soffice" chmod a+x "$out/bin/soffice" for i in $(ls "${libreoffice}/bin/"); do test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")" done -'') // { - inherit libreoffice dbus; - meta = libreoffice.meta; -} + + mkdir -p "$out/share" + ln -s "${libreoffice}/share"/* $out/share +'' + lib.optionalString dolphinTemplates '' + # Add templates to dolphin "Create new" menu - taken from debian + + # We need to unpack the core source since the necessary files aren't available in the libreoffice output + unpackFile "${libreoffice.src}" + + install -D "${libreoffice.name}"/extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source" + + cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop +'') + From 4c712af6fdf0f0952f77122175510c15f9c2fcac Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 7 Jan 2022 10:23:04 -0500 Subject: [PATCH 31/48] rust-motd: 0.1.1 -> 0.2.1 --- pkgs/tools/misc/rust-motd/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index cdc3dbdae10..bfd4db8ff88 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -9,21 +9,23 @@ rustPlatform.buildRustPackage rec { pname = "rust-motd"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "rust-motd"; repo = pname; rev = "v${version}"; - sha256 = "0xhdbhl0riaq9n4g9n333pgw966bsi60zpcy7gpndzfj21bj2x1m"; + sha256 = "sha256-iuADR7m+wdmsQ897o4CQHqDv9PmYu/vJgO5C6Dluao4="; }; - cargoSha256 = "sha256-l9Sit+niCLOnL1mdK6i8jea8NWsJlFM6p9lMTXyWOKY="; + cargoSha256 = "sha256-kdSMcADoTpMU4w2XSv0pPQZC155rrQACQ4XTVyj7eeA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + OPENSSL_NO_VENDOR = 1; + meta = with lib; { description = "Beautiful, useful MOTD generation with zero runtime dependencies"; homepage = "https://github.com/rust-motd/rust-motd"; From 1e1ac4e2c65afde99e9420cd71893b47ac14d8bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 14:47:08 +0000 Subject: [PATCH 32/48] nodejs-18_x: 18.0.0 -> 18.1.0 --- pkgs/development/web/nodejs/v18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 562989d2fd3..6a55c20b195 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -7,8 +7,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.0.0"; - sha256 = "sha256-NE0OZUC1JMaal5/1w+eM2nJU/XLANpmSa+sLhVi4znU="; + version = "18.1.0"; + sha256 = "0zhb61ihzslmpl1g3dd6vcxjccc8gwj1v4hfphk7f3cy10hcrc78"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; From c5a273b38ee97ae257a0d08ac854e6f5027f2ee7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 3 May 2022 22:13:16 +0300 Subject: [PATCH 33/48] =?UTF-8?q?kiln:=200.2.1=20=E2=86=92=200.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/kiln/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix index dfa114f446a..2eb329dd511 100644 --- a/pkgs/applications/misc/kiln/default.nix +++ b/pkgs/applications/misc/kiln/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kiln"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~adnano"; repo = pname; rev = version; - hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI="; + hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA="; }; nativeBuildInputs = [ scdoc ]; - vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk="; + vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE="; installPhase = '' runHook preInstall From 59e6af3dc14f9dcc80eee84ff945db2734d2c547 Mon Sep 17 00:00:00 2001 From: deinferno <14363193+deinferno@users.noreply.github.com> Date: Sat, 23 Apr 2022 20:29:00 +0500 Subject: [PATCH 34/48] linuxPackages.vmware: init at 16.2.3 --- pkgs/os-specific/linux/vmware/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/os-specific/linux/vmware/default.nix diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix new file mode 100644 index 00000000000..aa77a10015e --- /dev/null +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchFromGitHub, kernel, kmod, gnugrep, vmware-workstation }: + +stdenv.mkDerivation rec { + pname = "vmware-modules"; + version = "${vmware-workstation.version}-${kernel.version}"; + + src = fetchFromGitHub { + owner = "mkubecek"; + repo = "vmware-host-modules"; + rev = "w${vmware-workstation.version}-k5.17"; + sha256 = "sha256-EM6YU2nOwNlAXpQ7cGrLS1N+gAS1KxleVjJTzo22De0="; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace Makefile \ + --replace '/lib/modules/$(VM_UNAME)/misc' "$out/lib/modules/${kernel.modDirVersion}/misc" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/modinfo "${kmod}/bin/modinfo" \ + --replace 'test -z "$(DESTDIR)"' "0" + + for module in "vmmon-only" "vmnet-only"; do + substituteInPlace "./$module/Makefile" \ + --replace '/lib/modules/' "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /bin/grep "${gnugrep}/bin/grep" + done + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/misc" + ''; + + meta = with lib; { + description = "Kernel modules needed for VMware hypervisor"; + homepage = "https://github.com/mkubecek/vmware-host-modules"; + license = licenses.gpl2Only; + platforms = [ "x86_64-linux" ]; + broken = kernel.kernelOlder "5.5" && kernel.isHardened; + maintainers = with maintainers; [ deinferno ]; + }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index e3f5695fac5..dd577b71368 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -458,6 +458,8 @@ in { vmm_clock = callPackage ../os-specific/linux/vmm_clock { }; + vmware = callPackage ../os-specific/linux/vmware { }; + wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; From e1da7f4d4483643dcb32bfbc63af281123825056 Mon Sep 17 00:00:00 2001 From: deinferno <14363193+deinferno@users.noreply.github.com> Date: Sat, 23 Apr 2022 20:31:14 +0500 Subject: [PATCH 35/48] vmware-workstation: init at 16.2.3 --- .../vmware-workstation/default.nix | 341 ++++++++++++++++++ .../vmware-workstation/vmware-bootstrap | 11 + .../vmware-workstation/vmware-config | 21 ++ .../vmware-installer-bootstrap | 5 + .../vmware-workstation/vmware-modconfig | 8 + pkgs/top-level/all-packages.nix | 2 + 6 files changed, 388 insertions(+) create mode 100755 pkgs/applications/virtualization/vmware-workstation/default.nix create mode 100644 pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap create mode 100644 pkgs/applications/virtualization/vmware-workstation/vmware-config create mode 100644 pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap create mode 100644 pkgs/applications/virtualization/vmware-workstation/vmware-modconfig diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix new file mode 100755 index 00000000000..58cd4092a95 --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -0,0 +1,341 @@ +{ stdenv +, buildFHSUserEnv +, fetchurl +, lib +, zlib +, gdbm +, bzip2 +, libxslt +, libxml2 +, libuuid +, readline +, xz +, cups +, glibc +, libaio +, vulkan-loader +, alsa-lib +, libpulseaudio +, libGL +, numactl +, libX11 +, libXi +, kmod +, python3 +, autoPatchelfHook +, makeWrapper +, sqlite +, enableInstaller ? false +}: + +let + vmware-unpack-env = buildFHSUserEnv rec { + name = "vmware-unpack-env"; + targetPkgs = pkgs: [ zlib ]; + }; + gdbm3 = gdbm.overrideAttrs (old: rec { + version = "1.8.3"; + + src = fetchurl { + url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz"; + sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck="; + }; + + installPhase = '' + mkdir -p $out/lib + cp .libs/libgdbm*.so* $out/lib/ + ''; + }); +in +stdenv.mkDerivation rec { + pname = "vmware-workstation"; + version = "16.2.3"; + build = "19376536"; + + buildInputs = [ + libxslt + libxml2 + libuuid + gdbm3 + readline + xz + cups + glibc + libaio + vulkan-loader + alsa-lib + libpulseaudio + libGL + numactl + libX11 + libXi + kmod + ]; + + nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ] + ++ lib.optionals enableInstaller [ sqlite bzip2 ]; + + src = fetchurl { + url = "https://download3.vmware.com/software/WKST-1623-LX-New/VMware-Workstation-Full-${version}-${build}.x86_64.bundle"; + sha256 = "sha256-+JE1KnRfawcaBannIyEr1TNZTF7YXRYYaFMVq0/erbM="; + }; + + unpackPhase = '' + ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked" + ''; + + installPhase = '' + mkdir -p \ + $out/bin \ + $out/etc/vmware \ + $out/etc/init.d \ + $out/lib/vmware \ + $out/share/doc + + #### Replicate vmware-installer's order but VMX first because of appLoader + ${lib.optionalString enableInstaller '' + ## VMware installer + echo "Installing VMware Installer" + unpacked="unpacked/vmware-installer" + vmware_installer_version=$(cat "unpacked/vmware-installer/manifest.xml" | grep -oPm1 "(?<=)[^<]+") + dest="$out/lib/vmware-installer/$vmware_installer_version" + + mkdir -p $dest + cp -r $unpacked/vmis* $dest/ + cp -r $unpacked/sopython $dest/ + cp -r $unpacked/python $dest/ + cp -r $unpacked/cdsHelper $dest/ + cp -r $unpacked/vmware* $dest/ + cp -r $unpacked/bin $dest/ + cp -r $unpacked/lib $dest/ + + chmod +x $dest/vmis-launcher $dest/sopython/* $dest/python/init.sh $dest/vmware-* + ln -s $dest/vmware-installer $out/bin/vmware-installer + + mkdir -p $out/etc/vmware-installer + cp ${./vmware-installer-bootstrap} $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@INSTALLERDIR@@,$dest," $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@IVERSION@@,$vmware_installer_version," $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware-installer/bootstrap + + # create database of vmware guest tools (avoids vmware fetching them later) + mkdir -p $out/etc/vmware-installer/components + database_filename=$out/etc/vmware-installer/database + touch $database_filename + sqlite3 "$database_filename" "CREATE TABLE settings(key VARCHAR PRIMARY KEY, value VARCHAR NOT NULL, component_name VARCHAR NOT NULL);" + sqlite3 "$database_filename" "INSERT INTO settings(key,value,component_name) VALUES('db.schemaVersion','2','vmware-installer');" + sqlite3 "$database_filename" "CREATE TABLE components(id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, version VARCHAR NOT NULL, buildNumber INTEGER NOT NULL, component_core_id INTEGER NOT NULL, longName VARCHAR NOT NULL, description VARCHAR, type INTEGER NOT NULL);" + for folder in unpacked/**/.installer ; do + component="$(basename $(dirname $folder))" + component_version=$(cat unpacked/$component/manifest.xml | grep -oPm1 "(?<=)[^<]+") + component_core_id=$([ "$component" == "vmware-installer" ] && echo "-1" || echo "1") + type=$([ "$component" == "vmware-workstation" ] && echo "0" || echo "1") + sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES(\"$component\",\"$component_version\",\"${build}\",$component_core_id,\"$component\",\"$component\",$type);" + mkdir -p $out/etc/vmware-installer/components/$component + cp -r $folder/* $out/etc/vmware-installer/components/$component + done + ''} + + ## VMware Bootstrap + echo "Installing VMware Bootstrap" + cp ${./vmware-bootstrap} $out/etc/vmware/bootstrap + sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/bootstrap + + ## VMware Config + echo "Installing VMware Config" + cp ${./vmware-config} $out/etc/vmware/config + sed -i -e "s,@@VERSION@@,${version}," $out/etc/vmware/config + sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware/config + sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/config + + ## VMware VMX + echo "Installing VMware VMX" + unpacked="unpacked/vmware-vmx" + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/etc/modprobe.d $out/etc/ + cp -r $unpacked/etc/init.d/* $out/etc/init.d/ + cp -r $unpacked/roms $out/lib/vmware/ + cp -r $unpacked/sbin/* $out/bin/ + + cp -r $unpacked/lib/libconf $out/lib/vmware/ + cp -r $unpacked/lib/bin $out/lib/vmware/ + cp -r $unpacked/lib/lib $out/lib/vmware/ + cp -r $unpacked/lib/scripts $out/lib/vmware/ + cp -r $unpacked/lib/icu $out/lib/vmware/ + cp -r $unpacked/lib/share $out/lib/vmware/ + cp -r $unpacked/lib/modules $out/lib/vmware/ + cp -r $unpacked/lib/include $out/lib/vmware/ + + cp -r $unpacked/extra/checkvm $out/bin/ + cp -r $unpacked/extra/modules.xml $out/lib/vmware/modules/ + + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vmblock-fuse + ln -s $out/lib/vmware/icu $out/etc/vmware/icu + + # Replace vmware-modconfig with simple error dialog + cp ${./vmware-modconfig} $out/bin/vmware-modconfig + sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmware-modconfig + + # Patch dynamic libs in + for binary in "mksSandbox" "mksSandbox-debug" "mksSandbox-stats" "vmware-vmx" "vmware-vmx-debug" "vmware-vmx-stats" + do + patchelf \ + --add-needed ${libaio}/lib/libaio.so.1 \ + --add-needed ${vulkan-loader}/lib/libvulkan.so.1 \ + --add-needed ${alsa-lib}/lib/libasound.so \ + --add-needed ${libpulseaudio}/lib/libpulse.so.0 \ + --add-needed ${libGL}/lib/libEGL.so.1 \ + --add-needed ${numactl}/lib/libnuma.so.1 \ + --add-needed ${libX11}/lib/libX11.so.6 \ + --add-needed ${libXi}/lib/libXi.so.6 \ + --add-needed ${libGL}/lib/libGL.so.1 \ + $out/lib/vmware/bin/$binary + done + + ## VMware USB Arbitrator + echo "Installing VMware USB Arbitrator" + unpacked="unpacked/vmware-usbarbitrator" + cp -r $unpacked/etc/init.d/* $out/etc/init.d/ + cp -r $unpacked/bin/* $out/bin/ + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-usbarbitrator + + ## VMware Player Setup + echo "Installing VMware Player Setup" + unpacked="unpacked/vmware-player-setup" + mkdir -p $out/lib/vmware/setup + cp $unpacked/vmware-config $out/lib/vmware/setup/ + + ## VMware Network Editor + echo "Installing VMware Network Editor" + unpacked="unpacked/vmware-network-editor" + cp -r $unpacked/lib $out/lib/vmware/ + + ## VMware Tools + Virtual Printer + echo "Installing VMware Tools + Virtual Printer" + mkdir -p $out/lib/vmware/isoimages/ + cp unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \ + unpacked/vmware-tools-windows/windows.iso \ + unpacked/vmware-tools-winPreVista/winPreVista.iso \ + unpacked/vmware-virtual-printer/VirtualPrinter-Linux.iso \ + unpacked/vmware-virtual-printer/VirtualPrinter-Windows.iso \ + unpacked/vmware-tools-winPre2k/winPre2k.iso \ + unpacked/vmware-tools-linux/linux.iso \ + unpacked/vmware-tools-netware/netware.iso \ + unpacked/vmware-tools-solaris/solaris.iso \ + $out/lib/vmware/isoimages/ + + ## VMware Player Application + echo "Installing VMware Player Application" + unpacked="unpacked/vmware-player-app" + cp -r $unpacked/lib/* $out/lib/vmware/ + cp -r $unpacked/etc/* $out/etc/ + cp -r $unpacked/share/* $out/share/ + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/doc/* $out/share/doc/ # Licences + + mkdir -p $out/etc/thnuclnt + cp -r $unpacked/extras/.thnumod $out/etc/thnuclnt/ + + mkdir -p $out/lib/cups/filter + cp -r $unpacked/extras/thnucups $out/lib/cups/filter/ + + for target in "vmplayer" "vmware-enter-serial" "vmware-setup-helper" "licenseTool" "vmware-mount" "vmware-fuseUI" "vmware-app-control" "vmware-zenity" + do + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/$target + done + + ln -s $out/lib/vmware/bin/vmware-mount $out/bin/vmware-mount + ln -s $out/lib/vmware/bin/vmware-fuseUI $out/bin/vmware-fuseUI + ln -s $out/lib/vmware/bin/vmrest $out/bin/vmrest + + # Patch vmplayer + sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmplayer + sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe," $out/bin/vmplayer + sed -i -e "s,@@BINARY@@,$out/bin/vmplayer," $out/share/applications/vmware-player.desktop + + ## VMware OVF Tool compoment + echo "Installing VMware OVF Tool for Linux" + unpacked="unpacked/vmware-ovftool" + mkdir -p $out/lib/vmware-ovftool/ + + cp -r $unpacked/* $out/lib/vmware-ovftool/ + chmod 755 $out/lib/vmware-ovftool/ovftool* + makeWrapper "$out/lib/vmware-ovftool/ovftool.bin" "$out/bin/ovftool" + + ## VMware Network Editor User Interface + echo "Installing VMware Network Editor User Interface" + unpacked="unpacked/vmware-network-editor-ui" + cp -r $unpacked/share/* $out/share/ + + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-netcfg + ln -s $out/lib/vmware/bin/vmware-netcfg $out/bin/vmware-netcfg + + # Patch network editor ui + + sed -i -e "s,@@BINARY@@,$out/bin/vmware-netcfg," $out/share/applications/vmware-netcfg.desktop + + ## VMware VIX Core Library + echo "Installing VMware VIX Core Library" + unpacked="unpacked/vmware-vix-core" + mkdir -p $out/lib/vmware-vix + cp -r $unpacked/lib/* $out/lib/vmware-vix/ + cp -r $unpacked/bin/* $out/bin/ + cp $unpacked/*.txt $out/lib/vmware-vix/ + + mkdir -p $out/share/doc/vmware-vix/ + cp -r $unpacked/doc/* $out/share/doc/vmware-vix/ + + mkdir -p $out/include/ + cp -r $unpacked/include/* $out/include/ + + ## VMware VIX Workstation-16.0.0 Library + echo "Installing VMware VIX Workstation-16.0.0 Library" + unpacked="unpacked/vmware-vix-lib-Workstation1600" + cp -r $unpacked/lib/* $out/lib/vmware-vix/ + + ## VMware VProbes component for Linux + echo "Installing VMware VProbes component for Linux" + unpacked="unpacked/vmware-vprobe" + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/lib/* $out/lib/vmware/ + + ## VMware Workstation + echo "Installing VMware Workstation" + unpacked="unpacked/vmware-workstation" + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/lib/* $out/lib/vmware/ + cp -r $unpacked/share/* $out/share/ + cp -r $unpacked/man $out/share/ + cp -r $unpacked/doc $out/share/ + + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-tray + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vprobe + + # Patch vmware + sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware,g" $out/bin/vmware + sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" $out/bin/vmware + sed -i -e "s,@@BINARY@@,$out/bin/vmware," $out/share/applications/vmware-workstation.desktop + + chmod +x $out/bin/* $out/lib/vmware/bin/* $out/lib/vmware/setup/* + + # Harcoded pkexec hack + for lib in "lib/vmware/lib/libvmware-mount.so/libvmware-mount.so" "lib/vmware/lib/libvmwareui.so/libvmwareui.so" "lib/vmware/lib/libvmware-fuseUI.so/libvmware-fuseUI.so" + do + sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib" + done + + # SUID hack + wrapProgram $out/lib/vmware/bin/vmware-vmx + rm $out/lib/vmware/bin/vmware-vmx + ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx + ''; + + meta = with lib; { + description = "Industry standard desktop hypervisor for x86-64 architecture"; + homepage = "https://www.vmware.com/products/workstation-pro.html"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ deinferno ]; + }; +} diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap b/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap new file mode 100644 index 00000000000..93787870ec3 --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap @@ -0,0 +1,11 @@ +PREFIX="@@PREFIXDIR@@" +BINDIR="@@PREFIXDIR@@/bin" +SBINDIR="@@PREFIXDIR@@/sbin" +LIBDIR="@@PREFIXDIR@@/lib" +DATADIR="@@PREFIXDIR@@/share" +SYSCONFDIR="@@PREFIXDIR@@/etc" +DOCDIR="@@PREFIXDIR@@/share/doc" +MANDIR="@@PREFIXDIR@@/share/man" +INCLUDEDIR="@@PREFIXDIR@@/include" +INITDIR="@@PREFIXDIR@@/etc" +INITSCRIPTDIR="@@PREFIXDIR@@/etc/init.d" diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-config b/pkgs/applications/virtualization/vmware-workstation/vmware-config new file mode 100644 index 00000000000..9b3714bc313 --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-config @@ -0,0 +1,21 @@ +.encoding = "UTF-8" +product.name = "VMware Workstation" +product.version = "@@VERSION@@" +product.buildNumber = "@@BUILD@@" +workstation.product.version = "@@VERSION@@" +player.product.version = "@@VERSION@@" +vix.config.version = "1" +bindir = "@@PREFIXDIR@@/bin" +libdir = "@@PREFIXDIR@@/lib/vmware" +vix.libdir = "@@PREFIXDIR@@/lib/vmware-vix" +initscriptdir = "@@PREFIXDIR@@/lib/systemd/scripts" +vmware.fullpath = "@@PREFIXDIR@@/bin/vmware" +authd.fullpath = "@@PREFIXDIR@@/bin/vmware-authd" +gksu.rootMethod = "su" +NETWORKING = "yes" +installerDefaults.autoSoftwareUpdateEnabled = "no" +installerDefaults.dataCollectionEnabled = "no" +installerDefaults.componentDownloadEnabled = "no" +installerDefaults.transferVersion = "1" +acceptOVFEULA = "yes" +acceptEULA = "yes" diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap b/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap new file mode 100644 index 00000000000..4db8f7a1b45 --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap @@ -0,0 +1,5 @@ +VMWARE_INSTALLER="@@INSTALLERDIR@@" +VERSION="@@IVERSION@@" # For backwards compability +VMISVERSION="@@IVERSION@@" +VMISBUILDNUM="@@BUILD@@" +VMISPYVERSION="39" diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig b/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig new file mode 100644 index 00000000000..c93a3715796 --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +ETCDIR=/etc/vmware +. $ETCDIR/bootstrap + +exec "$LIBDIR"/vmware/bin/vmware-zenity --error --text "Reboot is required to load VMware kernel modules (make sure that 'virtualisation.vmware.host.enable' is enabled)" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 789360728df..bacaeaed9c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30138,6 +30138,8 @@ with pkgs; vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { }; + vmware-workstation = callPackage ../applications/virtualization/vmware-workstation { }; + vocproc = callPackage ../applications/audio/vocproc { }; vnstat = callPackage ../applications/networking/vnstat { }; From 3e8e52bb91d0da2a06c24ae70975f8ba309eb214 Mon Sep 17 00:00:00 2001 From: deinferno <14363193+deinferno@users.noreply.github.com> Date: Sat, 23 Apr 2022 20:33:34 +0500 Subject: [PATCH 36/48] nixos/vmware-host: init at 16.2.3 --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/vmware-host.nix | 166 +++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 nixos/modules/virtualisation/vmware-host.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9aa8817ca51..610f4490bbf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1250,6 +1250,7 @@ ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix + ./virtualisation/vmware-host.nix ./virtualisation/waydroid.nix ./virtualisation/xen-dom0.nix ./virtualisation/xe-guest-utilities.nix diff --git a/nixos/modules/virtualisation/vmware-host.nix b/nixos/modules/virtualisation/vmware-host.nix new file mode 100644 index 00000000000..faa0d455c9d --- /dev/null +++ b/nixos/modules/virtualisation/vmware-host.nix @@ -0,0 +1,166 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.virtualisation.vmware.host; + wrapperDir = "/run/vmware/bin"; # Perfectly fits as /usr/local/bin + parentWrapperDir = dirOf wrapperDir; + vmwareWrappers = # Needed as hardcoded paths workaround + let mkVmwareSymlink = + program: + '' + ln -s "${config.security.wrapperDir}/${program}" $wrapperDir/${program} + ''; + in + [ + (mkVmwareSymlink "pkexec") + (mkVmwareSymlink "mount") + (mkVmwareSymlink "umount") + ]; +in +{ + options = with lib; { + virtualisation.vmware.host = { + enable = mkEnableOption "VMware" // { + description = '' + This enables VMware host virtualisation for running VMs. + + + vmware-vmx will cause kcompactd0 due to + Transparent Hugepages feature in kernel. + Apply [ "transparent_hugepage=never" ] in + option to disable them. + + + + If that didn't work disable TRANSPARENT_HUGEPAGE, + COMPACTION configs and recompile kernel. + + ''; + }; + package = mkOption { + type = types.package; + default = pkgs.vmware-workstation; + defaultText = literalExpression "pkgs.vmware-workstation"; + description = "VMware host virtualisation package to use"; + }; + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ ]; + description = "Extra packages to be used with VMware host."; + example = "with pkgs; [ ntfs3g ]"; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Add extra config to /etc/vmware/config"; + example = '' + # Allow unsupported device's OpenGL and Vulkan acceleration for guest vGPU + mks.gl.allowUnsupportedDrivers = "TRUE" + mks.vk.allowUnsupportedDevices = "TRUE" + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + boot.extraModulePackages = [ config.boot.kernelPackages.vmware ]; + boot.extraModprobeConfig = "alias char-major-10-229 fuse"; + boot.kernelModules = [ "vmw_pvscsi" "vmw_vmci" "vmmon" "vmnet" "fuse" ]; + + environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages; + services.printing.drivers = [ cfg.package ]; + + environment.etc."vmware/config".text = '' + ${builtins.readFile "${cfg.package}/etc/vmware/config"} + ${cfg.extraConfig} + ''; + + environment.etc."vmware/bootstrap".source = "${cfg.package}/etc/vmware/bootstrap"; + environment.etc."vmware/icu".source = "${cfg.package}/etc/vmware/icu"; + environment.etc."vmware-installer".source = "${cfg.package}/etc/vmware-installer"; + + # SUID wrappers + + security.wrappers = { + vmware-vmx = { + setuid = true; + owner = "root"; + group = "root"; + source = "${cfg.package}/lib/vmware/bin/.vmware-vmx-wrapped"; + }; + }; + + ###### wrappers activation script + + system.activationScripts.vmwareWrappers = + lib.stringAfter [ "specialfs" "users" ] + '' + mkdir -p "${parentWrapperDir}" + chmod 755 "${parentWrapperDir}" + # We want to place the tmpdirs for the wrappers to the parent dir. + wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) + chmod a+rx "$wrapperDir" + ${lib.concatStringsSep "\n" (vmwareWrappers)} + if [ -L ${wrapperDir} ]; then + # Atomically replace the symlink + # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ + old=$(readlink -f ${wrapperDir}) + if [ -e "${wrapperDir}-tmp" ]; then + rm --force --recursive "${wrapperDir}-tmp" + fi + ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp" + mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}" + rm --force --recursive "$old" + else + # For initial setup + ln --symbolic "$wrapperDir" "${wrapperDir}" + fi + ''; + + # Services + + systemd.services."vmware-authdlauncher" = { + description = "VMware Authentification Daemon"; + serviceConfig = { + Type = "forking"; + ExecStart = [ "${cfg.package}/bin/vmware-authdlauncher" ]; + }; + wantedBy = [ "multi-user.target" ]; + }; + + systemd.services."vmware-networks-configuration" = { + description = "VMware Networks Configuration Generation"; + unitConfig.ConditionPathExists = "!/etc/vmware/networking"; + serviceConfig = { + UMask = "0077"; + ExecStart = [ + "${cfg.package}/bin/vmware-networks --postinstall vmware-player,0,1" + ]; + Type = "oneshot"; + RemainAfterExit = "yes"; + }; + wantedBy = [ "multi-user.target" ]; + }; + + systemd.services."vmware-networks" = { + description = "VMware Networks"; + after = [ "vmware-networks-configuration.service" ]; + requires = [ "vmware-networks-configuration.service" ]; + serviceConfig = { + Type = "forking"; + ExecCondition = [ "${pkgs.kmod}/bin/modprobe vmnet" ]; + ExecStart = [ "${cfg.package}/bin/vmware-networks --start" ]; + ExecStop = [ "${cfg.package}/bin/vmware-networks --stop" ]; + }; + wantedBy = [ "multi-user.target" ]; + }; + + systemd.services."vmware-usbarbitrator" = { + description = "VMware USB Arbitrator"; + serviceConfig = { + ExecStart = [ "${cfg.package}/bin/vmware-usbarbitrator -f" ]; + }; + wantedBy = [ "multi-user.target" ]; + }; + }; +} From 51835cfa3cc80a3cbdbb8442900044daad0840c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 01:56:42 +0000 Subject: [PATCH 37/48] clojure-lsp: 2022.04.18-00.59.32 -> 2022.05.03-12.35.40 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 4dc63d54f14..4b8278f94ac 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.04.18-00.59.32"; + version = "2022.05.03-12.35.40"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-14EsJIKYl8TWbDqM9PyVrbs/4EssqXp0EK70RrFz+RE="; + sha256 = "sha256-5jh4umT93P53ufgdKYHNtiDJ1QpoJ8QpfAti0+tmvmc="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "d78094b015bd9e671eea2eb89ca0bb3ec58d39802ad1bfdf875b50e1cdd4995e"; + sha256 = "b4984b5d8411542ec7d4732c950340d16e379ad76c40e57c3d41a8e7adda2faf"; }; extraNativeImageBuildArgs = [ From ad38a2a6464394697f0672717f39c1b6188c1a89 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 3 May 2022 17:58:19 -0700 Subject: [PATCH 38/48] nixos/ssh: remove empty host key files before generating new ones In a previous PR [1], the conditional to generate a new host key file was changed to also include the case when the file exists, but has zero size. This could occur when the system is uncleanly powered off shortly after first boot. However, ssh-keygen prompts the user before overwriting a file. For example: $ touch hi $ ssh-keygen -f hi Generating public/private rsa key pair. hi already exists. Overwrite (y/n)? So, lets just try to remove the empty file (if it exists) before running ssh-keygen. [1] https://github.com/NixOS/nixpkgs/pull/141258 --- nixos/modules/services/networking/ssh/sshd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 230ab673a97..d467c3c0471 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -441,6 +441,7 @@ in ${flip concatMapStrings cfg.hostKeys (k: '' if ! [ -s "${k.path}" ]; then + rm -f "${k.path}" ssh-keygen \ -t "${k.type}" \ ${if k ? bits then "-b ${toString k.bits}" else ""} \ From 65be503d82bb448a990d11144b7e07702ba5119d Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Wed, 4 May 2022 11:08:43 +0530 Subject: [PATCH 39/48] xplr: 0.17.3 -> 0.17.6 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index db28952c31f..578c08b207e 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.17.3"; + version = "0.17.6"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM="; + sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k="; + cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From c52b904e6664c7e9fd966ee456da2721fa667670 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 3 May 2022 22:29:28 +0300 Subject: [PATCH 40/48] haskellPackages.streamly: fix darwin override fixes ``` error: querying available packages failed caused by: nix-env failed with error: nix-env failed with exit code 1: error: attribute 'streamly_0_8_1_1' missing at /nix/store/lw6gp8rrhd7lpi81dk9wr1l09a7za523-source/pkgs/development/haskell-modules/configuration-darwin.nix:259:6: 258| ] ++ (drv.libraryFrameworkDepends or []); 259| }) super.streamly_0_8_1_1; | ^ 260| ``` PR #160733 didn't catch this it seems. --- pkgs/development/haskell-modules/configuration-darwin.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 3471e874290..2eea5f8c58b 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -251,13 +251,6 @@ self: super: ({ # Otherwise impure gcc is used, which is Apple's weird wrapper c2hsc = addTestToolDepends [ pkgs.gcc ] super.c2hsc; - # streamly depends on Cocoa starting with 0.8.0 - streamly_0_8_1_1 = overrideCabal (drv: { - libraryFrameworkDepends = [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ (drv.libraryFrameworkDepends or []); - }) super.streamly_0_8_1_1; - http-client-tls = overrideCabal (drv: { postPatch = '' # This comment has been inserted, so the derivation hash changes, forcing From f27f57a12057bee13086ca1b1ad579eb24c214bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Wed, 4 May 2022 13:54:47 +0200 Subject: [PATCH 41/48] scala-cli: 0.1.4 -> 0.1.5 --- pkgs/development/tools/build-managers/scala-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index abeaf0d4cf1..40b230a72c3 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.1.4"; + version = "0.1.5"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "19bsfkp398rx3f9lnjzhp8pcs77n075v17rpm4hsmrpsz1hih5xy"; + sha256 = "1sczbvvhh1ff8mdb6zj4q3fnrz1qsqmr58jlb1s3fy1wv2p5ywxl"; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "0rggf6v32rw3s82a1apz2b8nyiv8rd0lvw1bajl2s7jhlq8l7lc9"; + sha256 = "1ahvjgcghh1pmgfsajg0b8bf5aaqxdx0f6b6qgljs0xfqm7zs05v"; }; }; in From 81b77fd3847a2eb23618b7cbaa23049ba6139fa2 Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Sun, 10 Apr 2022 16:46:21 +0200 Subject: [PATCH 42/48] php74Extensions.openswoole: init at 4.11.1 Request to add openswoole: https://pecl.php.net/package/openswoole Open Swoole is a fork of [Swoole](https://github.com/johanjanssens/nixpkgs/tree/master/pkgs/development/php-packages/swoole). It is actively maintained by some of the original developers and has growing community. - https://github.com/openswoole - https://openswoole.com/ - https://twitter.com/openswoole --- .../php-packages/openswoole/default.nix | 22 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/php-packages/openswoole/default.nix diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix new file mode 100644 index 00000000000..49379dfd541 --- /dev/null +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, buildPecl, php, valgrind, pcre2 }: +let + pname = "openswoole"; + version = "4.11.1"; +in +buildPecl { + inherit pname version; + + sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg="; + + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; + internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; + + meta = with lib; { + changelog = "https://pecl.php.net/package/openswoole/${version}"; + description = "Coroutine-based concurrency library and high performance programmatic server for PHP"; + homepage = "https://www.openswoole.com/"; + license = licenses.asl20; + longDescription = "Open Swoole allows you to build high-performance, async multi-tasking webservices and applications using an easy to use Coroutine API.\nOpen Swoole is a complete async solution that has built-in support for async programming via coroutines.\nIt offers a range of multi-threaded I/O modules (HTTP Server, WebSockets, TaskWorkers, Process Pools) out of the box and support for popular PHP clients like PDO for MySQL, and CURL.\nYou can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process."; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1cc267de788..c3929338088 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -209,6 +209,8 @@ lib.makeScope pkgs.newScope (self: with self; { sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; }); + openswoole = callPackage ../development/php-packages/openswoole { }; + pdlib = callPackage ../development/php-packages/pdlib { }; pcov = callPackage ../development/php-packages/pcov { }; From ff4c5643e6613ccf4e2a4c6aa854522e00dbc67b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 27 Apr 2022 14:08:45 +0200 Subject: [PATCH 43/48] pdepend: init at 2.10.3 --- .../php-packages/pdepend/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/php-packages/pdepend/default.nix diff --git a/pkgs/development/php-packages/pdepend/default.nix b/pkgs/development/php-packages/pdepend/default.nix new file mode 100644 index 00000000000..d1507040fce --- /dev/null +++ b/pkgs/development/php-packages/pdepend/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, lib, php }: + +let + pname = "pdepend"; + version = "2.10.3"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar"; + sha256 = "I5+n8+a3rHRgW4OM6FbVcf3T1wu9zBrTSb5sGq7ArH4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/pdepend/pdepend.phar + makeWrapper ${php}/bin/php $out/bin/pdepend \ + --add-flags "$out/libexec/pdepend/pdepend.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "An adaptation of JDepend for PHP"; + homepage = "https://github.com/pdepend/pdepend"; + license = licenses.bsd3; + longDescription = " + PHP Depend is an adaptation of the established Java + development tool JDepend. This tool shows you the quality + of your design in terms of extensibility, reusability and + maintainability. + "; + maintainers = teams.php.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b84c39113f9..8a795adbc4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2376,6 +2376,8 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; + pdepend = callPackage ../development/php-packages/pdepend/default.nix { }; + platformsh = callPackage ../misc/platformsh { }; inherd-quake = callPackage ../applications/misc/inherd-quake { From 4263a2116396f8c773963078f61c57ecaeb84677 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 4 May 2022 04:43:44 -0300 Subject: [PATCH 44/48] fluxcd: fix update script unbound variable --- pkgs/applications/networking/cluster/fluxcd/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index 89bfbdc535e..2d25eee6f34 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -35,7 +35,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then fi # `git` flag here is to be used by local maintainers to speed up the bump process - if [ "$1" = "git" ]; then + if [ $# -eq 1 ] && [ "$1" = "git" ]; then git switch -c "package-fluxcd-${LATEST_VERSION}" git add "$FLUXCD_PATH"/default.nix git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}" From 40d5cb2e8355e8f4346efd0325bd920df29ee133 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 4 May 2022 04:53:22 -0300 Subject: [PATCH 45/48] fluxcd: add superherointj as maintainer --- pkgs/applications/networking/cluster/fluxcd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 3d8eed801ec..53831dcf517 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -65,6 +65,6 @@ in buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ jlesquembre bryanasdev000 ]; + maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; }; } From 872280e35aabaa29d5d442c71fdaab6b4a4d43c8 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 4 May 2022 11:21:41 -0300 Subject: [PATCH 46/48] fluxcd: 0.29.5 -> 0.30.2 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 53831dcf517..3889082ec0c 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.29.5"; - sha256 = "1nqi7yk5d66fcjf6kyjivm3cbaqkj36ajgfvjm995q7cla2xyawm"; - manifestsSha256 = "09rq7wiv3ixdp0p8isfp26vikyx523arzdyizi6yb90q6dl6hgc0"; + version = "0.30.2"; + sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl"; + manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-dQV/8NF+sMiEoFr2wtR/oGqqn72JwH/JGbMREHIr/Tw="; + vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From 8696e36fca99fca1808feb1a953721325d0d7d7a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 4 May 2022 16:27:52 +0100 Subject: [PATCH 47/48] winbox: licenses.gpl3Plus -> licenses.unfree --- pkgs/tools/admin/winbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix index c845d890ce5..ae55eb4ed69 100644 --- a/pkgs/tools/admin/winbox/default.nix +++ b/pkgs/tools/admin/winbox/default.nix @@ -70,7 +70,7 @@ symlinkJoin { homepage = "https://mikrotik.com"; downloadPage = "https://mikrotik.com/download"; changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog"; - license = licenses.gpl3Plus; + license = licenses.unfree; maintainers = with maintainers; [ yrd ]; }; } From 8e225170e2e821119c3341e102bc2ad4c9ac3046 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 5 May 2022 00:51:52 +0800 Subject: [PATCH 48/48] prometheus-haproxy-exporter: 0.12.0 -> 0.13.0 (#171336) --- .../monitoring/prometheus/haproxy-exporter.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 6af1dbffbc8..f4c64d225e9 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "haproxy_exporter"; - version = "0.12.0"; - - goPackagePath = "github.com/prometheus/haproxy_exporter"; + version = "0.13.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "prometheus"; repo = "haproxy_exporter"; - sha256 = "09aqm2zqimn6w10p1nhnpjcigm299b31xfrq8ma0d7z4v9p2y9dn"; + rev = "v${version}"; + sha256 = "sha256-F0yYUIKTIGyhzL0QwmioQYnWBb0GeFOhBwL3IqDKoQA="; }; + vendorSha256 = "sha256-iJ2doxsLqTitsKJg3PUFLzEtLlP5QckSdFZkXX3ALIE="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/haproxy_exporter";