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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-28 06:02:07 +00:00 committed by GitHub
commit 0049ace2ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 132 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/tests/vaultwarden.nix
View File

@ -74,7 +74,10 @@ let
services.vaultwarden = {
enable = true;
dbBackend = backend;
config.rocketPort = 80;
config = {
rocketAddress = "0.0.0.0";
rocketPort = 80;
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
@ -85,6 +88,8 @@ let
{
libraries = [ pkgs.python3Packages.selenium ];
} ''
from selenium.webdriver.common.by import By
from selenium.webdriver import Firefox
from selenium.webdriver.firefox.options import Options
from selenium.webdriver.support.ui import WebDriverWait
@ -101,40 +106,40 @@ let
wait.until(EC.title_contains("Create Account"))
driver.find_element_by_css_selector('input#email').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#email').send_keys(
'${userEmail}'
)
driver.find_element_by_css_selector('input#name').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys(
'A Cat'
)
driver.find_element_by_css_selector('input#masterPassword').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#masterPassword').send_keys(
'${userPassword}'
)
driver.find_element_by_css_selector('input#masterPasswordRetype').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#masterPasswordRetype').send_keys(
'${userPassword}'
)
driver.find_element_by_xpath("//button[contains(., 'Submit')]").click()
driver.find_element(By.XPATH, "//button[contains(., 'Submit')]").click()
wait.until_not(EC.title_contains("Create Account"))
driver.find_element_by_css_selector('input#masterPassword').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#masterPassword').send_keys(
'${userPassword}'
)
driver.find_element_by_xpath("//button[contains(., 'Log In')]").click()
driver.find_element(By.XPATH, "//button[contains(., 'Log In')]").click()
wait.until(EC.title_contains("My Vault"))
wait.until(EC.title_contains("Bitwarden Web Vault"))
driver.find_element_by_xpath("//button[contains(., 'Add Item')]").click()
driver.find_element(By.XPATH, "//button[contains(., 'Add Item')]").click()
driver.find_element_by_css_selector('input#name').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys(
'secrets'
)
driver.find_element_by_css_selector('input#loginPassword').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#loginPassword').send_keys(
'${storedPassword}'
)
driver.find_element_by_xpath("//button[contains(., 'Save')]").click()
driver.find_element(By.XPATH, "//button[contains(., 'Save')]").click()
'';
in
[ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ];

17
pkgs/applications/editors/vscode/vscode.nix
View File

@ -2,6 +2,7 @@
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
plat = {
x86_64-linux = "linux-x64";
@ -9,22 +10,22 @@ let
aarch64-linux = "linux-arm64";
aarch64-darwin = "darwin-arm64";
armv7l-linux = "linux-armhf";
}.${system};
}.${system} or throwSystem;
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0jixjbj1h9l0zrkb8sc3p4x7kjh87dramaz6j8369vv6mc4h8ymr";
x86_64-darwin = "1lqxjzyzhr3dpvjpmmlvknaxjzryr6yz8rg1mh5p211wfi13rf1c";
aarch64-linux = "0y4q1kpwhz0hyipsc7hah6xgz9p3sn0ysaqzw32dl91hkr6d52mf";
aarch64-darwin = "1d89gr4aj0vl05rz9d5iv8kkgb8p5jbfc9b0hjj1cp0d276x6ipy";
armv7l-linux = "11cawg3ql9iq9z56i68h26cz7ydg0az298cbs2kpsz2lzkw97wbd";
}.${system};
x86_64-linux = "0djz1gi605f0xwrn2b5f0cvvcdmhh1n00rfcqxp1j1fa4y69lyzq";
x86_64-darwin = "1n51f0fb6h8kpsn8g0bcp4nav0ilin26c5xp1qhs63hnnif045pn";
aarch64-linux = "1zjg18f38h682mibws6n4hwa01jkv5dpj45jw17dmk7wgw4gylww";
aarch64-darwin = "10crlbcpn90498nszillryvr0w2w46ra6g7nbkqkkgzav692nfys";
armv7l-linux = "1iwp0fax56l23dllfd4p7p4k28bk6msfknq9dagxqhg4i9p2yrq2";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.69.1";
version = "1.69.2";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

