public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/tools/networking/xh/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-22 18:19:10 -07:00
parent 563389a7fd 6543c61311
commit 11a9ac00fc
157 changed files with 1479 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/tools/X11/xpra/default.nix
View File

@@ -1,7 +1,10 @@
{ lib, fetchurl, substituteAll, python3, pkg-config, writeText
{ lib
, fetchurl
, fetchpatch
, substituteAll, python3, pkg-config, writeText
, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk, pandoc
, wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which
, ffmpeg, x264, libvpx, libwebp, x265
, ffmpeg, x264, libvpx, libwebp, x265, librsvg
, libfakeXinerama
, gst_all_1, pulseaudio, gobject-introspection
, pam }:
@@ -33,20 +36,24 @@ let
in buildPythonApplication rec {
pname = "xpra";
version = "4.1.3";
version = "4.2";
src = fetchurl {
url = "https://xpra.org/src/${pname}-${version}.tar.gz";
sha256 = "TesmPRmfWy+IqqxoNFd04oX/b2ryGreZPeh2r4sL8JQ=";
hash = "sha256-KkQw4FJeH4G5jZ4GdP3aXZ3zxu4GALbiOI6POKJW6fk=";
};
patches = [
(substituteAll { # correct hardcoded paths
src = ./fix-paths.patch;
inherit (xorg) xkeyboardconfig;
inherit libfakeXinerama;
})
./fix-41106.patch # https://github.com/NixOS/nixpkgs/issues/41106
# Xorg won't start without. Remove on next version!
(fetchpatch {
url = "https://github.com/Xpra-org/xpra/commit/f9f242abad69363dfa558e1f6f7956ae99164b67.patch";
sha256 = "sha256-TOP9RuXPuqxyKY/7LSSrCWnAmJstEE+D5EwjMiVmchM=";
})
];
postPatch = ''
@@ -60,6 +67,7 @@ in buildPythonApplication rec {
libXrandr libxkbfile
] ++ [
cython
librsvg
pango cairo gdk-pixbuf atk.out gtk3 glib
@@ -78,7 +86,7 @@ in buildPythonApplication rec {
pillow rencode pycrypto cryptography pycups lz4 dbus-python
netifaces numpy pygobject3 pycairo gst-python pam
pyopengl paramiko opencv4 python-uinput pyxdg
ipaddress idna
ipaddress idna pyinotify
];
# error: 'import_cairo' defined but not used
@@ -86,6 +94,7 @@ in buildPythonApplication rec {
setupPyBuildFlags = [
"--with-Xdummy"
"--without-Xdummy_wrapper"
"--without-strict"
"--with-gtk3"
# Override these, setup.py checks for headers in /usr/* paths
@@ -99,6 +108,7 @@ in buildPythonApplication rec {
"''${gappsWrapperArgs[@]}"
--set XPRA_INSTALL_PREFIX "$out"
--set XPRA_COMMAND "$out/bin/xpra"
--set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb"
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
--prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}
)
@@ -119,12 +129,12 @@ in buildPythonApplication rec {
};
meta = {
homepage = "http://xpra.org/";
homepage = "https://xpra.org/";
downloadPage = "https://xpra.org/src/";
downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
downloadURLRegexp = "xpra-.*[.]tar[.][gx]z$";
description = "Persistent remote applications for X";
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ tstrobel offline numinit ];
maintainers = with maintainers; [ tstrobel offline numinit mvnetbiz ];
};
}

13
pkgs/tools/X11/xpra/fix-paths.patch
View File

@@ -16,19 +16,6 @@ index f962330..b02b6dd 100755
f.write(b"DEF ENABLE_DEVICE_CAPS=%i" % ENABLE_DEVICE_CAPS)
cython_add(Extension("xpra.codecs.v4l2.pusher",
diff --git a/xpra/x11/bindings/keyboard_bindings.pyx b/xpra/x11/bindings/keyboard_bindings.pyx
index bd7023d..064c6b5 100644
--- a/xpra/x11/bindings/keyboard_bindings.pyx
+++ b/xpra/x11/bindings/keyboard_bindings.pyx
@@ -21,7 +21,7 @@ from libc.stdlib cimport free, malloc
DEF PATH_MAX = 1024
DEF DFLT_XKB_RULES_FILE = b"base"
-DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb"
+DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb"
###################################
# Headers, python magic
diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py
index c867258..617af7c 100755
--- a/xpra/x11/fakeXinerama.py

5
pkgs/tools/audio/botamusique/default.nix
View File

@@ -5,6 +5,7 @@
, python3Packages
, ffmpeg
, makeWrapper
, nixosTests
# For the update script
, coreutils
@@ -140,6 +141,10 @@ stdenv.mkDerivation rec {
--output ${toString ./node-packages.nix}
'';
passthru.tests = {
inherit (nixosTests) botamusique;
};
meta = with lib; {
description = "Bot to play youtube / soundcloud / radio / local music on Mumble";
homepage = "https://github.com/azlux/botamusique";

62
pkgs/tools/audio/botamusique/node-packages.nix generated
View File

@@ -1624,13 +1624,13 @@ let
sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
};
};
"colorette-1.2.1" = {
"colorette-1.2.2" = {
name = "colorette";
packageName = "colorette";
version = "1.2.1";
version = "1.2.2";
src = fetchurl {
url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz";
sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==";
url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz";
sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==";
};
};
"command-line-usage-6.1.1" = {
@@ -2497,13 +2497,13 @@ let
sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";
};
};
"hosted-git-info-2.8.8" = {
"hosted-git-info-2.8.9" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
version = "2.8.8";
version = "2.8.9";
src = fetchurl {
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz";
sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==";
};
};
"html-minifier-terser-5.1.1" = {
@@ -2992,13 +2992,13 @@ let
sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
};
};
"lodash-4.17.20" = {
"lodash-4.17.21" = {
name = "lodash";
packageName = "lodash";
version = "4.17.20";
version = "4.17.21";
src = fetchurl {
url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz";
sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
};
};
"lower-case-2.0.1" = {
@@ -3109,13 +3109,13 @@ let
sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
};
};
"nanoid-3.1.18" = {
"nanoid-3.1.23" = {
name = "nanoid";
packageName = "nanoid";
version = "3.1.18";
version = "3.1.23";
src = fetchurl {
url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz";
sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA==";
url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz";
sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==";
};
};
"natural-compare-1.4.0" = {
@@ -3523,13 +3523,13 @@ let
sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==";
};
};
"postcss-8.1.10" = {
"postcss-8.2.15" = {
name = "postcss";
packageName = "postcss";
version = "8.1.10";
version = "8.2.15";
src = fetchurl {
url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz";
sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==";
url = "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz";
sha512 = "2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==";
};
};
"postcss-loader-4.1.0" = {
@@ -4414,15 +4414,6 @@ let
sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
};
};
"vfile-location-3.2.0" = {
name = "vfile-location";
packageName = "vfile-location";
version = "3.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz";
sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==";
};
};
"watchpack-2.0.1" = {
name = "watchpack";
packageName = "watchpack";
@@ -4536,7 +4527,7 @@ let
name = "botamusique";
packageName = "botamusique";
version = "0.0.0";
src = ../../../../../../../../run/user/1000/tmp.ioJA7NbZmp;
src = ../../../../../../../../../tmp/tmp.hWY9btrx5g;
dependencies = [
sources."@babel/code-frame-7.10.4"
sources."@babel/compat-data-7.12.7"
@@ -4735,7 +4726,7 @@ let
})
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."colorette-1.2.1"
sources."colorette-1.2.2"
sources."command-line-usage-6.1.1"
sources."commander-4.1.1"
sources."comment-parser-0.7.6"
@@ -4886,7 +4877,7 @@ let
sources."has-flag-3.0.0"
sources."has-symbols-1.0.1"
sources."he-1.2.0"
sources."hosted-git-info-2.8.8"
sources."hosted-git-info-2.8.9"
sources."html-minifier-terser-5.1.1"
sources."html-webpack-plugin-4.5.0"
(sources."htmlparser2-3.10.1" // {
@@ -4964,7 +4955,7 @@ let
];
})
sources."locate-path-2.0.0"
sources."lodash-4.17.20"
sources."lodash-4.17.21"
sources."lower-case-2.0.1"
sources."make-dir-2.1.0"
sources."merge-stream-2.0.0"
@@ -4981,7 +4972,7 @@ let
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
sources."ms-2.1.2"
sources."nanoid-3.1.18"
sources."nanoid-3.1.23"
sources."natural-compare-1.4.0"
sources."neo-async-2.6.2"
sources."no-case-3.0.3"
@@ -5024,7 +5015,7 @@ let
sources."pify-4.0.1"
sources."pkg-dir-2.0.0"
sources."popper.js-1.16.1"
(sources."postcss-8.1.10" // {
(sources."postcss-8.2.15" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -5179,7 +5170,6 @@ let
sources."utila-0.4.0"
sources."v8-compile-cache-2.2.0"
sources."validate-npm-package-license-3.0.4"
sources."vfile-location-3.2.0"
sources."watchpack-2.0.1"
(sources."webpack-5.6.0" // {
dependencies = [

8
pkgs/tools/audio/botamusique/src.json
View File

@@ -1,9 +1,9 @@
{
"url": "https://github.com/azlux/botamusique",
"rev": "df38c7dbd6d59c6790cf2364d1f344b7f6f72107",
"date": "2021-03-13T15:44:40+08:00",
"path": "/nix/store/30ds4gp7aldj9rqix1xf7j2ps5blrx8w-botamusique",
"sha256": "06xw1pif145zcm9z8l9kzl8ayl7vy5ywr0m3a5yswybcp2fzj087",
"rev": "33a9e75ba9d0a382f7a76d23a0ceb626924a8b49",
"date": "2021-05-19T22:37:39+08:00",
"path": "/nix/store/dqc2vjd43cixm49w8g66wvi9zmdfwsdd-botamusique",
"sha256": "18lbgslx9vdwd5nrbkqfjvzaikp2swvv375v9gql7cg8p46w7i11",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

2
pkgs/tools/audio/yabridge/default.nix
View File

@@ -149,7 +149,7 @@ in stdenv.mkDerivation rec {
description = "Yet Another VST bridge, run Windows VST2 plugins under Linux";
homepage = "https://github.com/robbert-vdh/yabridge";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ metadark ];
maintainers = with maintainers; [ kira-bruneau ];
platforms = [ "x86_64-linux" ];
};
}

2
pkgs/tools/audio/yabridgectl/default.nix
View File

@@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
description = "A small, optional utility to help set up and update yabridge for several directories at once";
homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ metadark ];
maintainers = with maintainers; [ kira-bruneau ];
};
}

