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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-09-02 00:02:45 +00:00 committed by GitHub
commit c4a2f8dfca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
80 changed files with 3019 additions and 2861 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/systemd/user.nix
View File

@ -230,5 +230,9 @@ in {
});
})
cfg.tmpfiles.users;
system.userActivationScripts.tmpfiles = ''
${config.systemd.package}/bin/systemd-tmpfiles --user --create --remove
'';
};
}

3
nixos/tests/user-activation-scripts.nix
View File

@ -8,6 +8,7 @@ import ./make-test-python.nix ({ lib, ... }: {
initialPassword = "pass1";
isNormalUser = true;
};
systemd.user.tmpfiles.users.alice.rules = [ "r %h/file-to-remove" ];
};
testScript = ''
@ -27,7 +28,9 @@ import ./make-test-python.nix ({ lib, ... }: {
machine.wait_for_file("/home/alice/login-ok")
verify_user_activation_run_count(1)
machine.succeed("touch /home/alice/file-to-remove")
machine.succeed("/run/current-system/bin/switch-to-configuration test")
verify_user_activation_run_count(2)
machine.succeed("[[ ! -f /home/alice/file-to-remove ]] || false")
'';
})

7
pkgs/README.md
View File

@ -348,14 +348,15 @@ All versions of a package _must_ be included in `all-packages.nix` to make sure
* Not start with the package name.
* More generally, it should not refer to the package name.
* Not end with a period (or any punctuation for that matter).
* Aim to inform while avoiding subjective language.
* `meta.license` must be set and fit the upstream license.
* Provide factual information.
* Avoid subjective language.
* `meta.license` must be set and match the upstream license.
* If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.
* If in doubt, try to contact the upstream developers for clarification.
* `meta.mainProgram` must be set when appropriate.
* `meta.maintainers` should be set.
See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes).
See the Nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes).
### Import From Derivation

5
pkgs/applications/audio/bchoppr/default.nix
View File

@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "bchoppr";
version = "1.12.2";
version = "1.12.6";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
sha256 = "sha256-P6sbxhgnlek1IJ4i9yTe/3g/2C8oLPKXI3zbLdswvl8=";
sha256 = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ=";
fetchSubmodules = true;
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/blockchains/sparrow/default.nix
View File

@ -21,11 +21,11 @@
let
pname = "sparrow";
version = "1.7.8";
version = "1.7.9";
src = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
sha256 = "0nazqxffmai74x47dbkwryvx1pjm8k85rcfz5nr19h7fa1bj8rkc";
sha256 = "0bz8mx6mszqadx7nlb4ini45r2r57grdgmrq6k9lxgrgcpd8gasy";
};
launcher = writeScript "sparrow" ''

4
pkgs/applications/editors/thonny/default.nix
View File

@ -4,13 +4,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "thonny";
version = "4.1.1";
version = "4.1.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-DlizSm5cDvYXQ8Gok+W/RTSaAWJTkdyTQ4uewOiDVXg=";
hash = "sha256-vVDTizU+WDWJ75Ln93TAFYn7PJq5qc3hxVJiNGtK24g=";
};
nativeBuildInputs = [ copyDesktopItems ];

11
pkgs/applications/misc/nimbo/default.nix
View File

@ -7,19 +7,22 @@
python3.pkgs.buildPythonApplication rec {
pname = "nimbo";
version = "0.2.4";
version = "0.3.0";
disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "nimbo-sh";
repo = pname;
rev = "v${version}";
sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24";
sha256 = "YC5T02Sw22Uczufbyts8l99oCQW4lPq0gPMRXCoKsvw=";
};
# Rich + Colorama are added in `propagatedBuildInputs`
postPatch = ''
substituteInPlace setup.py \
--replace "awscli>=1.19<2.0" ""
--replace "awscli>=1.19<2.0" "" \
--replace "colorama==0.4.3" "" \
--replace "rich>=10.1.0" ""
'';
nativeBuildInputs = [ installShellFiles ];
@ -31,6 +34,8 @@ python3.pkgs.buildPythonApplication rec {
click
pyyaml
pydantic
rich
colorama
];
# nimbo tests require an AWS instance

4
pkgs/applications/misc/obsidian/default.nix
View File

@ -12,7 +12,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
version = "1.3.7";
version = "1.4.5";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@ -25,7 +25,7 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
sha256 = if stdenv.isDarwin then "sha256-jHsrSYBHJBMyChGsgXHxH/S7wdI1CMonzid8WenNSmI=" else "sha256-8Qi12d4oZ2R6INYZH/qNUBDexft53uy9Uug7UoArwYw=";
sha256 = if stdenv.isDarwin then "sha256-1xGlXjQrJ8gNtKYlCBiIfNnTZU591JZdU6NJqMA5gug=" else "sha256-Y/RlT+3xBbF9tjCbRQnQ+j8ogzLMfsQPnOdiCVj+NK0=";
};
icon = fetchurl {

12
pkgs/applications/misc/privacyidea/default.nix
View File

@ -7,6 +7,8 @@ let
outputs = lib.filter (x: x != "doc") outputs;
};
# Follow issue below for Python 3.11 support
# https://github.com/privacyidea/privacyidea/issues/3593
python3' = python310.override {
packageOverrides = self: super: {
django = super.django_3;
@ -20,6 +22,15 @@ let
};
doCheck = false;
});
# version 3.3.0+ does not support SQLAlchemy 1.3
factory_boy = super.factory_boy.overridePythonAttrs (oldAttrs: rec {
version = "3.2.1";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-qY0newwEfHXrbkq4UIp/gfsD0sshmG9ieRNUbveipV4=";
};
postPatch = "";
});
# fails with `no tests ran in 1.75s`
alembic = super.alembic.overridePythonAttrs (lib.const {
doCheck = false;
@ -180,6 +191,7 @@ in
python3'.pkgs.buildPythonPackage rec {
pname = "privacyIDEA";
version = "3.8.1";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;

4
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -91,11 +91,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.57.53";
version = "1.57.57";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-vySznLCjEqol3FOZHvDpY9LY1UG2ExOu/shu8suKuoM=";
sha256 = "sha256-B1V4BsGWBOhWgW4loY12OLLiwlqkIO3y2P6/h0WF71Y=";
};
dontConfigure = true;

4
pkgs/applications/networking/browsers/mullvad-browser/default.nix
View File

@ -78,7 +78,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "12.5.2";
version = "12.5.3";
sources = {
x86_64-linux = fetchurl {
@ -86,7 +86,7 @@ let
"https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"
"https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"
];
hash = "sha256-sVVgQTpPQFiG1mEIih0CemNV5qjC2l+JTxef37/nC9k=";
hash = "sha256-vnxpmZSqPe7wE4USDbYGm+5k9J/nuUk2uJx4CmwFPvw=";
};
};

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -92,7 +92,7 @@ lib.warnIf (useHardenedMalloc != null)
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "12.5.2";
version = "12.5.3";
lang = "ALL";
@ -104,7 +104,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
hash = "sha256-Mm2/ianon+RtOJqmuZCl+2cPliKiJvIOZ+TyzJ8l5es=";
hash = "sha256-QF71UXZXwLjr1XugKeFWZH9RXb4xeKWZScds+xtNekI=";
};
i686-linux = fetchurl {
@ -114,7 +114,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
hash = "sha256-mouxVi/Y5duIQXHYd8WcIzLZEXs5FZAt20dFq4vHzso=";
hash = "sha256-xaLTYo8aJO0DzFQLSUHF12vKOEMO6hbVXQdL3PHLb8s=";
};
};

6
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -23,7 +23,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.1.3035.302";
version = "6.2.3105.45";
suffix = {
aarch64-linux = "arm64";
@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-HWnHuLcJrV4yYt/l0iLl0N2p9v7r5RwQod1s0op52Z4=";
x86_64-linux = "sha256-NPmiatlGK+8GJHwDXyOZ+J1PSN7Oj8sAKfm6r1usI1E=";
aarch64-linux = "sha256-AumYFbCa5+Ou89e6MDQZFlyCu30IvX8jbz+deRojzOQ=";
x86_64-linux = "sha256-9U7vPvmCbwgkYGIZblKghuqClhOfGSEQqTVkaDgc0Ms=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

4
pkgs/applications/networking/cluster/gatekeeper/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "gatekeeper";
version = "3.12.0";
version = "3.13.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
rev = "v${version}";
sha256 = "sha256-DGLod05gmDzItPOBaGc2X/oMXSzvH932Wa44R+DUt/U=";
hash = "sha256-7ciI8KgkC1NRYP8bFW5RnZ2oLXaCuPHQBd2tvgQ+YO8=";
};
vendorHash = null;

8
pkgs/applications/networking/cluster/terraform-compliance/default.nix
View File

