diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-26 12:01:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-26 12:01:16 +0000 |
commit | d77dd87222575867f638d2e6b2c1f2043f892f90 (patch) | |
tree | 9706a717040955b82743f0d008f7ea7616f2da06 /pkgs | |
parent | 672046dceb4737bc0a0b303f2cda4c041480b2b6 (diff) | |
parent | c1208ab1a673ecd90b6c6b4b1f18ff3ec8408d5a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs')
24 files changed, 202 insertions, 134 deletions
diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index ec9f45a83886e..b7992e2c723df 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-tC9U0yvuMEwO4mzWyUC+v+/H0EzgwTu02waTQrx19Bs="; + sha256 = "sha256-+UP1abTDYLn+lhMvo9G57X0nlColai7isNswog+3Y40="; }; - vendorSha256 = "sha256-aXq92SI4cgJrmo67SEfg8YKPEpO2UW2fcYnKq9TmAQg="; + vendorSha256 = "sha256-opVnj6dTtHrPYM1v+EFw39XDMF/fampAn7n+JvlBcJk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index a488f1d2f52de..0cde6d0090e7b 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.31.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-2h7tasHxeEe65BpUXmHkMsNmjiG+QofyGVqXPuk4Ej8="; + sha256 = "sha256-/tdAmu/BurCFB82i9pT2+PNOsPtHdlL/brUt4B9Q/EA="; }; - vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA="; + vendorSha256 = "sha256-KChEDFZj5zsZ/viOVWgC15WI8mp5cUC+SdNwkCjo6bI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 127ee9c6895a6..85971b8dfb10c 100644 --- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LNCzz5me60R/moFfdJhGMgUToFxADiPL02G4QCv0DLg="; + sha256 = "sha256-WGoLj6IuhxARSB3vAnprW1UO2g142uKZVHI3ubJepRs="; }; - vendorSha256 = "sha256-38ufXHzGlZgEh6swD/GhWbIYdY5uYznKCQ9OaoyOEiY="; + vendorSha256 = "sha256-gXW1NarCo42d/awg22wr6bIQQFRVTVnRUUAtQU8zY4M="; postPatch = '' substituteInPlace pkg/config/config.go \ diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a281505e0ec62..9bc29755ddb91 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,29 +168,6 @@ rec { # Constructor for other terraform versions mkTerraform = attrs: pluggable (generic attrs); - terraform_0_13 = mkTerraform { - version = "0.13.7"; - sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_14 = mkTerraform { - version = "0.14.11"; - sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j"; - vendorSha256 = "sha256-tWrSr6JCS9s+I0T1o3jgZ395u8IBmh73XGrnJidWI7U="; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_15 = mkTerraform { - version = "0.15.5"; - sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d"; - vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; - patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; - }; - terraform_1 = mkTerraform { version = "1.2.3"; sha256 = "sha256-hkPlufjlvmI5tKz1VTY5RztuDKEsgjrLR+f7HRrJmkA="; diff --git a/pkgs/applications/networking/cluster/terraform/provider-path.patch b/pkgs/applications/networking/cluster/terraform/provider-path.patch deleted file mode 100644 index 39a69e4a389fa..0000000000000 --- a/pkgs/applications/networking/cluster/terraform/provider-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/command/init.go b/command/init.go -index 403ca245b..05d98329a 100644 ---- a/command/init.go -+++ b/command/init.go -@@ -64,6 +64,11 @@ func (c *InitCommand) Run(args []string) int { - return 1 - } - -+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") -+ if ok { -+ flagPluginPath = append(flagPluginPath, val) -+ } -+ - if len(flagPluginPath) > 0 { - c.pluginPath = flagPluginPath - c.getPlugins = false diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 0ceefe9b5dd8a..a723fc720f10d 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-v811Gryviv3bg5WMKtInY6deokAyVT5QPumzjj6jtsM="; + sha256 = "sha256-d8caWGrfb8C12rVzQ08wz/FXkVPNd8broCKS4Xj3pJA="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index fa8dd2bd3900f..1600b1b4d8bba 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -65,11 +65,6 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/postinstall.py ''; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - postInstall = '' cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/ cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/ diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 11e1f444cb0bb..d4a71d639c73b 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.1.3"; + version = "1.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; - rev = "v${version}"; - sha256 = "sha256-RD/8v3IQb50iGkU6zj5QfHXakjHdcCBWWAkXhCIF6qo="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index 92ef636932fd8..e6b8edb784aae 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -4,6 +4,7 @@ , fetchPypi , python , pythonOlder +, isPy3k }: buildPythonPackage rec { @@ -11,7 +12,8 @@ buildPythonPackage rec { version = "3.5"; format = "setuptools"; - disabled = pythonOlder "3.7"; + # Supports Python 2.7 and 3.4+ + disabled = isPy3k && pythonOlder "3.4"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 5eb252a9c0e41..bf1784e08a02a 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fswatch"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "sha256-EKbo5gkrWuijLJgYsNBDtxy0ioXu/yHxnPPeOpk620g="; + sha256 = "sha256-9xCp/SaqdUsVhOYr/QfAN/7RcRxsybCmfiO91vf3j40="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/games/graphwar/default.nix b/pkgs/games/graphwar/default.nix new file mode 100644 index 0000000000000..3586979292e6c --- /dev/null +++ b/pkgs/games/graphwar/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, copyDesktopItems +, jdk +, makeDesktopItem +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "graphwar"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "catabriga"; + repo = "graphwar"; + rev = version; + sha256 = "sha256-t3Y576dXWp2Mj6OSQN5cm9FuNBWNqKq6xxkVRbjIBgE="; + }; + + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + buildInputs = [ jdk ]; + + buildPhase = '' + runHook preBuild + + mkdir -p out/ + javac -d out/ -sourcepath src/ -classpath out/ -encoding utf8 src/**/*.java + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/ + mv out $out/lib/graphwar + cp -r rsc $out/lib/graphwar/rsc + + makeWrapper ${jdk}/bin/java $out/bin/graphwar \ + --add-flags "-classpath $out/lib/graphwar Graphwar.Graphwar" + makeWrapper ${jdk}/bin/java $out/bin/graphwar-roomserver \ + --add-flags "-classpath $out/lib/graphwar RoomServer.RoomServer" + makeWrapper ${jdk}/bin/java $out/bin/graphwar-globalserver \ + --add-flags "-classpath $out/lib/graphwar GlobalServer.GlobalServer" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "graphwar"; + exec = "graphwar"; + desktopName = "Graphwar"; + categories = [ "Game" ]; + }) + ]; + + meta = with lib; { + homepage = "http://www.graphwar.com/"; + description = "An artillery game in which you must hit your enemies using mathematical functions"; + license = licenses.gpl3Plus; + platforms = jdk.meta.platforms; + maintainers = with maintainers; [ yrd ]; + }; +} diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index db5c8e5d903b5..50d1133c38201 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -1,5 +1,4 @@ { lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders -, GyroplotSupport ? false }: with python3Packages; @@ -21,9 +20,7 @@ buildPythonApplication { ''; buildInputs = [ libusb1 ]; - propagatedBuildInputs = [ psutil python3Packages.libusb1 ] - ++ lib.optionals GyroplotSupport [ pyqtgraph pyside ]; - + propagatedBuildInputs = [ psutil python3Packages.libusb1 ]; doCheck = false; pythonImportsCheck = [ "steamcontroller" ]; diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index bb7dc863d5bbf..934cccd205f7d 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.15.1", + "version": "0.16.4", "author": "Dessalines <tyhou13@gmx.com>", "license": "AGPL-3.0", "scripts": { @@ -17,14 +17,14 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@typescript-eslint/parser": "^5.6.0", + "@typescript-eslint/parser": "^5.21.0", "autosize": "^5.0.1", - "check-password-strength": "^2.0.3", - "choices.js": "^10.0.0", + "check-password-strength": "^2.0.5", + "choices.js": "^10.1.0", "classnames": "^2.3.1", - "emoji-short-name": "^1.0.0", - "express": "~4.17.1", - "i18next": "^21.5.4", + "emoji-short-name": "^2.0.0", + "express": "~4.18.0", + "i18next": "^21.6.16", "inferno": "^7.4.11", "inferno-create-element": "^7.4.11", "inferno-helmet": "^5.2.1", @@ -34,15 +34,16 @@ "inferno-server": "^7.4.11", "isomorphic-cookie": "^1.2.4", "jwt-decode": "^3.1.2", - "markdown-it": "^12.1.0", + "markdown-it": "^13.0.0", "markdown-it-container": "^3.0.0", + "markdown-it-footnote": "^3.0.3", "markdown-it-html5-embed": "^1.0.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "moment": "^2.29.1", + "moment": "^2.29.3", "register-service-worker": "^1.7.2", - "rxjs": "^7.4.0", - "sass": "^1.47.0", + "rxjs": "^7.5.5", + "sass": "^1.51.0", "serialize-javascript": "^6.0.0", "tippy.js": "^6.3.7", "toastify-js": "^1.11.2", @@ -50,48 +51,47 @@ "websocket-ts": "^1.1.1" }, "devDependencies": { - "@babel/core": "^7.16.0", - "@babel/plugin-transform-runtime": "^7.16.4", + "@babel/core": "^7.17.9", + "@babel/plugin-transform-runtime": "^7.17.0", "@babel/plugin-transform-typescript": "^7.16.1", - "@babel/preset-env": "7.16.8", + "@babel/preset-env": "7.16.11", "@babel/preset-typescript": "^7.16.0", - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.17.9", "@types/autosize": "^4.0.0", "@types/express": "^4.17.13", - "@types/node": "^17.0.8", - "@types/node-fetch": "^2.5.11", + "@types/node": "^17.0.29", + "@types/node-fetch": "^2.6.1", "@types/serialize-javascript": "^5.0.1", - "@typescript-eslint/eslint-plugin": "^5.6.0", - "babel-loader": "^8.2.3", - "babel-plugin-inferno": "^6.3.0", + "@typescript-eslint/eslint-plugin": "^5.21.0", + "babel-loader": "^8.2.5", + "babel-plugin-inferno": "^6.4.0", "bootstrap": "^5.1.3", "bootswatch": "^5.1.3", "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^10.0.0", - "css-loader": "^6.5.1", - "eslint": "^8.4.0", + "copy-webpack-plugin": "^10.2.4", + "css-loader": "^6.7.1", + "eslint": "^8.14.0", "eslint-plugin-prettier": "^4.0.0", "husky": "^7.0.4", "import-sort-style-module": "^6.0.0", - "iso-639-1": "^2.1.10", - "lemmy-js-client": "0.15.0", - "lint-staged": "^12.1.2", - "mini-css-extract-plugin": "^2.4.5", + "lemmy-js-client": "0.16.4", + "lint-staged": "^12.4.1", + "mini-css-extract-plugin": "^2.6.0", "node-fetch": "^2.6.1", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-organize-imports": "^2.3.4", - "prettier-plugin-packagejson": "^2.2.15", + "prettier-plugin-packagejson": "^2.2.17", "rimraf": "^3.0.2", "run-node-webpack-plugin": "^1.3.0", - "sass-loader": "^12.3.0", + "sass-loader": "^12.6.0", "sortpack": "^2.2.0", "style-loader": "^3.3.1", - "terser": "^5.10.0", - "typescript": "^4.5.2", - "webpack": "5.66.0", - "webpack-cli": "^4.9.1", - "webpack-dev-server": "4.7.3", + "terser": "^5.13.0", + "typescript": "^4.6.3", + "webpack": "5.72.0", + "webpack-cli": "^4.9.2", + "webpack-dev-server": "4.8.1", "webpack-node-externals": "^3.0.0" }, "engines": { diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 9a588b54da99f..c22c821f5db3f 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.15.1", - "serverSha256": "sha256-HHr9mG0AuI/86+EjODE/GT9lhl5DeNkzQ4k077b7ICU=", - "serverCargoSha256": "sha256-ErMNsyHfBiYZA4gjaxPHO+fQseUVIKy/928oGqw+Adg=", - "uiSha256": "sha256-Al6Q1xXkjqIb2v2S4JbmlQAAFCKwzkAW924uolC0tu8=", - "uiYarnDepsSha256": "sha256-Zadp74ZHmbxCHxpDAYOa6Ot2kWujIj8ZzrSaIEsYgMY=" + "version": "0.16.4", + "serverSha256": "sha256-xbxavlmRm7QTbrAjw6IMgQq8rEgyEHdcj11EhsOY+j0=", + "serverCargoSha256": "sha256-vDIaLpw0C6fnv0quH20qRN0I38Br338+MS9YzVfNizU=", + "uiSha256": "sha256-GZH/fSYLbxwigrr5LwAzxH4ElDVjTs8Tqqq+xYDFNCU", + "uiYarnDepsSha256": "sha256-BQs9UXUT/CcxJ7CdLksYGvGPGAaW7FLUAShLsbPC0jw=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 5526d8fe31f3e..52dddc8183c0d 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -7,6 +7,7 @@ , libiconv , Security , protobuf +, rustfmt }: let pinData = lib.importJSON ./pin.json; @@ -21,6 +22,7 @@ rustPlatform.buildRustPackage rec { repo = "lemmy"; rev = version; sha256 = pinData.serverSha256; + fetchSubmodules = true; }; cargoSha256 = pinData.serverCargoSha256; @@ -37,7 +39,7 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf rustfmt ]; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index a3cd4b9b5149c..02d75ac629c87 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-1AUs8Gt2Qw8BJk2zwRcazVl+POkPSy9e1jW9Mk/0rx8="; + sha256 = "sha256-NUFSnegLVGNUc6f/WSyIk1U6UQorxRykqojhgE/maw8="; }; patches = [ diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index f6986a1516b37..16350850163e3 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ghostunnel"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "ghostunnel"; repo = "ghostunnel"; rev = "v${version}"; - sha256 = "sha256-EE8gCm/gOp3lmCx1q4PahulipLoBZnEatNAVUXzHIVw="; + sha256 = "sha256-VameENcHZ6AttV0D8ekPGGFoMHTiTXAY2FxK/Nxwjmk="; }; - vendorSha256 = "sha256-XgmvqB1PCfL2gSDqwqauSixk8vlINHRmX6U0h9EXXdU="; + vendorSha256 = null; deleteVendor = true; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index b218a19154a5c..ec5b13b34f26e 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = "v${version}"; - sha256 = "rb8R04eU/rG7PXx/horYk0+/3AgbxYYZtxy4ACILOZ8="; + sha256 = "dFYITyO9znocf9fv3eh2h83NM3RDYcpDV/uxOISChZo="; }; postPatch = '' diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 0b15e9b023537..9877131d0a345 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.12.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IvYxpUMclDAKJ/EkRbNrX8eIFyhtY9Q0B0RipweieZA="; + sha256 = "sha256-ggdQL8BU56zE5figmbfHKlZ7WGZ7z5nKunXTy3kn170="; }; - vendorSha256 = "sha256-N6eU6KsnUrYBK90ydwUH8LNkR9KRjgc4ciGOGvy7pw8="; + vendorSha256 = "sha256-fwqkiPzrfo83NweuGONRx8+MOE4wQxg2Xk4/1kZwnCM="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix new file mode 100644 index 0000000000000..49618c53aead2 --- /dev/null +++ b/pkgs/tools/security/gopass/hibp.nix @@ -0,0 +1,39 @@ +{ lib +, makeWrapper +, buildGoModule +, fetchFromGitHub +, gopass +}: + +buildGoModule rec { + pname = "gopass-hibp"; + version = "1.14.3"; + + src = fetchFromGitHub { + owner = "gopasspw"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-JwZZ2VaSD9xkLny5sFeku5rN4FitI1dyW56JSWPMagM="; + }; + + vendorSha256 = "sha256-YySkVWdfGIT5qz0jTGlLEHoO0vGY0iNZ/oG9IZCjwRE="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; + + postFixup = '' + wrapProgram $out/bin/gopass-hibp --prefix PATH : "${lib.makeBinPath [ gopass ]}" + ''; + + meta = with lib; { + description = "Gopass haveibeenpwnd.com integration"; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index c138bde2cc3c6..5f6dab2e9069a 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.11.1"; + version = "1.14.3"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "03xhza7n92xg12z83as9qdvvc0yx1qy6q0c7i4njvng594f9a8x2"; + sha256 = "sha256-uLsKxx2Yr0g3vf2AQqRqRzNsBX2D4+6wwxM+czthL+I="; }; - vendorSha256 = "0d4fyppsdfzvmjb0qvpnfnw0vl6z256bly7hfb0whk6rldks60wr"; + vendorSha256 = "sha256-QEqtyHb+/tpbbHLCSBw7uafAtKzKkmxoFGqFVHSR03I="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index c1be7c9eb0811..f3968bb3ce2a1 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.12.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mRZXczIlW1s0VGZJ+KQue4Dz6XCXGfl56+g6iRv2lZg="; + sha256 = "sha256-Pbe5LMQioHDBHeEoT2brtsEBKq4oNROIlLccIjppRVo="; }; - vendorSha256 = "sha256-fiV4rtel2jOw6y/ukOZHeFuNVqxHS3rnYhXJ6JZ+a/8="; + vendorSha256 = "sha256-U0qniRHl4YgSy1GpsaYknMQpjpM8uKNtyLm6YblSd4U="; subPackages = [ "." ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bd19a8d3059dc..11aa7b335e53a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1370,12 +1370,9 @@ mapAliases ({ telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 - terraform-provider-ibm = throw "'terraform-provider-ibm' has been renamed to/replaced by 'terraform-providers.ibm'"; # Converted to throw 2022-02-22 - terraform-provider-libvirt = throw "'terraform-provider-libvirt' has been renamed to/replaced by 'terraform-providers.libvirt'"; # Converted to throw 2022-02-22 - terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16 - terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01"; - terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08 - terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15 + terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 + terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 + terraform_0_15 = throw "terraform_0_15 has been removed from nixpkgs"; # Added 2022-06-26 tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22 testVersion = testers.testVersion; # Added 2022-04-20 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4187c09ab0d88..ccfe9fe55424d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2495,11 +2495,21 @@ with pkgs; buildGoModule = buildGo118Module; }; - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { + buildGoModule = buildGo118Module; + }; + + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { + buildGoModule = buildGo118Module; + }; - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { + buildGoModule = buildGo118Module; + }; - gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { + buildGoModule = buildGo118Module; + }; gosca = callPackage ../development/tools/gosca { }; @@ -32098,6 +32108,8 @@ with pkgs; wine = wineWowPackages.unstable; }; + graphwar = callPackage ../games/graphwar { }; + gtetrinet = callPackage ../games/gtetrinet { inherit (gnome2) GConf libgnome libgnomeui; }; @@ -34991,9 +35003,6 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform - terraform_0_13 - terraform_0_14 - terraform_0_15 terraform_1 terraform_plugins_test ; |