4
pkgs/tools/filesystems/ceph/default.nix
View File

@@ -131,10 +131,10 @@ let
]);
sitePackages = ceph-python-env.python.sitePackages;
version = "16.2.1";
version = "16.2.3";
src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
sha256 = "1qqvfhnc94vfrq1ddizf6habjlcp77abry4v18zlq6rnhwr99zrh";
sha256 = "sha256-K3T1Lob19p8ykYEmYumHS8hqj2uysCuE0EAKb1TMJ0Q=";
};
in rec {
ceph = stdenv.mkDerivation {

4
pkgs/tools/graphics/ldgallery/default.nix
View File

@@ -1,10 +1,10 @@
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick }:
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick, CoreServices }:
with lib;
with haskell.lib;
let
ldgallery-viewer = pkgs.callPackage ./viewer { };
ldgallery-viewer = pkgs.callPackage ./viewer { inherit CoreServices; };
inherit (haskellPackages) ldgallery-compiler;
in

3
pkgs/tools/graphics/ldgallery/viewer/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc }:
{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc, CoreServices }:
with lib;
@@ -24,6 +24,7 @@ let
nodePkg = nodePackages.package.override {
src = "${sourcePkg}/viewer";
postInstall = "npm run build";
buildInputs = optionals stdenv.isDarwin [ CoreServices ];
};
in

