b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-06-26 12:01:47 +00:00 committed by GitHub
parent 6905fbbcef d77dd87222
commit 6b4ec3595c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 231 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
nixos/modules/config/fonts/fontconfig.nix
View file

@ -65,7 +65,7 @@ let
${fcBool cfg.hinting.autohint}
</edit>
<edit mode="append" name="hintstyle">
<const>hintslight</const>
<const>${cfg.hinting.style}</const>
</edit>
<edit mode="append" name="antialias">
${fcBool cfg.antialias}
@ -226,7 +226,6 @@ in
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
(mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options")
@ -349,6 +348,20 @@ in
fonts, but better than unhinted fonts.
'';
};
style = mkOption {
type = types.enum [ "hintnone" "hintslight" "hintmedium" "hintfull" ];
default = "hintslight";
description = ''
Hintstyle is the amount of font reshaping done to line up
to the grid.
hintslight will make the font more fuzzy to line up to the grid
but will be better in retaining font shape, while hintfull will
be a crisp font that aligns well to the pixel grid but will lose
a greater amount of font shape.
'';
};
};
includeUserConf = mkOption {

4
nixos/modules/services/web-servers/nginx/default.nix
View file

@ -360,7 +360,7 @@ let
${optionalString (config.alias != null) "alias ${config.alias};"}
${optionalString (config.return != null) "return ${config.return};"}
${config.extraConfig}
${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
${optionalString (config.proxyPass != null && config.recommendedProxySettings) "include ${recommendedProxyConfig};"}
${mkBasicAuth "sublocation" config}
}
'') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));
@ -423,7 +423,7 @@ in
default = false;
type = types.bool;
description = "
Enable recommended proxy settings.
Whether to enable recommended proxy settings if a vhost does not specify the option manually.
";
};

11
nixos/modules/services/web-servers/nginx/location-options.nix
View file

@ -3,7 +3,7 @@
# has additional options that affect the web server as a whole, like
# the user/group to run under.)
{ lib }:
{ lib, config }:
with lib;
@ -128,5 +128,14 @@ with lib;
a greater priority.
'';
};
recommendedProxySettings = mkOption {
type = types.bool;
default = config.services.nginx.recommendedProxySettings;
defaultText = literalExpression "config.services.nginx.recommendedProxySettings";
description = ''
Enable recommended proxy settings.
'';
};
};
}

2
nixos/modules/services/web-servers/nginx/vhost-options.nix
View file

@ -281,7 +281,7 @@ with lib;
locations = mkOption {
type = types.attrsOf (types.submodule (import ./location-options.nix {
inherit lib;
inherit lib config;
}));
default = {};
example = literalExpression ''

6
pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
View file

@ -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 = [ "." ];

6
pkgs/applications/networking/cluster/driftctl/default.nix
View file

@ -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 ];

6
pkgs/applications/networking/cluster/helm/chart-testing/default.nix
View file

@ -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 \

23
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -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=";

16
pkgs/applications/networking/cluster/terraform/provider-path.patch
View file

@ -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

4
pkgs/applications/science/math/ginac/default.nix
View file

@ -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 ];

5
pkgs/applications/video/clapper/default.nix
View file

@ -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/

2
pkgs/development/libraries/gnutls/default.nix
View file

@ -5,7 +5,7 @@
, guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? false, trousers, which, nettools, libunistring
, withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit
, withSecurity ? false, Security # darwin Security.framework
, withSecurity ? true, Security # darwin Security.framework
# certificate compression - only zlib now, more possible: zstd, brotli
}:

6
pkgs/development/python-modules/authcaptureproxy/default.nix
View file

@ -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 = ''

4
pkgs/development/python-modules/pyserial/default.nix
View file

@ -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;

4
pkgs/development/tools/misc/fswatch/default.nix
View file

@ -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 ];

66
pkgs/games/graphwar/default.nix Normal file
View file

@ -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 ];
};
}

5
pkgs/misc/drivers/steamcontroller/default.nix
View file

@ -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" ];

70
pkgs/servers/web-apps/lemmy/package.json
View file

@ -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": {

10
pkgs/servers/web-apps/lemmy/pin.json
View file

@ -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="
}

4
pkgs/servers/web-apps/lemmy/server.nix
View file

@ -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;

4
pkgs/tools/admin/docker-credential-gcr/default.nix
View file

@ -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 = [

6
pkgs/tools/networking/ghostunnel/default.nix
View file

@ -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;

4
pkgs/tools/networking/mu/default.nix
View file

@ -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 = ''

6
pkgs/tools/security/gopass/git-credential.nix
View file

@ -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 = [ "." ];

39
pkgs/tools/security/gopass/hibp.nix Normal file
View file

@ -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 ];
};
}

6
pkgs/tools/security/gopass/jsonapi.nix
View file

@ -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 = [ "." ];

6
pkgs/tools/security/gopass/summon.nix
View file

@ -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 = [ "." ];

9
pkgs/top-level/aliases.nix
View file

@ -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

21
pkgs/top-level/all-packages.nix
View file

@ -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;
};
git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix {
buildGoModule = buildGo118Module;
};
gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };
git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix {
buildGoModule = buildGo118Module;
};
gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix {
buildGoModule = buildGo118Module;
};
gosca = callPackage ../development/tools/gosca { };
@ -32105,6 +32115,8 @@ with pkgs;
wine = wineWowPackages.unstable;
};
graphwar = callPackage ../games/graphwar { };
gtetrinet = callPackage ../games/gtetrinet {
inherit (gnome2) GConf libgnome libgnomeui;
};
@ -34998,9 +35010,6 @@ with pkgs;
inherit (callPackage ../applications/networking/cluster/terraform { })
mkTerraform
terraform_0_13
terraform_0_14
terraform_0_15
terraform_1
terraform_plugins_test
;