@ -5,20 +5,21 @@
python3.pkgs.buildPythonApplication rec {
pname = "terraform-compliance";
version = "1.3.34";
version = "1.3.43";
format = "setuptools";
src = fetchFromGitHub {
owner = "terraform-compliance";
repo = "cli";
rev = "refs/tags/${version}";
sha256 = "sha256-1TFLpBwkpMMdiJJfVvDXlJg4SXWQ8VV605wMFGU+InQ=";
sha256 = "sha256-Otz0jXSqqg8u8jVnqHTpPW/oyb+Qq2NywgxYPtIAKEc=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "IPython==7.16.1" "IPython" \
--replace "diskcache==5.1.0" "diskcache>=5.1.0"
--replace "diskcache==5.1.0" "diskcache>=5.1.0" \
--replace "radish-bdd==0.13.1" "radish-bdd" \
'';
propagatedBuildInputs = with python3.pkgs; [
@ -33,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
netaddr
radish-bdd
semver
orjson
];
nativeCheckInputs = with python3.pkgs; [

4
pkgs/applications/networking/instant-messengers/alfaview/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "alfaview";
version = "8.72.0";
version = "9.0.3";
src = fetchurl {
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
sha256 = "sha256-8oc3Wy/jI/GKbTnv7IV6q159WmMZSGedMh5EXvf7ZR0=";
sha256 = "sha256-Mmw4wWjU1Fr2dqonD3Vin8m6VX2dfDXbMDl+lTT4YT4=";
};
nativeBuildInputs = [

6
pkgs/applications/networking/juju/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
version = "3.2.0";
version = "3.2.2";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
sha256 = "sha256-wm6yWxGFQBlNtFfL1PnUuljy6ODOboiyND4cqPjl1nM=";
sha256 = "sha256-ZmMOQCKQWtzB2O6CNZTRhhj7gkpRRXY9ILN2KdSQoWk=";
};
vendorHash = "sha256-ll0qm0noD1Zox8uOlp2Rr/sFFzQlJlpss4Ot3LQn/g4=";
vendorHash = "sha256-rqf5nAXwcW6lm7sidEcxMqatT4KPju4Seo1/Awse5Zs=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;

6
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -11,13 +11,13 @@ assert trackerSearch -> (python3 != null);
mkDerivation rec {
pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox";
version = "4.5.4";
version = "4.5.5";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qBittorrent";
rev = "release-${version}";
hash = "sha256-c/ZJ83kxxFo/iI7Tjo3ZY0/vmVanjoJXBOu8XTnFm+Q=";
hash = "sha256-rWv+KGw+3385GOKK4MvoSP0CepotUZELiDVFpyDf+9k=";
};
enableParallelBuilding = true;
@ -53,6 +53,6 @@ mkDerivation rec {
changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ Anton-Latukha ];
maintainers = with maintainers; [ Anton-Latukha kashw2 ];
};
}

4
pkgs/applications/networking/p2p/transmission/4.nix
View File

@ -39,13 +39,13 @@
stdenv.mkDerivation rec {
pname = "transmission";
version = "4.0.3";
version = "4.0.4";
src = fetchFromGitHub {
owner = "transmission";
repo = "transmission";
rev = version;
hash = "sha256-P7omd49xLmReo9Zrg0liO1msUVzCa5CxH7PGmH4oPzg=";
hash = "sha256-Sz3+5VvfOgET1aiormEnBOrF+yN79tiSQvjLAoGqTLw=";
fetchSubmodules = true;
};

13
pkgs/applications/networking/p2p/tremc/default.nix
View File

@ -12,22 +12,22 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "tremc";
version = "0.9.2";
version = "0.9.3";
format = "other";
src = fetchFromGitHub {
owner = "tremc";
repo = pname;
rev = version;
sha256 = "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5";
hash = "sha256-219rntmetmj1JFG+4NyYMFTWmrHKJL7fnLoMIvnTP4Y=";
};
patches = [
# Remove when version >0.9.2 is released
# Remove when tremc > 0.9.3 is released
(fetchpatch {
url = "https://github.com/tremc/tremc/commit/bdffff2bd76186a4e3488b83f719fc7f7e3362b6.patch";
sha256 = "1zip2skh22v0yyv2hmszxn5jshp9m1jpw0fsyfvmqfxzq7m3czy5";
name = "replace-decodestring-with-decodebytes.patch";
url = "https://github.com/tremc/tremc/commit/a8aaf9a6728a9ef3d8f13b3603456b0086122891.patch";
hash = "sha256-+HYdWTbcpvZqjshdHLZ+Svmr6U/aKFc3sy0aka6rn/A=";
name = "support-transmission-4.patch";
})
];
@ -56,5 +56,6 @@ python3Packages.buildPythonApplication rec {
description = "Curses interface for transmission";
homepage = "https://github.com/tremc/tremc";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ kashw2 ];
};
}