17
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -2,6 +2,7 @@
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
plat = {
x86_64-linux = "linux-x64";
@ -9,17 +10,17 @@ let
aarch64-linux = "linux-arm64";
aarch64-darwin = "darwin-arm64";
armv7l-linux = "linux-armhf";
}.${system};
}.${system} or throwSystem;
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0nsqrhijx5ic467fk2d803x93yazjkybg9cwmkk2l343fdg86kyq";
x86_64-darwin = "0hxafssjjx4gvbqpra517ar8dik5hkrnzx54v89g8p6s7kzkp1j0";
aarch64-linux = "1sl3w17a0j4b6rgl3xkna34i24s5ig8fs8kh2ysigb34h2izjdwi";
aarch64-darwin = "08wqiplyb16s7nvhlik7307jm3jznq7g611bp01q12bkxfa3bpp8";
armv7l-linux = "0vzl70545dplvd7nkl5g8x7mninjv3bkdp6d2ww6g2hdbdx0hlhr";
}.${system};
x86_64-linux = "0kvmnayrwpz82jxhvi69r45nyq74v5qyx5nn8b6kz23ma02nm4y6";
x86_64-darwin = "0w6qbybzvpb886z1y5w7q36xy176f5hagzgqddzgwbzlv3lc9i9j";
aarch64-linux = "194bnz4rg6lpi1pcl3yknap2n1p9vyi86wd5rq4m0h8kmqg1i21w";
aarch64-darwin = "1vhb85zbpp399qxn7b7gdvsij174x5nzp84xw57kw9pzs5dkw12g";
armv7l-linux = "1cr3vqxl0h8a4mg920a90ykdvb3vzf8cyxls1w8m84k3b53m5qdi";
}.${system} or throwSystem;
sourceRoot = if stdenv.isDarwin then "" else ".";
in
@ -28,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.69.1";
version = "1.69.2";
pname = "vscodium";
executableName = "codium";

6
pkgs/applications/networking/cluster/werf/default.nix
View File

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "werf";
version = "1.2.138";
version = "1.2.140";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
sha256 = "sha256-gRMPTw/PzAE/kij4dq9ph/1Iz/a+fEsT5HSogC5EDFE=";
sha256 = "sha256-StlIq7Xt71R2Yy2qeEC1faRQdlQSg6aQKwO8pVFMYGw=";
};
vendorSha256 = "sha256-6/XiTgAQ3M3ge/b7uEFD0K+3kd7I2yqZJjgPVXP+uQ0=";
vendorSha256 = "sha256-jeRLA6dRvdKGWexR6/P6Vx39UmSK4Hhb/nyR3irMuWA=";
proxyVendor = true;

4
pkgs/applications/science/robotics/mavproxy/default.nix
View File

@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.50";
version = "1.8.52";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-dTdXmhm6sWZphLhcoKRDQ2Ir0hcu0ev0xCul2O9hAXg=";
sha256 = "sha256-H30QZbUj6SXuwhhQUvHoPDM1D4ynm/vt1Mi4rkCB1oo=";
};
postPatch = ''

6
pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "lucky-commit";
version = "2.1.1";
version = "2.2.1";
src = fetchFromGitHub {
owner = "not-an-aardvark";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FnH9rDy6opu0WJnCgAFvxJXWKyD2v5eGPNmbC1cvzko=";
sha256 = "sha256-0RSNlzmwat89ewQrjdGxLcXo01d+UaPZlteaxZCBRyE=";
};
cargoSha256 = "sha256-iEYkOPAcWIwK7mthovrGFHfp/NsQ4ycqiTZvkHnYWzA=";
cargoSha256 = "sha256-8r/EGIiN+HTtChgLTdOS+Y7AdmjswqD4BZtYlL5UiEo=";
buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd);

4
pkgs/applications/video/ani-cli/default.nix
View File