2
pkgs/tools/graphics/mangohud/default.nix
View File

@@ -120,6 +120,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/flightlessmango/MangoHud";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ metadark zeratax ];
maintainers = with maintainers; [ kira-bruneau zeratax ];
};
}

2
pkgs/tools/graphics/vkBasalt/default.nix
View File

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
description = "A Vulkan post processing layer for Linux";
homepage = "https://github.com/DadSchoorse/vkBasalt";
license = licenses.zlib;
maintainers = with maintainers; [ metadark ];
maintainers = with maintainers; [ kira-bruneau ];
platforms = platforms.linux;
};
}

29
pkgs/tools/misc/bfetch/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ lib, stdenvNoCC, fetchFromGitHub, bash }:
stdenvNoCC.mkDerivation rec {
pname = "bfetch";
version = "unstable-2021-05-21";
src = fetchFromGitHub {
owner = "NNBnh";
repo = pname;
rev = "ef88e9d3f815e5074efc8ef4b7f32be6818130f2";
sha256 = "sha256-jS9zI8b+z3KbI+LeHFwIMJfEmAKSzO8HRZ2rk35hJCk=";
};
buildInputs = [ bash ];
postPatch = ''
patchShebangs --host bin/bfetch
'';
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A SuperB general-purpose fetch displayer written in portable sh";
homepage = "https://github.com/NNBnh/bfetch";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ fortuneteller2k ];
};
}