12
pkgs/applications/networking/scaleft/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, rpmextract, patchelf, bash }:
{ lib, stdenv, fetchurl, rpmextract, patchelf, bash, testers, scaleft }:
stdenv.mkDerivation rec {
pname = "scaleft";
version = "1.45.4";
version = "1.67.4";
src =
fetchurl {
url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm";
sha256 = "1yskybjba9ljy1wazddgrm7a4cc72i1xbk7sxnjpcq4hdy3b50l0";
sha256 = "kRCShTMKf5qKFth/8H8XHLj12YIVQ9G5f2MvVJRtyDs=";
};
nativeBuildInputs = [ patchelf rpmextract ];
@ -31,6 +31,12 @@ stdenv.mkDerivation rec {
patchShebangs $out
'';
passthru.tests.version = testers.testVersion {
package = scaleft;
command = "sft -v";
version = "sft version ${version}";
};
meta = with lib; {
description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services";
homepage = "https://www.scaleft.com";

6
pkgs/applications/science/logic/egglog/default.nix
View File

@ -5,13 +5,13 @@
rustPlatform.buildRustPackage {
pname = "egglog";
version = "unstable-2023-08-23";
version = "unstable-2023-08-29";
src = fetchFromGitHub {
owner = "egraphs-good";
repo = "egglog";
rev = "9e530381961a59524f2bbacd89973575b4e036d8";
hash = "sha256-xzfa1Z7ibSO4D5zpprC7heaswA7Be5Qmb81XoDwANqw=";
rev = "c83fc750878755eb610a314da90f9273b3bfe25d";
hash = "sha256-bo3LU7WQ7WWnyL4EVOpzxxSFioXTozCSQFIFXyoxKLg=";
};
cargoLock = {

49
pkgs/applications/version-management/gitnr/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libxkbcommon
, openssl
, stdenv
, darwin
, wayland
}:
rustPlatform.buildRustPackage rec {
pname = "gitnr";
version = "0.1.0";
src = fetchFromGitHub {
owner = "reemus-dev";
repo = "gitnr";
rev = "v${version}";
hash = "sha256-5HZT/e53e2dUMFnT+4a5GJk3JqJu5+62yxrsnNfSqD8=";
};
cargoHash = "sha256-rO8qHa+GI76s5CN52aMa58W8ERuTWQtQ96jpLbXKzOs=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
] ++ lib.optionals stdenv.isLinux [
libxkbcommon
wayland
];
# requires internet access
doCheck = false;
meta = with lib; {
description = "Create `.gitignore` files using one or more templates from TopTal, GitHub or your own collection";
homepage = "https://github.com/reemus-dev/gitnr";
changelog = "https://github.com/reemus-dev/gitnr/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "gitnr";
};
}

14
pkgs/applications/version-management/transcrypt/default.nix
View File

@ -1,21 +1,19 @@
{ lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }:
{ lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk, testers, transcrypt }:
stdenv.mkDerivation rec {
pname = "transcrypt";
version = "1.1.0";
version = "2.2.3";
src = fetchFromGitHub {
owner = "elasticdog";
repo = "transcrypt";
rev = "v${version}";
sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";
sha256 = "+B8CYHDneDd0GwiTwQK6YVScDMKao2JXFpGk9PY6/EE=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ git openssl coreutils util-linux gnugrep gnused gawk ];
patches = [ ./helper-scripts_depspathprefix.patch ];
installPhase = ''
install -m 755 -D transcrypt $out/bin/transcrypt
install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1
@ -32,6 +30,12 @@ stdenv.mkDerivation rec {
chmod +x $out/bin/transcrypt-depspathprefix
'';
passthru.tests.version = testers.testVersion {
package = transcrypt;
command = "transcrypt --version";
version = "transcrypt ${version}";
};
meta = with lib; {
description = "Transparently encrypt files within a Git repository";
longDescription = ''

37
pkgs/applications/version-management/transcrypt/helper-scripts_depspathprefix.patch
View File

@ -1,37 +0,0 @@
diff --git a/transcrypt b/transcrypt
index a0b562d..7888f5d 100755
--- a/transcrypt
+++ b/transcrypt
@@ -278,6 +278,7 @@ save_helper_scripts() {
cat <<-'EOF' > "${GIT_DIR}/crypt/clean"
#!/usr/bin/env bash
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
filename=$1
# ignore empty files
if [[ -s $filename ]]; then
@@ -300,6 +301,7 @@ save_helper_scripts() {
cat <<-'EOF' > "${GIT_DIR}/crypt/smudge"
#!/usr/bin/env bash
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
tempfile=$(mktemp 2> /dev/null || mktemp -t tmp)
trap 'rm -f "$tempfile"' EXIT
cipher=$(git config --get --local transcrypt.cipher)
@@ -309,6 +311,7 @@ save_helper_scripts() {
cat <<-'EOF' > "${GIT_DIR}/crypt/textconv"
#!/usr/bin/env bash
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
filename=$1
# ignore empty files
if [[ -s $filename ]]; then
@@ -351,7 +354,7 @@ save_configuration() {
git config merge.renormalize 'true'
# add a git alias for listing encrypted files
- git config alias.ls-crypt "!git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
+ git config alias.ls-crypt "!PATH=\"\$(transcrypt-depspathprefix 2>/dev/null)\$PATH\"; git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
}
# display the current configuration settings

4
pkgs/applications/video/devede/default.nix
View File

@ -5,14 +5,14 @@ let
inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools;
in buildPythonApplication rec {
pname = "devede";
version = "4.16.0";
version = "4.17.0";
namePrefix = "";
src = fetchFromGitLab {
owner = "rastersoft";
repo = "devedeng";
rev = version;
sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg";
sha256 = "sha256-CdntdD5DRA/eXTBRBRszkbYFeFxj+0odb8XHkAFdobU=";
};
nativeBuildInputs = [

4
pkgs/applications/video/jftui/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "jftui";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "Aanok";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dkMJn5ZsM1pfHvSsj0kHsP17PqbR+yrRYX62RxoxwwM=";
sha256 = "sha256-w5DK9B3D3/9VExAQktigVPim33VfpoQPHUZefAS3pWQ=";
};
nativeBuildInputs = [

14
pkgs/applications/video/lightworks/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSEnv
, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU
, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsa-lib, udev, libjack2
, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid
, alsa-lib, udev, libjack2, freetype, libva, libvdpau
}:
let
fullPath = lib.makeLibraryPath [
@ -20,18 +21,21 @@ let
alsa-lib
libjack2
udev
freetype
libva
libvdpau
];
lightworks = stdenv.mkDerivation rec {
version = "2022.1.1";
rev = "132926";
version = "2023.1";
rev = "141770";
pname = "lightworks";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://cdn.lwks.com/releases/${version}/lightworks_${version}_r${rev}.deb";
sha256 = "sha256-f2lxfv0sFESpDnINDKlfVcR0pySAueMeOMbkgBWzz7Q=";
sha256 = "sha256-QRbghrZQbprl2wUBKNMJVBeW0Ek6nWvo4006jyPYIBg=";
}
else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
@ -87,7 +91,7 @@ in buildFHSEnv {
homepage = "https://www.lwks.com/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ antonxy vojta001 ];
maintainers = with lib.maintainers; [ antonxy vojta001 kashw2 ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/applications/window-managers/i3/status-rust.nix
View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.31.9";
version = "0.32.0";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-PldCtV979mJSgQtMHx/gfhKrsBByiywLMO9LjyggvCA=";
hash = "sha256-cBcmNeGfVPCdVvXkMe2Vx3zUaWGE1vMSfwmNPapTwBo=";
};
cargoHash = "sha256-wCBg3qYy9wrsM4eJ1FV4OEI+ZwkbXn5jQZ/m7KMgHCc=";
cargoHash = "sha256-cD4QFrDgwwJIrpSYmoale+2p0xD2JMHcIcuc4sRH4wI=";
nativeBuildInputs = [ pkg-config makeWrapper ];

1
pkgs/applications/window-managers/maui-shell/default.nix
View File

@ -83,5 +83,6 @@ mkDerivation rec {
homepage = "https://github.com/Nitrux/maui-shell";
license = licenses.lgpl3;
maintainers = with maintainers; [ onny ];
platforms = platforms.linux;
};
}

3
pkgs/build-support/trivial-builders/default.nix
View File

@ -336,10 +336,11 @@ rec {
{ name
, text
, runtimeInputs ? [ ]
, meta ? { }
, checkPhase ? null
}:
writeTextFile {
inherit name;
inherit name meta;
executable = true;
destination = "/bin/${name}";
allowSubstitutes = true;

4
pkgs/data/icons/papirus-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "papirus-icon-theme";
version = "20230801";
version = "20230901";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
hash = "sha256-sEfJKlGdogM0rOqg3Buytgd7vm0zEkmkSR343ZgGI2I=";
hash = "sha256-FcTNZgCdPlYjpheA3PfZBR3apOkDi4+RafQtXdqchGI=";
};
nativeBuildInputs = [ gtk3 papirus-folders ];

4
pkgs/data/misc/dbip-country-lite/default.nix
View File

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbip-country-lite";
version = "2023-08";
version = "2023-09";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
hash = "sha256-+IQSHgfVZ2codxkOKwi23CLjm+rYDZOQq5EWJs0OLiQ=";
hash = "sha256-3Mapa4qxUEMGUeqzoyzhatL43l1PPmw+Aye4bX92CAA=";
};
dontUnpack = true;

4
pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
View File

@ -3,8 +3,10 @@
, fetchFromGitHub
, cmake
, kwindowsystem
, libexif
, libfm-qt
, lxqt-qtplugin
, menu-cache
, qtx11extras
, gitUpdater
, extraQtStyles ? []
@ -27,8 +29,10 @@ mkDerivation rec {
buildInputs = [
kwindowsystem
libexif
libfm-qt
lxqt-qtplugin
menu-cache
qtx11extras
]
++ extraQtStyles;

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "cyber";
version = "unstable-2023-08-24";
version = "unstable-2023-09-01";
src = fetchFromGitHub {
owner = "fubark";
repo = "cyber";
rev = "be76bc13590285cffa502c3c97470a80ff1f27bd";
hash = "sha256-DhGp+vHz+FfF9ZGopQshF2t0Q4/yeN7CEpIlPliPBgQ=";
rev = "1dae891be5ca1e64ad8ab9d60be0b30e1ef28439";
hash = "sha256-5GCIdk6XCJIXZLFsNMzo15Qhtj7zd/DOcARe8GXF2lc=";
};
nativeBuildInputs = [

50
pkgs/development/libraries/hax11/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ lib
, multiStdenv
, fetchFromGitHub
, libX11
, libXxf86vm
, xorgproto
, unstableGitUpdater
}:
multiStdenv.mkDerivation (finalAttrs: {
pname = "hax11";
version = "unstable-2022-12-10";
src = fetchFromGitHub {
owner = "CyberShadow";
repo = "hax11";
rev = "dce456f2b209f1be18d91064be257b66b69b7d9f";
hash = "sha256-e3jYvbglQ5Nzoz/B+WEkCw48Tu+i73t+PNq51mjzmjY=";
};
outputs = [ "out" "doc" ];
buildInputs = [
libX11
libXxf86vm
xorgproto
];
installPhase = ''
runHook preInstall
install -Dm644 lib32/hax11.so -t $out/lib32/
install -Dm644 lib64/hax11.so -t $out/lib64/
install -Dm644 README.md -t $doc/share/doc/hax11/
runHook postInstall
'';
passthru = {
updateScript = unstableGitUpdater { };
};
meta = {
homepage = "https://github.com/CyberShadow/hax11";
description = "Hackbrary to Hook and Augment X11 protocol calls";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
})

4
pkgs/development/libraries/nghttp3/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "nghttp3";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "v${version}";
hash = "sha256-ypoq+wXBaA5p5ZjRC8SNn9jHcMHHLJZLDLNOFMoua0g=";
hash = "sha256-DqqT8rgGlbV0upe0E37AR8bk3SIsoyCXt8xJzIkz9xc=";
};
outputs = [ "out" "dev" "doc" ];

4
pkgs/development/libraries/tevent/default.nix
View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "tevent";
version = "0.14.1";
version = "0.15.0";
src = fetchurl {
url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
sha256 = "sha256-74X8qoD/0jUQNrpLNHYw/vKhrD2pZKfxggRmutA80A0=";
sha256 = "sha256-ZiqfJ3KBvPUGtrwKC6oD5EpiIpUW7jS8xwOguCqkaQU=";
};
nativeBuildInputs = [

8
pkgs/development/python-modules/tpm2-pytss/default.nix
View File

@ -63,6 +63,14 @@ buildPythonPackage rec {
sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py
'';
# Hardening has to be disabled
# due to pycparsing handling it poorly.
# See https://github.com/NixOS/nixpkgs/issues/252023
# for more details.
hardeningDisable = [
"fortify"
];
nativeBuildInputs = [
cffi
pkgconfig # this is the Python module

4
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }:
stdenvNoCC.mkDerivation rec {
version = "10.12.2";
version = "10.12.3";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "sha256-0vv04vPROCDjFo/mqkH4GXKEB8PvbU7qryGu+mzmShM=";
sha256 = "sha256-drJO3sZlh2G9f80cvPD41YjhHZt74lmV9bSIhUDrTKo=";
};
nativeBuildInputs = [ makeBinaryWrapper ];

6
pkgs/development/tools/build-managers/sbt/default.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sbt";
version = "1.9.3";
version = "1.9.4";
src = fetchurl {
url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
hash = "sha256-nM+UTsyzPGaDDvn/nUbDQCdBzcbYgyUQRSYdsz50joI=";
hash = "sha256-aL0CJcKdo5ss+yW2dwqRn2nkdiG7JQESFSdC1/KauHA=";
};
postPatch = ''
@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
binaryNativeCode
];
description = "A build tool for Scala, Java and more";
maintainers = with maintainers; [ nequissimus ];
maintainers = with maintainers; [ nequissimus kashw2 ];
platforms = platforms.unix;
};
})

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k6";
version = "0.45.1";
version = "0.46.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TeZ4nAU5SorIrGeQ1zM8YWcDWPt3F2rhPLoKx2Vvl+Q=";
sha256 = "sha256-4ucnq/FTvdDpzf1RWRY+U5A+BCaaQWMTEaZtmU0JD90=";
};
subPackages = [ "./" ];
@ -34,6 +34,6 @@ buildGoModule rec {
homepage = "https://k6.io/";
changelog = "https://github.com/grafana/k6/releases/tag/v${version}";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ offline bryanasdev000 ];
maintainers = with maintainers; [ offline bryanasdev000 kashw2 ];
};
}

11
pkgs/development/tools/misc/complgen/default.nix
View File

@ -3,22 +3,23 @@
, fetchFromGitHub
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "complgen";
version = "unstable-2023-08-22";
version = "0.1.2";
src = fetchFromGitHub {
owner = "adaszko";
repo = "complgen";
rev = "8c9b9c51f3465c6d858e15f442b63e94b2f5ed1b";
hash = "sha256-oYRaH3FbAFY7QujgFpUDD8gVam4+Gm9qROxCTMYBg9I=";
rev = "v${version}";
hash = "sha256-x6r6sLdPIpf1mLRu8gT94fGoaCtnjpUIlEbMt6uSBR8=";
};
cargoHash = "sha256-LHnIIkQLuY+A09qhxSiyLmUpX/dES7xBE5m1uRPI0i0=";
cargoHash = "sha256-jljrT8OymXx8OKxWU3rE52Nw5Fw9XFmgXaOMxdzMTe4=";
meta = with lib; {
description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar";
homepage = "https://github.com/adaszko/complgen";
changelog = "https://github.com/adaszko/complgen/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
};

6
pkgs/development/tools/misc/ztags/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation {
pname = "ztags";
version = "unstable-2023-08-03";
version = "unstable-2023-08-29";
src = fetchFromGitHub {
owner = "gpanders";
repo = "ztags";
rev = "6ef039047f6580772c5ff97e8770d919dc07a4fa";
hash = "sha256-WuDEHzNU3I4VPHEAkRdIUE5LPbQEKbUnITdFutGV58Y=";
rev = "87dbc4ba7993fa1537ddce942c6ce4cf90ce0809";
hash = "sha256-FZZZnTmz4mxhiRXs16A41fz0WYIg6oGM7xj2cECRkrM=";
};
nativeBuildInputs = [

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "revive";
version = "1.3.2";
version = "1.3.3";
src = fetchFromGitHub {
owner = "mgechev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zv9N5Sw23SalP2keII/WC71uhGU+nr+DG3GJcbUwonQ=";
sha256 = "sha256-+ac/Sq+4Ox/R3N7cMM+QADWf9jZJwYJEOvHDdkB5X9Q=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -18,7 +18,7 @@ buildGoModule rec {
rm -rf $out/.git
'';
};
vendorHash = "sha256-7VZcZR04JyNa1a4CpLbE7ig+orML3fhdeBOZGTNACKc=";
vendorHash = "sha256-00w07PgPf+4eclxx6/fY9SbmOEU8FPxIOmg/i9NBboM=";
ldflags = [
"-s"
@ -35,7 +35,7 @@ buildGoModule rec {
# The following tests fail when built by nix:
#
# $ nix log /nix/store/build-revive.1.3.2.drv | grep FAIL
# $ nix log /nix/store/build-revive.1.3.3.drv | grep FAIL
#
# --- FAIL: TestAll (0.01s)
# --- FAIL: TestTimeEqual (0.00s)

243
pkgs/development/tools/rust/cargo-component/Cargo.lock generated
View File

@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
version = "0.20.0"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
dependencies = [
"gimli",
]
@ -31,9 +31,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
version = "1.0.4"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
dependencies = [
"memchr",
]
@ -55,24 +55,23 @@ dependencies = [
[[package]]
name = "anstream"
version = "0.3.2"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is-terminal",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.1"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
[[package]]
name = "anstyle-parse"
@ -94,9 +93,9 @@ dependencies = [
[[package]]
name = "anstyle-wincon"
version = "1.0.2"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
dependencies = [
"anstyle",
"windows-sys",
@ -322,9 +321,9 @@ dependencies = [
[[package]]
name = "backtrace"
version = "0.3.68"
version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
dependencies = [
"addr2line",
"cc",
@ -349,9 +348,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.21.2"
version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
[[package]]
name = "base64ct"
@ -419,9 +418,9 @@ dependencies = [
[[package]]
name = "bstr"
version = "1.6.0"
version = "1.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"
dependencies = [
"memchr",
"regex-automata",
@ -488,7 +487,7 @@ dependencies = [
"warg-protocol",
"warg-server",
"wasm-metadata",
"wasmparser 0.111.0",
"wasmparser 0.112.0",
"wat",
"wit-bindgen-rust-lib",
"wit-component",
@ -583,15 +582,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.26"
version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8"
dependencies = [
"android-tzdata",
"iana-time-zone",
"num-traits",
"serde",
"winapi",
"windows-targets",
]
[[package]]
@ -605,9 +604,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.3.23"
version = "4.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3"
checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
dependencies = [
"clap_builder",
"clap_derive",
@ -616,9 +615,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.3.23"
version = "4.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98"
checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
dependencies = [
"anstream",
"anstyle",
@ -628,9 +627,9 @@ dependencies = [
[[package]]
name = "clap_derive"
version = "4.3.12"
version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
dependencies = [
"heck",
"proc-macro2",
@ -640,9 +639,9 @@ dependencies = [
[[package]]
name = "clap_lex"
version = "0.5.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
[[package]]
name = "colorchoice"
@ -874,9 +873,9 @@ dependencies = [
[[package]]
name = "encoding_rs"
version = "0.8.32"
version = "0.8.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
dependencies = [
"cfg-if",
]
@ -923,9 +922,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
version = "0.3.2"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
dependencies = [
"errno-dragonfly",
"libc",
@ -1146,9 +1145,9 @@ dependencies = [
[[package]]
name = "gimli"
version = "0.27.3"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]]
name = "group"
@ -1439,7 +1438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi",
"rustix 0.38.8",
"rustix 0.38.10",
"windows-sys",
]
@ -1586,9 +1585,9 @@ checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef"
[[package]]
name = "memchr"
version = "2.5.0"
version = "2.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
[[package]]
name = "memoffset"
@ -1684,15 +1683,14 @@ dependencies = [
[[package]]
name = "nix"
version = "0.26.2"
version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
dependencies = [
"bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset",
"static_assertions",
]
[[package]]
@ -1736,9 +1734,9 @@ dependencies = [
[[package]]
name = "num-bigint"
version = "0.4.3"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
dependencies = [
"autocfg",
"num-integer",
@ -1808,9 +1806,9 @@ dependencies = [
[[package]]
name = "object"
version = "0.31.1"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
dependencies = [
"memchr",
]
@ -1829,11 +1827,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
version = "0.10.56"
version = "0.10.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e"
checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.0",
"cfg-if",
"foreign-types",
"libc",
@ -1861,9 +1859,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
version = "0.9.91"
version = "0.9.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac"
checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
dependencies = [
"cc",
"libc",
@ -2036,9 +2034,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
version = "0.2.12"
version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "pin-utils"
@ -2210,9 +2208,9 @@ dependencies = [
[[package]]
name = "prost-reflect"
version = "0.11.4"
version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "000e1e05ebf7b26e1eba298e66fe4eee6eb19c567d0ffb35e0dd34231cdac4c8"
checksum = "6b823de344848e011658ac981009100818b322421676740546f8b52ed5249428"
dependencies = [
"logos",
"miette",
@ -2338,25 +2336,25 @@ dependencies = [
[[package]]
name = "regex"
version = "1.9.3"
version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata",
"regex-syntax 0.7.4",
"regex-syntax 0.7.5",
]
[[package]]
name = "regex-automata"
version = "0.3.6"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax 0.7.4",
"regex-syntax 0.7.5",
]
[[package]]
@ -2367,17 +2365,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
version = "0.7.4"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
[[package]]
name = "reqwest"
version = "0.11.19"
version = "0.11.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3"
checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
dependencies = [
"base64 0.21.2",
"base64 0.21.3",
"bytes",
"encoding_rs",
"futures-core",
@ -2463,9 +2461,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.8"
version = "0.38.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964"
dependencies = [
"bitflags 2.4.0",
"errno",
@ -2586,18 +2584,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.185"
version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31"
checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.185"
version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec"
checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
@ -2663,7 +2661,7 @@ version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
dependencies = [
"base64 0.21.2",
"base64 0.21.3",
"chrono",
"hex",
"indexmap 1.9.3",
@ -2748,9 +2746,9 @@ dependencies = [
[[package]]
name = "slab"
version = "0.4.8"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
dependencies = [
"autocfg",
]
@ -2855,7 +2853,7 @@ dependencies = [
"cfg-if",
"fastrand 2.0.0",
"redox_syscall 0.3.5",
"rustix 0.38.8",
"rustix 0.38.10",
"windows-sys",
]
@ -2906,9 +2904,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.25"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
dependencies = [
"deranged",
"itoa",
@ -2925,9 +2923,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
version = "0.2.11"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
dependencies = [
"time-core",
]
@ -3219,9 +3217,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "url"
version = "2.4.0"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
dependencies = [
"form_urlencoded",
"idna",
@ -3290,7 +3288,7 @@ dependencies = [
[[package]]
name = "warg-api"
version = "0.1.0"
source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49"
source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294"
dependencies = [
"itertools 0.11.0",
"serde",
@ -3303,7 +3301,7 @@ dependencies = [
[[package]]
name = "warg-client"
version = "0.1.0"
source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49"
source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294"
dependencies = [
"anyhow",
"async-trait",
@ -3336,10 +3334,10 @@ dependencies = [
[[package]]
name = "warg-crypto"
version = "0.1.0"
source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49"
source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294"
dependencies = [
"anyhow",
"base64 0.21.2",
"base64 0.21.3",
"digest",
"hex",
"leb128",
@ -3356,7 +3354,7 @@ dependencies = [
[[package]]
name = "warg-protobuf"
version = "0.1.0"
source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49"
source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294"
dependencies = [
"anyhow",
"pbjson",
@ -3374,10 +3372,10 @@ dependencies = [
[[package]]
name = "warg-protocol"
version = "0.1.0"
source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49"
source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294"
dependencies = [
"anyhow",
"base64 0.21.2",
"base64 0.21.3",
"hex",
"indexmap 2.0.0",
"pbjson-types",
@ -3396,7 +3394,7 @@ dependencies = [
[[package]]
name = "warg-server"
version = "0.1.0"
source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49"
source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294"
dependencies = [
"anyhow",
"axum",
@ -3426,7 +3424,7 @@ dependencies = [
[[package]]
name = "warg-transparency"
version = "0.1.0"
source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49"
source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294"
dependencies = [
"anyhow",
"prost",
@ -3509,18 +3507,18 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "wasm-encoder"
version = "0.31.1"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16"
checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7"
dependencies = [
"leb128",
]
[[package]]
name = "wasm-metadata"
version = "0.10.2"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ac8d3bcbbb5081489f35966b86d127596e9cdacfb3824b79f43344662226178"
checksum = "08dc59d1fa569150851542143ca79438ca56845ccb31696c70225c638e063471"
dependencies = [
"anyhow",
"indexmap 2.0.0",
@ -3528,7 +3526,7 @@ dependencies = [
"serde_json",
"spdx",
"wasm-encoder",
"wasmparser 0.111.0",
"wasmparser 0.112.0",
]
[[package]]
@ -3556,9 +3554,9 @@ dependencies = [
[[package]]
name = "wasmparser"
version = "0.111.0"
version = "0.112.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad71036aada3f6b09251546e97e4f4f176dd6b41cf6fa55e7e0f65e86aec319a"
checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf"
dependencies = [
"indexmap 2.0.0",
"semver",
@ -3566,9 +3564,9 @@ dependencies = [
[[package]]
name = "wast"
version = "63.0.0"
version = "64.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a"
checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc"
dependencies = [
"leb128",
"memchr",
@ -3578,9 +3576,9 @@ dependencies = [
[[package]]
name = "wat"
version = "1.0.70"
version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bdc306c2c4c2f2bf2ba69e083731d0d2a77437fc6a350a19db139636e7e416c"
checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6"
dependencies = [
"wast",
]
@ -3714,9 +3712,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winnow"
version = "0.5.14"
version = "0.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97"
checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
dependencies = [
"memchr",
]
@ -3759,15 +3757,16 @@ dependencies = [
"warg-protocol",
"warg-server",
"wasm-metadata",
"wasmparser 0.111.0",
"wasmparser 0.112.0",
"wit-component",
"wit-parser",
]
[[package]]
name = "wit-bindgen"
version = "0.10.0"
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8a3e8e965dc50e6eb4410d9a11720719fadc6a1713803ea5f3be390b81c8279"
dependencies = [
"bitflags 2.4.0",
"wit-bindgen-rust-macro",
@ -3775,8 +3774,9 @@ dependencies = [
[[package]]
name = "wit-bindgen-core"
version = "0.10.0"
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77255512565dfbd0b61de466e854918041d1da53c7bc049d6188c6e02643dc1e"
dependencies = [
"anyhow",
"wit-component",
@ -3785,8 +3785,9 @@ dependencies = [
[[package]]
name = "wit-bindgen-rust"
version = "0.10.0"
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "399c60e6ea8598d1380e792f13d557007834f0fb799fea6503408cbc5debb4ae"
dependencies = [
"anyhow",
"heck",
@ -3798,8 +3799,9 @@ dependencies = [
[[package]]
name = "wit-bindgen-rust-lib"
version = "0.10.0"
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd9fb7a43c7dc28b0b727d6ae01bf369981229b7539e768fba2b7a4df13feeeb"
dependencies = [
"heck",
"wit-bindgen-core",
@ -3807,8 +3809,9 @@ dependencies = [
[[package]]
name = "wit-bindgen-rust-macro"
version = "0.10.0"
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44cea5ed784da06da0e55836a6c160e7502dbe28771c2368a595e8606243bf22"
dependencies = [
"anyhow",
"proc-macro2",
@ -3821,25 +3824,27 @@ dependencies = [
[[package]]
name = "wit-component"
version = "0.13.2"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a9eb6179c5a26adc38fa5a22e263e7a3812c6777ca2e75d1717fd3789f82b64"
checksum = "66d9f2d16dd55d1a372dcfd4b7a466ea876682a5a3cb97e71ec9eef04affa876"
dependencies = [
"anyhow",
"bitflags 2.4.0",
"indexmap 2.0.0",
"log",
"serde",
"serde_json",
"wasm-encoder",
"wasm-metadata",
"wasmparser 0.111.0",
"wasmparser 0.112.0",
"wit-parser",
]
[[package]]
name = "wit-parser"
version = "0.10.0"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8d6926af931f285e206ea71f9b67681f00a65d79097f81da7f9f285de006ba2"
checksum = "61e8b849bea13cc2315426b16efe6eb6813466d78f5fde69b0bb150c9c40e0dc"
dependencies = [
"anyhow",
"id-arena",

9
pkgs/development/tools/rust/cargo-component/default.nix
View File

@ -9,20 +9,19 @@
rustPlatform.buildRustPackage {
pname = "cargo-component";
version = "unstable-2023-08-24";
version = "unstable-2023-08-31";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "cargo-component";
rev = "a4ee64625a5248234397a9c7c2a7513bb025b030";
hash = "sha256-7fnzIzWb2f1tJfH3mLMesQtNCy4Zg7I/T+lGiorifY8=";
rev = "e57d1d1405ed2d76f1f3d8647480dea700379ff8";
hash = "sha256-mN0GDyQemk71im074laeRDzWpVRUWJUFaRJenJGDwLs=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc=";
"wit-bindgen-0.10.0" = "sha256-/QZIIbUzDFUb5wAGoKFg1BbgNUEmP06ZJKVzhwlPecE=";
"warg-api-0.1.0" = "sha256-kzxvGZUMUOueR8t1tiCpGJlPxqEHQMb1m1jhPYoatbA=";
};
};

10
pkgs/development/tools/rust/cargo-generate/default.nix
View File

@ -2,7 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2
, libgit2_1_6
, openssl
, stdenv
, darwin
@ -11,20 +11,20 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
version = "0.18.3";
version = "0.18.4";
src = fetchFromGitHub {
owner = "cargo-generate";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "sha256-Prue55oe3+NeiOiOYdr41sRqc6WvAVKC9nHD0a6mvrc=";
sha256 = "sha256-u4LEE3fDYneKhNU38VeVNvqcbDO0pws6yldgcvwSv6M=";
};
cargoSha256 = "sha256-TcJ8DeplbBOx3utdc67xkUg5Z4PYe/lnG+k/X5Zg0FQ=";
cargoSha256 = "sha256-pgffaqHWnm3RBE9TGbpRJX35BFpXW/na9wmad9eyCXw=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
buildInputs = [ libgit2_1_6 openssl ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];

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

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.16.9";
version = "1.16.10";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-aFP4q3Cv7ESqgpBoYW70Fsl2GGEIX8bEl3/sEG6HGpM=";
hash = "sha256-YFHy7oD0phUJTKFPnRLm5S3p4tE9MEHe3HnhuyyIwIc=";
};
cargoHash = "sha256-mUcvKYe2SiuEWKXGG1jiF4YtVB72HlGc7HDHhgUhLaU=";
cargoHash = "sha256-oQ1yMhHwcMHk7+nj4eqL3Ws0buyh9cGXVdNe4zNX9OI=";
meta = with lib; {
description = "Source code spell checker";

442
pkgs/development/tools/wasmi/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/tools/wasmi/default.nix
View File

@ -5,13 +5,13 @@
rustPlatform.buildRustPackage rec {
pname = "wasmi";
version = "0.30.0";
version = "0.31.0";
src = fetchFromGitHub {
owner = "paritytech";
repo = "wasmi";
rev = "v${version}";
hash = "sha256-0G/K61JP4SehhP+wD9uwCU1GRjzJdz4fkePv+IiqUY4=";
hash = "sha256-chLWrZ+OLUTSFmTu+qKpjApXDmJFhS68N2RKjaql75U=";
fetchSubmodules = true;
};

9
pkgs/development/web/insomnia/default.nix
View File

@ -16,12 +16,11 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
version = "2023.5.5";
version = "2023.5.7";
src = fetchurl {
url =
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
sha256 = "sha256-/SrSpkfF3IrLl6BC4UknsTDraqN8uFKrKQSzQpBaRLY=";
url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
sha256 = "sha256-XB8ktjF6VWj57whbXC0iwH3WpuMkGnRZCCdx86Mj2ZI=";
};
nativeBuildInputs = [
@ -91,7 +90,7 @@ in stdenv.mkDerivation rec {
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ markus1189 babariviere ];
maintainers = with maintainers; [ markus1189 babariviere kashw2 ];
};
}

4
pkgs/misc/calaos/installer/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "calaos_installer";
version = "3.5";
version = "3.11";
src = fetchFromGitHub {
owner = "calaos";
repo = "calaos_installer";
rev = "v${version}";
sha256 = "hx7XVF2iueKFR67U0EvSK1vYZnJBnuOpUOkSjx7h1XY=";
sha256 = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
};
nativeBuildInputs = [ qmake qttools ];

28
pkgs/servers/apache-airflow/package.json
View File

@ -7,7 +7,7 @@
"dev": "NODE_ENV=development webpack --watch --progress --devtool eval-cheap-source-map --mode development",
"prod": "NODE_ENV=production node --max_old_space_size=4096 ./node_modules/webpack/bin/webpack.js --mode production --progress",
"build": "NODE_ENV=production webpack --progress --mode production",
"lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx,.ts,.tsx . && tsc",
"lint": "eslint --ignore-path=.eslintignore --max-warnings=0 --ext .js,.jsx,.ts,.tsx . && tsc",
"lint:fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.jsx,.ts,.tsx . && tsc",
"format": "yarn prettier --write .",
"generate-api-types": "npx openapi-typescript \"../api_connexion/openapi/v1.yaml\" --output static/js/types/api-generated.ts && node alias-rest-types.js static/js/types/api-generated.ts"
@ -29,6 +29,18 @@
"database",
"flask"
],
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
@ -41,6 +53,7 @@
"@types/color": "^3.0.3",
"@types/react": "^18.0.12",
"@types/react-dom": "^18.0.5",
"@types/react-syntax-highlighter": "^15.5.6",
"@types/react-table": "^7.7.12",
"@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/parser": "^5.0.0",
@ -65,6 +78,7 @@
"file-loader": "^6.0.0",
"imports-loader": "^1.1.0",
"jest": "^27.3.1",
"jest-canvas-mock": "^2.5.1",
"mini-css-extract-plugin": "^1.6.2",
"moment": "^2.29.4",
"moment-locales-webpack-plugin": "^1.2.0",
@ -72,7 +86,7 @@
"openapi-typescript": "^5.4.1",
"prettier": "^2.8.4",
"style-loader": "^1.2.1",
"stylelint": "^13.6.1",
"stylelint": "^15.10.1",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-standard": "^20.0.0",
"terser-webpack-plugin": "<5.0.0",
@ -85,14 +99,12 @@
"webpack-manifest-plugin": "^4.0.0"
},
"dependencies": {
"@chakra-ui/react": "^2.2.0",
"@chakra-ui/react": "2.4.2",
"@emotion/cache": "^11.9.3",
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11",
"@visx/group": "^2.10.0",
"@visx/marker": "^2.12.2",
"@visx/shape": "^2.12.2",
"@visx/zoom": "^2.10.0",
"axios": "^0.26.0",
"bootstrap-3-typeahead": "^4.0.2",
"camelcase-keys": "^7.0.0",
@ -106,6 +118,7 @@
"dagre-d3": "^0.6.4",
"datatables.net": "^1.11.4",
"datatables.net-bs": "^1.11.4",
"echarts": "^5.4.2",
"elkjs": "^0.7.1",
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
"framer-motion": "^6.0.0",
@ -116,14 +129,15 @@
"nvd3": "^1.8.6",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-icons": "^4.3.1",
"react-icons": "^4.9.0",
"react-json-view": "^1.21.3",
"react-markdown": "^8.0.4",
"react-query": "^3.39.1",
"react-router-dom": "^6.3.0",
"react-syntax-highlighter": "^15.5.0",
"react-table": "^7.8.0",
"react-textarea-autosize": "^8.3.4",
"reactflow": "^11.4.0",
"reactflow": "^11.7.4",
"redoc": "^2.0.0-rc.72",
"remark-gfm": "^3.0.1",
"swagger-ui-dist": "4.1.3",

64
pkgs/servers/apache-airflow/providers.nix
View File

File diff suppressed because one or more lines are too long

28
pkgs/servers/apache-airflow/python-package.nix
View File

@ -26,6 +26,7 @@
, flask-session
, flask-wtf
, gitpython
, google-re2
, graphviz
, gunicorn
, httpx
@ -45,6 +46,8 @@
, mdit-py-plugins
, numpy
, openapi-spec-validator
, opentelemetry-api
, opentelemetry-exporter-otlp
, pandas
, pathspec
, pendulum
@ -58,6 +61,7 @@
, python-slugify
, python3-openid
, pythonOlder
, pythonRelaxDepsHook
, pyyaml
, rich
, rich-argparse
@ -82,7 +86,7 @@
, enabledProviders ? []
}:
let
version = "2.6.2";
version = "2.7.0";
airflow-src = fetchFromGitHub rec {
owner = "apache";
@ -91,7 +95,7 @@ let
# Download using the git protocol rather than using tarballs, because the
# GitHub archive tarballs don't appear to include tests
forceFetchGit = true;
hash = "sha256-ejZw71lMhfnqy4Ziha8/ufmX+SkOfopkeCskf02ZQgA=";
hash = "sha256-zB4PWcPkm+lat4tNfVld051RHlC1dW2EbgyoxDao52o=";
};
# airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
@ -167,6 +171,7 @@ buildPythonPackage rec {
flask-wtf
flask-login
gitpython
google-re2
graphviz
gunicorn
httpx
@ -185,6 +190,8 @@ buildPythonPackage rec {
mdit-py-plugins
numpy
openapi-spec-validator
opentelemetry-api
opentelemetry-exporter-otlp
pandas
pathspec
pendulum
@ -216,6 +223,7 @@ buildPythonPackage rec {
buildInputs = [
airflow-frontend
pythonRelaxDepsHook
];
nativeCheckInputs = [
@ -231,16 +239,22 @@ buildPythonPackage rec {
INSTALL_PROVIDERS_FROM_SOURCES = "true";
postPatch = ''
substituteInPlace setup.cfg \
--replace "colorlog>=4.0.2, <5.0" "colorlog" \
--replace "flask-appbuilder==4.3.0" "flask-appbuilder>=4.3.0" \
--replace "pathspec~=0.9.0" "pathspec"
# https://github.com/apache/airflow/issues/33854
substituteInPlace pyproject.toml \
--replace '[project]' $'[project]\nname = "apache-airflow"\nversion = "${version}"'
'' + lib.optionalString stdenv.isDarwin ''
# Fix failing test on Hydra
substituteInPlace airflow/utils/db.py \
--replace "/tmp/sqlite_default.db" "$TMPDIR/sqlite_default.db"
'';
pythonRelaxDeps = [
"colorlog"
"flask-appbuilder"
"opentelemetry-api"
"pathspec"
];
# allow for gunicorn processes to have access to Python packages
makeWrapperArgs = [
"--prefix PYTHONPATH : $PYTHONPATH"
@ -288,7 +302,7 @@ buildPythonPackage rec {
update-source-version ${pname} "$new_version"
# Update frontend
cd ./pkgs/development/python-modules/apache-airflow
cd ./pkgs/servers/apache-airflow
curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/yarn.lock
curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/package.json
yarn2nix > yarn.nix

3
pkgs/servers/apache-airflow/update-providers.py
View File

@ -21,6 +21,7 @@ PKG_PREFERENCES = {
"dnspython": "dnspython",
"elasticsearch-dsl": "elasticsearch-dsl",
"google-api-python-client": "google-api-python-client",
"protobuf": "protobuf",
"psycopg2-binary": "psycopg2",
"requests_toolbelt": "requests-toolbelt",
}
@ -46,7 +47,7 @@ def get_file_from_github(version: str, path: str):
def repository_root() -> Path:
return Path(os.path.dirname(sys.argv[0])) / "../../../.."
return Path(os.path.dirname(sys.argv[0])) / "../../.."
def dump_packages() -> Dict[str, Dict[str, str]]:

2447
pkgs/servers/apache-airflow/yarn.lock
View File

File diff suppressed because it is too large Load Diff

1968
pkgs/servers/apache-airflow/yarn.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/servers/dns/bind/default.nix
View File

@ -79,7 +79,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# TODO: investigate the aarch64-linux failures; see this and linked discussions:
# https://github.com/NixOS/nixpkgs/pull/192962
doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux) && !isi686;
doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux)
# https://gitlab.isc.org/isc-projects/bind9/-/issues/4269
&& !is32bit;
checkTarget = "unit";
checkInputs = [
cmocka

6
pkgs/servers/h2/default.nix
View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchzip, jre, makeWrapper }:
stdenv.mkDerivation rec {
pname = "h2";
version = "2.1.210";
version = "2.2.220";
src = fetchzip {
url = "https://github.com/h2database/h2database/releases/download/version-${version}/h2-2022-01-17.zip";
sha256 = "0zcjblhjj98dsj954ia3by9vx5w7mix1dzi85jnvp18kxmbldmf4";
url = "https://github.com/h2database/h2database/releases/download/version-${version}/h2-2023-07-04.zip";
hash = "sha256-nSOkCZuHcy0GR4SRjx524+MLqxJyO1PRkImPOFR1yts=";
};
outputs = [ "out" "doc" ];

12
pkgs/servers/nosql/surrealdb/default.nix
View File

@ -4,7 +4,7 @@
, fetchFromGitHub
, pkg-config
, openssl
, rocksdb_7_10
, rocksdb
, testers
, surrealdb
, SystemConfiguration
@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "surrealdb";
version = "1.0.0-beta.9";
version = "1.0.0-beta.10";
src = fetchFromGitHub {
owner = "surrealdb";
repo = "surrealdb";
rev = "v${version}";
sha256 = "sha256-GgRsRGYnaE2TssoXdubEuMEbLjM4woE3vxTxSlufquU=";
hash = "sha256-aNzh1NWfK0K2+ZTTrvFlycK98AjNkKtGdriMtrbaDjA=";
};
cargoSha256 = "sha256-eLJ+sxsK45pkgNUYrNuUOAqutwIjvEhGGjsvwGzfVKI=";
cargoHash = "sha256-ApjdXY4VZQBL04c0s5jKD1HxBxZdEGPzCKCsPQTLfiQ=";
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
@ -32,8 +32,8 @@ rustPlatform.buildRustPackage rec {
PROTOC = "${protobuf}/bin/protoc";
PROTOC_INCLUDE = "${protobuf}/include";
ROCKSDB_INCLUDE_DIR = "${rocksdb_7_10}/include";
ROCKSDB_LIB_DIR = "${rocksdb_7_10}/lib";
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
nativeBuildInputs = [
pkg-config

4
pkgs/servers/web-apps/nifi/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nifi";
version = "1.23.0";
version = "1.23.2";
src = fetchzip {
url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip";
hash = "sha256-IWmekIrWGvVTOX2MG+3EkX4phWzdrhxH5vNWpsrsrvM=";
hash = "sha256-NRX0lEE5/HsYnZXtLDlPUpgWMsg/2Z3cRUnJwKDGxfw=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/shells/murex/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "murex";
version = "4.4.9100";
version = "4.4.9500";
src = fetchFromGitHub {
owner = "lmorg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3YXRjwDEJC4rZdvrgj8Hp8oD+4NN5LOUJmM/9bjwfQw=";
sha256 = "sha256-4BtpnGsXgGKIY3+SAZpfUnh+tQWsXyuIfXbvUvEAjy4=";
};
vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU=";
@ -22,6 +22,6 @@ buildGoModule rec {
description = "Bash-like shell and scripting environment with advanced features designed for safety and productivity";
homepage = "https://murex.rocks";
license = licenses.gpl2;
maintainers = with maintainers; [ dit7ya ];
maintainers = with maintainers; [ dit7ya kashw2 ];
};
}

6
pkgs/tools/admin/kics/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "kics";
version = "1.7.5";
version = "1.7.7";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
rev = "v${version}";
hash = "sha256-+/wqwWRJQKfmh4JuWppcE2444lD1PQ9rDGOsFh57AKs=";
hash = "sha256-qK1lq7jrej4HdM+BUDDPujhbhqEhKcli3CTAmadO5Mg=";
};
vendorHash = "sha256-ipXfxqHdushJ2P//oyGGjZsq5EypDEpHKlW32VHaMXw=";
vendorHash = "sha256-gJu3B30IPp8A/xgtE5fzThQAtnFbbzr8ZwucAsObBxs=";
subPackages = [ "cmd/console" ];

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

@ -92,6 +92,7 @@ python3.pkgs.buildPythonApplication rec {
patches = [
./ignore_links.patch
./fix-test_fit.patch
];
postPatch = ''

58
pkgs/tools/misc/diffoscope/fix-test_fit.patch Normal file
View File

@ -0,0 +1,58 @@
From f1e9fa32c925fe7fb3cd825a02dcff52d305d845 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Mon, 28 Aug 2023 19:03:38 -0400
Subject: [PATCH] Fix test_fit with file 5.45
See also 435a8fe9a201a7e74e705e06cc56b66fa6cb4af9.
---
tests/comparators/test_fit.py | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/tests/comparators/test_fit.py b/tests/comparators/test_fit.py
index d8478c00..47258a3e 100644
--- a/tests/comparators/test_fit.py
+++ b/tests/comparators/test_fit.py
@@ -27,7 +27,11 @@
from diffoscope.comparators.utils.specialize import specialize
from ..utils.data import data, assert_diff, load_fixture
-from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
+from ..utils.tools import (
+ skip_unless_file_version_is_at_least,
+ skip_unless_tool_is_at_least,
+ skip_unless_tools_exist,
+)
from ..utils.nonexisting import assert_non_existing
cpio1 = load_fixture("test1.cpio")
@@ -124,19 +128,21 @@ def test_nested_listing(nested_differences):
@skip_unless_tools_exist("cpio")
@skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2021.01")
@skip_unless_tools_exist("fdtdump")
+@skip_unless_file_version_is_at_least("5.45")
def test_nested_symlink(nested_differences):
- assert nested_differences[1].source1 == "dir/link"
- assert nested_differences[1].comment == "symlink"
- assert_diff(nested_differences[1], "symlink_expected_diff")
+ assert nested_differences[2].source1 == "dir/link"
+ assert nested_differences[2].comment == "symlink"
+ assert_diff(nested_differences[2], "symlink_expected_diff")
@skip_unless_tools_exist("cpio")
@skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2021.01")
@skip_unless_tools_exist("fdtdump")
+@skip_unless_file_version_is_at_least("5.45")
def test_nested_compressed_files(nested_differences):
- assert nested_differences[2].source1 == "dir/text"
- assert nested_differences[2].source2 == "dir/text"
- assert_diff(nested_differences[2], "text_ascii_expected_diff")
+ assert nested_differences[3].source1 == "dir/text"
+ assert nested_differences[3].source2 == "dir/text"
+ assert_diff(nested_differences[3], "text_ascii_expected_diff")
@skip_unless_tools_exist("cpio")
--
2.41.0

4
pkgs/tools/misc/rpm-ostree/default.nix
View File

@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "rpm-ostree";
version = "2023.5";
version = "2023.7";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
hash = "sha256-vXl7NrTNc0p6wMEmsd7aHs5CjFXkWj8PwR7avZIqnCA=";
hash = "sha256-OL1PEXGqPbMWFcCTkjRAUk+7zbGTQiwQqmgmkEgfgHE=";
};
nativeBuildInputs = [

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

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "sfeed";
version = "1.8";
version = "1.9";
src = fetchgit {
url = "git://git.codemadness.org/sfeed";
rev = version;
sha256 = "sha256-oosBwLCVZDy29RNxLXie0IPRUxAmT6qJlQGHypWScuk=";
sha256 = "sha256-VZChiJ1m2d0iEM5ATXMqCJVpHZcBIkqIorFvQlY0/mw=";
};
buildInputs = [ ncurses ];

7
pkgs/tools/misc/ttchat/default.nix
View File

@ -2,22 +2,21 @@
buildGoModule rec {
pname = "ttchat";
version = "0.1.7";
version = "0.1.10";
src = fetchFromGitHub {
owner = "atye";
repo = "ttchat";
rev = "v${version}";
sha256 = "sha256-+fPARVS1ILxrigHpvb+iNqz7Xw7+c/LmHJEeRxhCbhQ=";
hash = "sha256-Ezlqji/j6nyCzc1jrfB1MZR4ugKAa5D5CL6wfuP6PsY=";
};
vendorSha256 = "sha256-XWCjnHg0P7FCuiMjCV6ijy60h0u776GyiIC/k/KMW38=";
vendorHash = "sha256-6GcbEGC1O+lcTO+GsaVXOO69yIHMPywXJy7OFX15/eI=";
meta = with lib; {
description = "Connect to a Twitch channel's chat from your terminal";
homepage = "https://github.com/atye/ttchat";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ wolfangaukang ];
};
}

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

@ -8,10 +8,10 @@ buildGoModule rec {
owner = "akavel";
repo = "up";
rev = "v${version}";
sha256 = "1j8fi14fiwjscfzdfjqxgavjadwvcm5mqr8fb7hx3jmxs4kl58bp";
hash = "sha256-d6FCJ9G9ytHhWQ5lXEtlmzclt3odS9e+Y1ry6EiIDsk=";
};
vendorSha256 = "1q8wfsfl3rz698ck5q5s5z6iw9k134fxxvwipcp2b052n998rcrx";
vendorHash = "sha256-PbOMUrKigCUuu5Hv3h0ZYSYezS+64DIZSubnQZ12HOE=";
meta = with lib; {
description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview";

4
pkgs/tools/networking/godns/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "godns";
version = "2.9.8";
version = "2.9.9";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "refs/tags/v${version}";
hash = "sha256-Nfw3pDqdCeaUKi+MzNIuRTwJHSoUbkJfWRJTAGvkBOQ=";
hash = "sha256-R5f2h8bodP/9MP5gqGWBEbC/rLPEV4gEDoc5sMgmoLs=";
};
vendorHash = "sha256-iAU62/0MjzxwuMvIobhIZEqDJUpRqwEabnazH7jBRTE=";

10
pkgs/tools/networking/mtr-exporter/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule {
buildGoModule rec {
pname = "mtr-exporter";
version = "0.1.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "mgumz";
repo = "mtr-exporter";
rev = "3ce854a53a44780d2294f59284d21b06aeae6940";
sha256 = "sha256-PZCSuvtTBD7yoUE1fR9Z/u3aa1BZgbrcj18smnWRYf4=";
rev = version;
hash = "sha256-vVYdIfogXHixf1/7+uGKSxbqVmr9NeCUuNVYE07HoBw=";
};
vendorSha256 = "0njn0ac7j3lv8ax6jc3bg3hh96a42jal212qk6zxrd46nb5l1rj8";
vendorHash = null;
meta = with lib; {
description = ''

6
pkgs/tools/networking/sing-box/default.nix
View File

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "sing-box";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "SagerNet";
repo = pname;
rev = "v${version}";
hash = "sha256-i6Cpb4NQNsyIrMOihWYdR37BkSouSCWi3nxMnbODnZU=";
hash = "sha256-AB+JNac9553Viw/XVqLFAQnEOwweCz3ltyUbB1gYMmM=";
};
vendorHash = "sha256-6Mx8kdZL7EguQoh1upuu6wGZckczDoGmRjOFCpv756s=";
vendorHash = "sha256-Je5852dIKjlTAym00V2gNz89Hrl8QygEfkybZlLVktY=";
tags = [
"with_quic"

48
pkgs/tools/nix/fh/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
, gcc
, libcxx
}:
rustPlatform.buildRustPackage rec {
pname = "fh";
version = "0.1.1";
src = fetchFromGitHub {
owner = "DeterminateSystems";
repo = "fh";
rev = "v${version}";
hash = "sha256-lTm4C06FtlaIJyhqZ4POubiR4qc0fPHawLS4cpneACg=";
};
cargoHash = "sha256-CvuQeS+g9bdpYzop63BL0UKQsdOELGt1tR2Xz4FLxpE=";
nativeBuildInputs = [
rustPlatform.bindgenHook
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
gcc.cc.lib
];
env = lib.optionalAttrs stdenv.isDarwin {
NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1";
};
# Cargo.lock is outdated
postConfigure = ''
cargo metadata --offline
'';
meta = with lib; {
description = "The official FlakeHub CLI";
homepage = "https://github.com/DeterminateSystems/fh";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
mainProgram = "fh";
};
}

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

@ -11,10 +11,10 @@ buildGoModule rec {
owner = "lc";
repo = pname;
rev = "v${version}";
sha256 = "01cip5rf35dnh3l325p03y6axyqdpf48ry4zcwiyd7hlfsglbk3j";
hash = "sha256-csxFn3YUnuYjZ5/4jIi7DfuujB/gFjHogLaV4XK5kQU=";
};
vendorSha256 = "1y01k8pvv7y9zb15wbk068cvkx0g83484jak2dvcvghqcf5j1fr1";
vendorHash = "sha256-Ibsgi2MYvs12E1NJgshAD/S5GTJgLl7C+smfvS+aAfg=";
ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ];

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vals";
version = "0.27.0";
version = "0.27.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "variantdev";
repo = pname;
sha256 = "sha256-EYp+c3MbkdMIyo/2kHsKg9hjByqm6VdNxLcsl4dJrcg=";
sha256 = "sha256-2Wjp1Q7c4CrhCnPTQUyrzVPL89XYOp2bnySQril/RQc=";
};
vendorHash = "sha256-iNwQUwcF6iKYdqvy4t5xgOvNdhR+Vx+J5UHZzkNOed4=";
vendorHash = "sha256-J0fhxfGDJKZfRWPPockIAUENCPffQlQmwjkgls+ocoE=";
ldflags = [
"-s"

4
pkgs/tools/text/mpage/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mpage";
version = "2.5.7";
version = "2.5.8";
src = fetchurl {
url = "https://www.mesa.nl/pub/mpage/mpage-${version}.tgz";
sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi";
sha256 = "sha256-I1HpHSV5SzWN9mGPF6cBOijTUOwgQI/gb4Ej3EZz/pM=";
};
postPatch = ''

17
pkgs/tools/typesetting/typst-live/default.nix
View File

@ -1,24 +1,22 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchCrate
, stdenv
, darwin
, makeWrapper
, typst
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "typst-live";
version = "unstable-2023-05-27";
version = "0.6.0";
src = fetchFromGitHub {
owner = "ItsEthra";
repo = "typst-live";
rev = "10a2da57b93f8d6e4eaa0bfcec1e68e46b916868";
hash = "sha256-42QzqbyIjPn0C4coCU81gtlI7v5XJStlsDZvnLlwpYs=";
src = fetchCrate {
inherit pname version;
hash = "sha256-8YndEqhIESC3Cbe4klQfkVqesNFeZ2g1oRd1VoVrMnE=";
};
cargoHash = "sha256-M5jYSLw5oquAq2gGWZOJvx5/CGAl2Rg+G94V6ivAOzc=";
cargoHash = "sha256-62tBefXek6W01RfdPczXBuYhrLK+wG1YQ7va7FQmAhA=";
nativeBuildInputs = [
makeWrapper
@ -38,5 +36,6 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/ItsEthra/typst-live";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "typst-live";
};
}

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

@ -658,6 +658,8 @@ with pkgs;
femtolisp = callPackage ../development/interpreters/femtolisp { };
fh = callPackage ../tools/nix/fh { };
figma-agent = callPackage ../applications/graphics/figma-agent { };
figma-linux = callPackage ../applications/graphics/figma-linux { };
@ -2408,6 +2410,8 @@ with pkgs;
gitnuro = callPackage ../applications/version-management/gitnuro { };
gitnr = callPackage ../applications/version-management/gitnr { };
gitprompt-rs = callPackage ../applications/version-management/gitprompt-rs/default.nix { };
gitsign = callPackage ../applications/version-management/gitsign { };
@ -22117,6 +22121,8 @@ with pkgs;
hawknl = callPackage ../development/libraries/hawknl { };
hax11 = callPackage ../development/libraries/hax11 { };
haxor-news = callPackage ../applications/misc/haxor-news { };
hdt = callPackage ../misc/hdt { };