@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation rec {
pname = "ani-cli";
version = "2.2";
version = "3.3";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ani-cli";
rev = "v${version}";
sha256 = "sha256-B/bIGrSQmKZFh3PpsbwivR2QKLMHIypWLxWuufiFHw4=";
sha256 = "sha256-khgErF/1DmqnXmTUvTYWuyUAos6aUghImgXp3NjOZEg=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/data/documentation/scheme-manpages/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "scheme-manpages";
version = "unstable-2022-05-14";
version = "unstable-2022-07-04";
src = fetchFromGitHub {
owner = "schemedoc";
repo = "manpages";
rev = "e4d8e389312a865e350ef88f3e9d69be290705c7";
sha256 = "sha256-bYg8XSycbQIaZDsE0G5Xy0bd2JNWHwYEnyL6ThN7XS4=";
rev = "0b95de112857b185b83141ac9324fb0e786c56df";
sha256 = "sha256-HWkZJd4t7gsbbSGiQ92Lav9EMBPMLXmXFT6HVfyFLSI=";
};
dontBuild = true;

6
pkgs/data/themes/marwaita/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "marwaita";
version = "13.0";
version = "14.0";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "sha256-aP/zPM7M8Oru/2AA8w6rKU/AVJJ0bAEC01C60yi2SbM=";
sha256 = "sha256-G8oarWGx4DQ8ftmaWYpzV94cabDXbiJcVVgs70AG0Gs=";
};
buildInputs = [
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { inherit pname version; };
meta = with lib; {
description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops";

6
pkgs/development/interpreters/zuo/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zuo";
version = "unstable-2022-04-23";
version = "unstable-2022-07-25";
src = fetchFromGitHub {
owner = "racket";
repo = "zuo";
rev = "2f3e23bd374f9a6504de6000989ebf2adf67c80c";
sha256 = "sha256-TxX3iinfL1hXFlQlGQ7x52O6zvYoJYXrMfEfSL4Axig=";
rev = "18778d759e7af1d9c4b6ce7649a3aa4a49a2aa7f";
sha256 = "sha256-Y5+C1UdaeweYaGqomC1dFmTF8qGDquuP42Bn6QbZ9nk=";
};
doCheck = true;

11
pkgs/development/python-modules/frozendict/default.nix
View File

@ -3,19 +3,18 @@
, fetchPypi
, isPy3k
, pytestCheckHook
, python
}:
buildPythonPackage rec {
pname = "frozendict";
version = "2.3.2";
version = "2.3.4";
format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-f6xFQvChP75wTbSUL0G6Or/+xa+LEAAllz5Z3/agnQ0=";
sha256 = "15b4b18346259392b0d27598f240e9390fafbff882137a9c48a1e0104fb17f78";
};
pythonImportsCheck = [
@ -35,8 +34,8 @@ buildPythonPackage rec {
'';
meta = with lib; {
homepage = "https://github.com/slezica/python-frozendict";
description = "An immutable dictionary";
license = licenses.mit;
homepage = "https://github.com/Marco-Sulla/python-frozendict";
description = "A simple immutable dictionary";
license = licenses.lgpl3Only;
};
}

4
pkgs/development/python-modules/pymazda/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pymazda";
version = "0.3.6";
version = "0.3.7";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-zzyaG1i5eEnQWBiW8Wh/cIncJsU/XdEC61JmkB6Z6mY=";
sha256 = "sha256-1xreFjoHmdMirpxjVya30cw31fBaCPt877yqTr9By+A=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/scrap-engine/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "scrap_engine";
version = "1.2.0";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-dn/9wxK1UHd3cc3Jo1Cp9tynOFUlndH+cZfIc244ysE=";
sha256 = "sha256-rMZRD/fE1ed8R5GwS3aZcHLScQ1+uSpX29LwBXtXEao=";
};
nativeBuildInputs = [ setuptools-scm ];

30
pkgs/development/tools/bundletool/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }:
stdenv.mkDerivation rec {
pname = "bundletool";
version = "1.11.0";
src = fetchurl {
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
sha256 = "sha256-xCw2Wuc2ndTcLrwR7uv5FFnwImxTcG/STeTQBiaKuIw=";
};
dontUnpack = true;
nativeBuildInputs = [ makeBinaryWrapper ];
installPhase = ''
runHook preInstall
makeWrapper ${jre_headless}/bin/java $out/bin/bundletool --add-flags "-jar $src"
runHook postInstall
'';
meta = with lib; {
description = "Command-line tool to manipulate Android App Bundles";
homepage = "https://developer.android.com/studio/command-line/bundletool";
changelog = "https://github.com/google/bundletool/releases/tag/${version}";
maintainers = with maintainers; [ marsam ];
platforms = jre_headless.meta.platforms;
license = licenses.asl20;
};
}

8
pkgs/development/tools/inferno/default.nix
View File