4
pkgs/tools/misc/fzf/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fzf";
version = "0.27.0";
version = "0.27.1";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
sha256 = "sha256-q0rAAD6du0WLcd46LUpkG3gBIvmtOE/foEMW5QCoIak=";
sha256 = "sha256-TMzyUhgOfcWXKhxy+2SeBy0mws/M+4YoitlPpYt6k9g=";
};
vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw=";

40
pkgs/tools/networking/openconnect_pa/default.nix
View File

@@ -1,40 +0,0 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } :
assert (openssl != null) == (gnutls == null);
stdenv.mkDerivation {
version = "unstable-2018-10-08";
pname = "openconnect_pa";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "dlenski";
repo = "openconnect";
rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b";
sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax";
};
preConfigure = ''
export PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config
export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2"
export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2"
'';
configureFlags = [
"--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script"
"--disable-nls"
"--without-openssl-version-check"
];
nativeBuildInputs = [ pkg-config autoreconfHook ];
propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ];
meta = with lib; {
description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN";
homepage = "https://github.com/dlenski/openconnect/";
license = licenses.lgpl21;
maintainers = with maintainers; [ chessai ];
platforms = platforms.linux;
};
}

6
pkgs/tools/networking/xh/default.nix
View File

@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "xh";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "ducaale";
repo = "xh";
rev = "v${version}";
sha256 = "cOlya3ngIoaoqzh0fIbNAjwO7S7wZCQk7WVqgZona8A=";
sha256 = "sha256-eOP9sc1qmQuc3HecNNZDMarVkXmEfGZkan0H9598LC0=";
};
cargoSha256 = "sha256-jjC7G4JsLyj5LC29DBI996E+Ha/tVrcv7A95MmB7A08=";
cargoSha256 = "sha256-JXywHuZPQVhuWBVUNi9k8TwgE8KCNDtucjxxDi6unVM=";
nativeBuildInputs = [ pkg-config ];

2
pkgs/tools/package-management/protontricks/default.nix
View File

@@ -50,7 +50,7 @@ buildPythonApplication rec {
description = "A simple wrapper for running Winetricks commands for Proton-enabled games";
homepage = "https://github.com/Matoking/protontricks";
license = licenses.gpl3Only;
maintainers = with maintainers; [ metadark ];
maintainers = with maintainers; [ kira-bruneau ];
platforms = platforms.linux;
};
}

69
pkgs/tools/security/eid-mw/default.nix
View File

@@ -1,24 +1,37 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config
, gtk3, nssTools, pcsclite
, libxml2, libproxy
, openssl, curl
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, autoconf-archive
, pkg-config
, makeWrapper
, substituteAll }:
, curl
, gtk3
, libassuan
, libbsd
, libproxy
, libxml2
, openssl
, p11-kit
, pcsclite
, nssTools
, substituteAll
}:
stdenv.mkDerivation rec {
pname = "eid-mw";
version = "4.4.27";
# NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
version = "5.0.21";
src = fetchFromGitHub {
rev = "v${version}";
sha256 = "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1";
sha256 = "1sz7996q6gd6vbdxqgyx1jwjznpki1k9zbgaj1j1a51y6w0g0kdh";
repo = "eid-mw";
owner = "Fedict";
};
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ];
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];
buildInputs = [ curl gtk3 libassuan libbsd libproxy libxml2 openssl p11-kit pcsclite ];
preConfigure = ''
mkdir openssl
ln -s ${openssl.out}/lib openssl
@@ -27,30 +40,30 @@ stdenv.mkDerivation rec {
export SSL_PREFIX=$(realpath openssl)
substituteInPlace plugins_tools/eid-viewer/Makefile.in \
--replace "c_rehash" "openssl rehash"
'';
'';
# pinentry uses hardcoded `/usr/bin/pinentry`, so use the built-in (uglier) dialogs for pinentry.
configureFlags = [ "--disable-pinentry" ];
postPatch = ''
sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
'';
configureFlags = [ "--enable-dialogs=yes" ];
postInstall =
let
eid-nssdb-in = substituteAll {
inherit (stdenv) shell;
isExecutable = true;
src = ./eid-nssdb.in;
};
in
''
install -D ${eid-nssdb-in} $out/bin/eid-nssdb
substituteInPlace $out/bin/eid-nssdb \
--replace "modutil" "${nssTools}/bin/modutil"
let
eid-nssdb-in = substituteAll {
inherit (stdenv) shell;
isExecutable = true;
src = ./eid-nssdb.in;
};
in
''
install -D ${eid-nssdb-in} $out/bin/eid-nssdb
substituteInPlace $out/bin/eid-nssdb \
--replace "modutil" "${nssTools}/bin/modutil"
rm $out/bin/about-eid-mw
wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
'';
rm $out/bin/about-eid-mw
wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
'';
enableParallelBuilding = true;
@@ -83,6 +96,6 @@ stdenv.mkDerivation rec {
firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }
'';
platforms = platforms.linux;
maintainers = with maintainers; [ bfortz ];
maintainers = with maintainers; [ bfortz chvp ];
};
}