@ -2,15 +2,15 @@
rustPlatform.buildRustPackage rec {
pname = "inferno";
version = "0.10.7";
version = "0.11.7";
# github version doesn't have a Cargo.lock
src = fetchCrate {
inherit pname version;
sha256 = "0bzrwa87j56sv03frl0lp6izfxsldn0692g2vpwfndhrsm0gy8z9";
sha256 = "sha256-HZBCLgWC9yEo3lY7If18SILKZV3rwHv7FBVdumiTbJg=";
};
cargoSha256 = "1dvk1y1afqlmmqqdm91lg2wvny5q47yfjvmjzaryk2ic1s6g17b1";
cargoSha256 = "sha256-upO+G9569NXFuc2vpxR6E4nxJqCjg+RMlxV7oKb7v1E=";
# these tests depend on a patched version of flamegraph which is included in
# the github repository as a submodule, but absent from the crates version
@ -19,6 +19,8 @@ rustPlatform.buildRustPackage rec {
"--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple"
"--skip=collapse::perf::tests::test_collapse_multi_perf"
"--skip=collapse::perf::tests::test_collapse_multi_perf_simple"
"--skip=collapse::perf::tests::test_multiple_skip_after"
"--skip=collapse::perf::tests::test_one_skip_after"
];
meta = with lib; {

6
pkgs/development/tools/stylua/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "stylua";
version = "0.14.1";
version = "0.14.2";
src = fetchFromGitHub {
owner = "johnnymorganz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SoO5xujSPe+6TOBvPt09sm77cRUU4s9nYjR1EOpcTBY=";
sha256 = "sha256-FqtpMRR647YiIIduIf37rKewytXgRl01OCmBUXd/44k=";
};
cargoSha256 = "sha256-L8nGAT7HoI67kxX+vf++iQ0NzY4hNW/H32LL6WZSJM4=";
cargoSha256 = "sha256-Z5W1eJUHFFuHRSemXspW3gUhiAieyUg/6lIVvqAL/Oo=";
buildFeatures = lib.optional lua52Support "lua52"
++ lib.optional luauSupport "luau";

1
pkgs/development/tools/vim-vint/default.nix
View File

@ -27,6 +27,7 @@ buildPythonApplication rec {
description = "Fast and Highly Extensible Vim script Language Lint implemented by Python";
homepage = "https://github.com/Kuniwak/vint";
license = licenses.mit;
mainProgram = "vint";
maintainers = with maintainers; [ andsild ];
platforms = platforms.all;
};

4
pkgs/development/web/twitter-bootstrap/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bootstrap";
version = "5.1.3";
version = "5.2.0";
src = fetchurl {
url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";
sha256 = "sha256-vewp21DsjR7My3AgIrgj3wozPhBYFMJksyG9UYuJxyE=";
sha256 = "sha256-CLykGjXxTZCXIJAyF6YBeEeC3oCz3g5Kcm0kLdOQUks=";
};
nativeBuildInputs = [ unzip ];

8
pkgs/servers/hylafaxplus/default.nix
View File

@ -13,6 +13,7 @@
, gnugrep
, gnused
, libtiff
, openssl
, psmisc
, sharutils
, util-linux
@ -30,8 +31,8 @@
let
pname = "hylafaxplus";
version = "7.0.5";
sha256 = "1blv251r0yhnhxk9wgkjgr35al50q23hiskjkcbs8lmqqrz0cm8f";
version = "7.0.6";
hash = "sha512-0faeEwF/XQE/85zwUMOnrGzvGanuWRDr53SnrgbX0i/SHjHelzSEd2TK6plVOfV4w8RY7Ox7lSO1gjqEEzfZyw==";
configSite = substituteAll {
name = "${pname}-config.site";
@ -65,7 +66,7 @@ stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz";
inherit sha256;
inherit hash;
};
patches = [
# adjust configure check to work with libtiff > 4.1
@ -78,6 +79,7 @@ stdenv.mkDerivation {
file # for `file` command
ghostscript
libtiff
openssl
psmisc # for `fuser` command
sharutils # for `uuencode` command
util-linux # for `agetty` command

2
pkgs/servers/hylafaxplus/libtiff-4.patch
View File

@ -5,7 +5,7 @@ https://bugs.gentoo.org/706154
echo '#define TIFFSTRIPBYTECOUNTS uint32_t'
echo '#define TIFFVERSION TIFF_VERSION'
echo '#define TIFFHEADER TIFFHeader';;
- 4.[0123]) tiff_runlen_t="uint32_t"
- 4.[01234]) tiff_runlen_t="uint32_t"
+ 4.[0-9]) tiff_runlen_t="uint32_t"
tiff_offset_t="uint64_t"
echo '#define TIFFSTRIPBYTECOUNTS uint64_t'

8
pkgs/tools/misc/grex/default.nix
View File

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "grex";
version = "1.3.0";
cargoSha256 = "sha256-zNwTk4RcTv2dGbKWelOPSvasBmj7tnjLhQ0DZhZ9hxk=";
version = "1.4.0";
src = fetchFromGitHub {
owner = "pemistahl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NMz35jgd7XPemVdA8nol2H6cgWD3yEPh0FEMPw8kgKQ=";
sha256 = "sha256-iKrsiHGXaZ4OXkS28+6r0AhPZsb22fDVbDA2QjaVVTw=";
};
cargoSha256 = "sha256-J+kz4aj6CXm0QsMQfPwK+30EtQOtfpCwp821DLhpVCI=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
doInstallCheck = true;

11
pkgs/tools/misc/mktorrent/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchFromGitHub, openssl}:
{ lib, stdenv, fetchFromGitHub, openssl }:
stdenv.mkDerivation rec {
pname = "mktorrent";
@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ];
meta = {
homepage = "https://github.com/pobrn/mktorrent/wiki";
license = lib.licenses.gpl2Plus;
meta = with lib; {
description = "Command line utility to create BitTorrent metainfo files";
maintainers = with lib.maintainers; [Profpatsch];
homepage = "https://github.com/pobrn/mktorrent/wiki";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ Profpatsch winter ];
platforms = platforms.all;
};
}

1
pkgs/tools/misc/skim/default.nix
View File

@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec {
description = "Command-line fuzzy finder written in Rust";
homepage = "https://github.com/lotabout/skim";
license = licenses.mit;
mainProgram = "sk";
maintainers = with maintainers; [ dywedir ];
};
}

6
pkgs/tools/security/vaultwarden/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "vaultwarden";
version = "1.24.0";
version = "1.25.2";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = pname;
rev = version;
sha256 = "sha256-zeMVdsTSp1z8cwebU2N6w7436N8CcI7PzNedDOSvEx4=";
sha256 = "sha256-6CpdvLCw7SUmWm9NHAxFAo454Rrp1FloDp67YAr0pjQ=";
};
cargoSha256 = "sha256-Sn6DuzV2OfaywE0W2afRG0h8PfOprqMtZtYM/exGEww=";
cargoSha256 = "sha256-+rXQGZNUz6UDLFVNbyHF6dTe3nEm5/2ITmVI+MfY6nM=";
postPatch = ''
# Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "vaultwarden-vault";
version = "2022.5.2";
version = "2022.6.2";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
sha256 = "sha256-clsiEC9nwfrGMIBwT95G3tR3KLxMvMM553s8it/3JtM=";
sha256 = "sha256-IG/eCBTUa7eKeaelqxCWO+rrXJUuBanhsYwklftxdOE=";
};
buildCommand = ''

6
pkgs/tools/text/mdbook-mermaid/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-mermaid";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "badboy";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1neEuDsPMI4f1HaAP+Kx62RBW8hqqNThHpUNa5DzlnY=";
sha256 = "sha256-Fd6TCmi1PnDJP2osMJNtEGzrI1Ay8s/XkhpzI+DLrGA=";
};
cargoSha256 = "sha256-Sk0cOLknS1UK3OcLHVSnA/H3BeMe7bpo2HgHEErQSAQ=";
cargoSha256 = "sha256-W/HSPT7X5B4Gyg806H3nm0wWlF89gutW530dgZ/qJLo=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

2
pkgs/top-level/all-packages.nix
View File

@ -3015,6 +3015,8 @@ with pkgs;
buildtorrent = callPackage ../tools/misc/buildtorrent { };
bundletool = callPackage ../development/tools/bundletool { };
bustle = haskellPackages.bustle;
bwm_ng = callPackage ../tools/networking/bwm-ng { };