4
pkgs/tools/security/vault/default.nix
View File

@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "vault";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "0ncy99gw2pp5v2qbbgvri7qlirjj8qsvgjmjqyx3gddlpzpyiz3q";
sha256 = "0nd77lfccl71qn98cq1yz85aiafplxbr58nafbbflijs1fz1771q";
};
goPackagePath = "github.com/hashicorp/vault";

10
pkgs/tools/security/vault/vault-bin.nix
View File

@@ -1,26 +1,26 @@
{ lib, stdenv, fetchurl, unzip }:
let
version = "1.7.1";
version = "1.7.2";
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
sha256 = "021qa8jcqwy27q83lvamvv5zqnkwk5y0jsb8al5yxpgzxqnmsyb1";
sha256 = "1g37pgj7hbi6vfpwq9rrh6is980lfwbq5jb4736jfp5m360vprjy";
};
i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
sha256 = "02hhxpa8craa91nfgvwziswisfdnqw4gbwrxyxr753v1y00y1sz8";
sha256 = "0777xkkfiy0s3nyygcfpw0nbfsm6yz1n5hxcvfafhzcdyr58fpb7";
};
x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
sha256 = "141zzfwrjdjv8ymrdc4mxs2f4cphdir4xjaa40s571ri38in33zh";
sha256 = "0wzmah542bhyvrm9brhrx7drjyzan8vxhqnm0gjak5wlrcnf2dvx";
};
aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
sha256 = "1plrmmy86zb2ij49dk2mwn364i2n83ch4gjz5pln2d4wjx21gpaq";
sha256 = "0cs56ircad2z2msqgb0l5h53cwmwybi5rs4y2jigz4rq4ndx9f9b";
};
};

23
pkgs/tools/system/wslu/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "wslu";
version = "3.2.3";
src = fetchFromGitHub {
owner = "wslutilities";
repo = pname;
rev = "v${version}";
sha512 = "2mkvdl65hnwflmi635ngmsm1aqsablz2gypn3a1adby1mwwdc57xym8kkg5359g3mvksac6n43ji2z48lfpvlay64z793q2v0z6by02";
};
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A collection of utilities for Windows 10 Linux Subsystems";
homepage = "https://github.com/wslutilities/wslu";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jamiemagee ];
platforms = platforms.linux;
};
}

11
pkgs/tools/typesetting/htmldoc/default.nix
View File

@@ -1,20 +1,23 @@
{ lib, stdenv, fetchFromGitHub, zlib, libpng, SystemConfiguration, Foundation }:
{ lib, stdenv, fetchFromGitHub, zlib, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config }:
stdenv.mkDerivation rec {
pname = "htmldoc";
version = "1.9.11";
version = "1.9.12";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = "htmldoc";
rev = "v${version}";
sha256 = "0660829zjfdm6vzx14z7gvsfipsb7h0z74gbkyp2ncg3g2432s4n";
sha256 = "1dqima0g3j301wwzjxdhzk5pvfj724rl615gf8ssxxajfnid1gl0";
};
buildInputs = [ zlib libpng ]
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib libpng libjpeg ]
++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ];
meta = with lib; {
description = "Converts HTML files to PostScript and PDF";
homepage = "https://michaelrsweet.github.io/htmldoc";
changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ shanemikel ];
platforms = platforms.unix;