diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5f56e0602279..e760a18f5082 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -210,7 +210,7 @@ in #fleet = 173; # unused #input = 174; # unused sddm = 175; - tss = 176; + #tss = 176; # dynamically allocated as of 2021-09-17 #memcached = 177; removed 2018-01-03 #ntp = 179; # dynamically allocated as of 2021-09-17 zabbix = 180; @@ -524,7 +524,7 @@ in #fleet = 173; # unused input = 174; sddm = 175; - tss = 176; + #tss = 176; #dynamically allocateda as of 2021-09-20 #memcached = 177; # unused, removed 2018-01-03 #ntp = 179; # unused zabbix = 180; diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix index 3c4cc69e0e3d..065587bc286e 100644 --- a/nixos/modules/security/lock-kernel-modules.nix +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -35,10 +35,10 @@ with lib; wants = [ "systemd-udevd.service" ]; wantedBy = [ config.systemd.defaultUnit ]; - before = [ config.systemd.defaultUnit ]; after = [ "firewall.service" "systemd-modules-load.service" + config.systemd.defaultUnit ]; unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel"; diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix index 27f9b58c9755..d37425166f88 100644 --- a/nixos/modules/security/tpm2.nix +++ b/nixos/modules/security/tpm2.nix @@ -146,6 +146,7 @@ in { # Create the tss user and group only if the default value is used users.users.${cfg.tssUser} = lib.mkIf (cfg.tssUser == "tss") { isSystemUser = true; + group = "tss"; }; users.groups.${cfg.tssGroup} = lib.mkIf (cfg.tssGroup == "tss") {}; @@ -172,7 +173,7 @@ in { BusName = "com.intel.tss2.Tabrmd"; ExecStart = "${cfg.abrmd.package}/bin/tpm2-abrmd"; User = "tss"; - Group = "nogroup"; + Group = "tss"; }; }; diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix index c3072bf09964..d4f5dc267d09 100644 --- a/nixos/modules/services/display-managers/greetd.nix +++ b/nixos/modules/services/display-managers/greetd.nix @@ -99,7 +99,12 @@ in systemd.defaultUnit = "graphical.target"; - users.users.greeter.isSystemUser = true; + users.users.greeter = { + isSystemUser = true; + group = "greeter"; + }; + + users.groups.greeter = {}; }; meta.maintainers = with maintainers; [ queezle ]; diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index 0d36bce357ba..c549a6775013 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -149,12 +149,10 @@ in users.users = optionalAttrs (cfg.user == "tss") { tss = { group = "tss"; - uid = config.ids.uids.tss; + isSystemUser = true; }; }; - users.groups = optionalAttrs (cfg.group == "tss") { - tss.gid = config.ids.gids.tss; - }; + users.groups = optionalAttrs (cfg.group == "tss") { tss = {}; }; }; } diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index 3ae43b074ff2..fe0a1c496223 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -105,8 +105,14 @@ switchboard-with-plugs.override { </term> <listitem> <para> - AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. In the near future you will be able to install Flatpak applications from AppCenter on NixOS. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>. + AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>. </para> + <para> + To use AppCenter on NixOS, add <literal>pantheon.appcenter</literal> to <xref linkend="opt-environment.systemPackages" />, <link linkend="module-services-flatpak">enable Flatpak support</link> and optionally add the <literal>appcenter</literal> Flatpak remote: + </para> +<screen> +<prompt>$ </prompt>flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo +</screen> </listitem> </varlistentry> </variablelist> diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index a0b629086b5a..b76ae83a3287 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -57,6 +57,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { # Test kernel module hardening with subtest("No more kernel modules can be loaded"): # note: this better a be module we normally wouldn't load ... + machine.wait_for_unit("disable-kernel-module-loading.service") machine.fail("modprobe dccp") diff --git a/pkgs/applications/misc/gofu/default.nix b/pkgs/applications/misc/gofu/default.nix index b951a3e48251..13cb7129a00b 100644 --- a/pkgs/applications/misc/gofu/default.nix +++ b/pkgs/applications/misc/gofu/default.nix @@ -15,6 +15,11 @@ buildGoModule rec { subPackages = [ "." ]; + postInstall = '' + ln -s $out/bin/gofu $out/bin/rtree + ln -s $out/bin/gofu $out/bin/prettyprompt + ''; + meta = with lib; { description = "Multibinary containing several utilities"; homepage = "https://github.com/majewsky/gofu"; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 966f2adea55b..bb727b2adbb5 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -2,15 +2,17 @@ with pkgs; -self: super: let +self: super: +let buildPlugin = args: self.buildPythonPackage (args // { pname = "OctoPrintPlugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ super.octoprint ]; + propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ super.octoprint ]; # none of the following have tests doCheck = false; }); -in { +in +{ inherit buildPlugin; m86motorsoff = buildPlugin rec { @@ -84,7 +86,7 @@ in { meta = with lib; { description = "Plugin to display the estimated print cost for the loaded model."; - homepage = "https://github.com/malnvenshorn/OctoPrint-CostEstimation"; + homepage = "https://github.com/OllisGit/OctoPrint-CostEstimation"; license = licenses.agpl3Only; maintainers = with maintainers; [ stunkymonkey ]; }; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 6515885fd8e2..91f5cb82668e 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -17,6 +17,10 @@ let nixops = super.nixops.overridePythonAttrs ( old: { + postPatch = '' + substituteInPlace nixops/args.py --subst-var version + ''; + meta = old.meta // { homepage = https://github.com/NixOS/nixops; description = "NixOS cloud provisioning and deployment tool"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 17c9f9114a1f..95c19eb2f1da 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -45,6 +45,7 @@ , libsysprof-capture , libpsl , brotli +, microsoft_gsl }: # Main reference: @@ -59,7 +60,7 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "3.0.1"; + version = "3.1.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -68,7 +69,7 @@ mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "196w82a92jahz7caqv2cyhhq53xm3figa7kiq59kid5wbqg33c9x"; + sha256 = "0507qdkz8gn0gyyhxsy4mc4rs2r94s1ipqfxrc6ghgj43jkrklx3"; }; postPatch = '' @@ -136,6 +137,7 @@ mkDerivation rec { libsysprof-capture libpsl brotli + microsoft_gsl ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index e553c95990e5..60baf734aa1a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2021-06-27"; + version = "unstable-2021-09-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "91d836dc84a16584c6ac52b36c04c0de504d9c34"; - sha256 = "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2"; + rev = "575fb17d2853c43329e45f6693370f5e41668055"; + sha256 = "17lhy5g4apdakspv75zm070k7003crf1i80m8wy8f631s86v30md"; fetchSubmodules = true; }; diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index 3973aff398ab..fe070e9638d4 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -2,11 +2,16 @@ { # Cargo lock file - lockFile + lockFile ? null + + # Cargo lock file contents as string +, lockFileContents ? null # Hashes for git dependencies. , outputHashes ? {} -}: +} @ args: + +assert (lockFile == null) != (lockFileContents == null); let # Parse a git source into different components. @@ -22,7 +27,13 @@ let sha = builtins.elemAt parts 4; } // lib.optionalAttrs (type != null) { inherit type value; }; - packages = (builtins.fromTOML (builtins.readFile lockFile)).package; + # shadows args.lockFileContents + lockFileContents = + if lockFile != null + then builtins.readFile lockFile + else args.lockFileContents; + + packages = (builtins.fromTOML lockFileContents).package; # There is no source attribute for the source package itself. But # since we do not want to vendor the source package anyway, we can @@ -144,10 +155,17 @@ let '' else throw "Cannot handle crate source: ${pkg.source}"; - vendorDir = runCommand "cargo-vendor-dir" {} '' + vendorDir = runCommand "cargo-vendor-dir" (lib.optionalAttrs (lockFile == null) { + inherit lockFileContents; + passAsFile = [ "lockFileContents" ]; + }) '' mkdir -p $out/.cargo - ln -s ${lockFile} $out/Cargo.lock + ${ + if lockFile != null + then "ln -s ${lockFile} $out/Cargo.lock" + else "cp $lockFileContentsPath $out/Cargo.lock" + } cat > $out/.cargo/config <<EOF [source.crates-io] diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock new file mode 100644 index 000000000000..522f9c260fa3 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock @@ -0,0 +1,83 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "basic-dynamic" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "libc" +version = "0.2.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ + "rand_core", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml new file mode 100644 index 000000000000..851024c82e94 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "basic-dynamic" +version = "0.1.0" +authors = ["Daniƫl de Kok <me@danieldk.eu>"] +edition = "2018" + +[dependencies] +rand = "0.8" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix new file mode 100644 index 000000000000..eea2c3760599 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix @@ -0,0 +1,16 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "basic-dynamic"; + version = "0.1.0"; + + src = ./.; + + cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/basic-dynamic + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs new file mode 100644 index 000000000000..50b4ed799e43 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/default.nix index 95f1711d2da7..24e07099c058 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/default.nix @@ -4,6 +4,7 @@ # $ nix-build -A tests.importCargoLock { basic = callPackage ./basic { }; + basicDynamic = callPackage ./basic-dynamic { }; gitDependency = callPackage ./git-dependency { }; gitDependencyRev = callPackage ./git-dependency-rev { }; gitDependencyTag = callPackage ./git-dependency-tag { }; diff --git a/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch b/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch index 0937ac6e3084..72ec48f020b2 100644 --- a/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch +++ b/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch @@ -1,4 +1,4 @@ -From 9b05a6f331506afa5aca8865677af83403d2a32d Mon Sep 17 00:00:00 2001 +From 439e2effe1cc372925daf6d5c28569663ffb93ed Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak <me@tadeo.ca> Date: Mon, 25 Jan 2021 11:17:44 -0700 Subject: [PATCH] Call weak function to allow adding preloaded plugins after @@ -10,10 +10,10 @@ Subject: [PATCH] Call weak function to allow adding preloaded plugins after 2 files changed, 24 insertions(+) diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp -index 2d29844d..35c509ed 100644 +index f8e69062..4ce4c623 100644 --- a/src/core/vscore.cpp +++ b/src/core/vscore.cpp -@@ -1229,6 +1229,20 @@ void VSCore::destroyFilterInstance(VSNode *node) { +@@ -1791,6 +1791,20 @@ void VSCore::destroyFilterInstance(VSNode *node) { freeDepth--; } @@ -31,10 +31,10 @@ index 2d29844d..35c509ed 100644 +} +} + - VSCore::VSCore(int threads) : - coreFreed(false), + VSCore::VSCore(int flags) : numFilterInstances(1), -@@ -1351,6 +1365,11 @@ VSCore::VSCore(int threads) : + numFunctionInstances(0), +@@ -1918,6 +1932,11 @@ VSCore::VSCore(int flags) : } // If neither exists, an empty string will do. #endif @@ -44,14 +44,14 @@ index 2d29844d..35c509ed 100644 + } + VSMap *settings = readSettings(configFile); - const char *error = vs_internal_vsapi.getError(settings); + const char *error = vs_internal_vsapi.mapGetError(settings); if (error) { diff --git a/src/core/vscore.h b/src/core/vscore.h -index 74df8a84..3efac811 100644 +index 2ce0f56b..2982b133 100644 --- a/src/core/vscore.h +++ b/src/core/vscore.h -@@ -582,6 +582,9 @@ public: - VSFunction() : functionData(nullptr), func(nullptr) {} +@@ -985,6 +985,9 @@ public: + std::string getV3ArgString() const; }; +extern "C" { @@ -59,10 +59,10 @@ index 74df8a84..3efac811 100644 +} struct VSPlugin { - private: -@@ -683,6 +686,8 @@ public: + friend struct VSPluginFunction; +@@ -1140,6 +1143,8 @@ public: - explicit VSCore(int threads); + explicit VSCore(int flags); void freeCore(); + + friend void VSLoadPluginsNixCallback(void *data, const char *path); @@ -70,5 +70,5 @@ index 74df8a84..3efac811 100644 #endif // VSCORE_H -- -2.30.0 +2.32.0 diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 37d82b0b4bd9..3eaeeccc4544 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -10,13 +10,13 @@ with lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R54"; + version = "R55"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "01jym2rq28j0g792yagk9dvm411gwmk6qgj9rgrg7ckpxmw27w2s"; + sha256 = "sha256-91lPknNX3NM3NraIcPAR478paPoYvgjgCOIcdgaR5nE="; }; patches = [ diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index dc68584d668f..a2434a9cb626 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.9.2"; + version = "3.10.1"; disabled = pythonOlder "3.7"; format = "flit"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = pname; rev = "v${version}"; - sha256 = "04z0x2n4a7503h6xf853p7if218magi98x397648wb21l4gh3zwv"; + sha256 = "sha256-D8XaBny/m6dXMz6k/FhVX/5t8guNdJsfiX4cVQV4VIY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index 332c4c16bd6a..4e161d4bfa3c 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -4,6 +4,7 @@ , pyyaml , buildPythonPackage , isPy3k +, fetchpatch }: buildPythonPackage rec{ @@ -16,6 +17,14 @@ buildPythonPackage rec{ inherit pname version; sha256 = "8a3d5dd2a10c3aa6fa8167713fedb47400f0e8ae6ea8346fd4b599842bb1882d"; }; + patches = [ + # Upstream has relaxed the version constaints for the click dependency + # but there hasn't been a release since then + (fetchpatch { + url = "https://github.com/sergiocorreia/panflute/commit/dee6c716a73072a968d67f8638a61de44025d8de.patch"; + sha256 = "sha256-Kj/NTcXsSkevpfr8OwoIQi0p6ChXDM6YgYDPNHJtJZo="; + }) + ]; propagatedBuildInputs = [ click pyyaml ]; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 9fcd87f3476d..80c722221164 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,21 +1,57 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, gtk3 }: let name = "saleae-logic-2"; - version = "2.3.33"; + version = "2.3.37"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "09vypl03gj58byk963flskzkhl4qrd9qw1kh0sywbqnzbzvj5cgm"; + sha256 = "0jclzd4s1r6h2p1r0vhmzz3jnwpp7d41g70lcamrsxidxrmm8d45"; }; in appimageTools.wrapType2 { inherit name src; extraInstallCommands = - let appimageContents = appimageTools.extractType2 { inherit name src; }; in - '' - mkdir -p $out/etc/udev/rules.d - cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/ - ''; + let + appimageContents = appimageTools.extractType2 { inherit name src; }; + in + '' + mkdir -p $out/etc/udev/rules.d + cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/ + ''; + + profile = '' + export XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}''${XDG_DATA_DIRS:+:"''$XDG_DATA_DIRS"}" + ''; + + extraPkgs = pkgs: with pkgs; [ + wget + unzip + glib + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + nss + nspr + dbus + gdk-pixbuf + gtk3 + pango + atk + cairo + expat + xorg.libXrandr + xorg.libXScrnSaver + alsa-lib + at-spi2-core + cups + ]; meta = with lib; { homepage = "https://www.saleae.com/"; diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix index 276d6e50eeed..ff76a755cddc 100644 --- a/pkgs/development/tools/rust/cargo-cross/default.nix +++ b/pkgs/development/tools/rust/cargo-cross/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { owner = "rust-embedded"; repo = "cross"; rev = "v${version}"; - sha256 = "sha256:1py5w4kf612x4qxi190ilsrx0zzwdzk9i47ppvqblska1s47qa2w"; + sha256 = "1py5w4kf612x4qxi190ilsrx0zzwdzk9i47ppvqblska1s47qa2w"; }; cargoSha256 = "sha256-zk6cbN4iSHnyoeWupufVf2yQK6aq3S99uk9lqpjCw4c="; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ (fetchpatch { url = "https://github.com/rust-embedded/cross/commit/e86ad2e5a55218395df7eaaf91900e22b809083c.patch"; - sha256 = "sha256:1zrcj5fm3irmlrfkgb65kp2pjkry0rg5nn9pwsk9p0i6dpapjc7k"; + sha256 = "1zrcj5fm3irmlrfkgb65kp2pjkry0rg5nn9pwsk9p0i6dpapjc7k"; }) ]; @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-embedded/cross"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ otavio ]; + mainProgram = "cross"; }; } diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/development/tools/rust/cargo-deadlinks/default.nix new file mode 100644 index 000000000000..ebd66a9b0093 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-deadlinks"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "deadlinks"; + repo = pname; + rev = "${version}"; + sha256 = "1zd5zgq3346xijllr0qdvvmsilpawisrqgdmsqir8v3bk55ybj4g"; + }; + + cargoSha256 = "1ar3iwpy9mng4j09z4g3ynxra2qwc8454dnc0wjal4h16fk8gxwv"; + + checkFlags = [ + # uses internet + "--skip non_existent_http_link --skip working_http_check" + # expects top-level directory to be named "cargo-deadlinks" + "--skip simple_project::it_checks_okay_project_correctly" + ]; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "Cargo subcommand to check rust documentation for broken links"; + homepage = "https://github.com/deadlinks/cargo-deadlinks"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/tools/rust/svd2rust/cargo-lock.patch b/pkgs/development/tools/rust/svd2rust/cargo-lock.patch index acc9b053593b..62dd8427c358 100644 --- a/pkgs/development/tools/rust/svd2rust/cargo-lock.patch +++ b/pkgs/development/tools/rust/svd2rust/cargo-lock.patch @@ -2,473 +2,492 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,469 @@ +@@ -0,0 +1,488 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. ++version = 3 ++ +[[package]] +name = "aho-corasick" -+version = "0.7.15" ++version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ -+ "memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ -+ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "anyhow" -+version = "1.0.40" ++version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ -+ "hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", ++ "winapi", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cast" -+version = "0.2.5" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +dependencies = [ -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ -+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "clap_conf" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56039deda04adbf9af4e5595c199572dc276f4fe60b03a4c84c0186d4de649d8" ++dependencies = [ ++ "anyhow", ++ "clap", ++ "serde", ++ "thiserror", ++ "toml", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" -+version = "0.8.0" ++version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-epoch 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crossbeam-epoch", ++ "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" -+version = "0.9.3" ++version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +dependencies = [ -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crossbeam-utils", ++ "lazy_static", ++ "memoffset", ++ "scopeguard", +] + +[[package]] +name = "crossbeam-utils" -+version = "0.8.3" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ -+ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "lazy_static", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty", ++ "humantime", ++ "log", ++ "regex", ++ "termcolor", +] + +[[package]] +name = "hermit-abi" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ -+ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", +] + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ -+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error", +] + +[[package]] +name = "inflections" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" -+version = "0.2.94" ++version = "0.2.102" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", +] + +[[package]] +name = "memchr" -+version = "2.3.4" ++version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memoffset" -+version = "0.6.3" ++version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ -+ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ -+ "hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", +] + +[[package]] +name = "once_cell" -+version = "1.7.2" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "proc-macro2" -+version = "1.0.26" ++version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +dependencies = [ -+ "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ -+ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", +] + +[[package]] +name = "rayon" -+version = "1.5.0" ++version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +dependencies = [ -+ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", +] + +[[package]] +name = "rayon-core" -+version = "1.9.0" ++version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +dependencies = [ -+ "crossbeam-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-channel", ++ "crossbeam-deque", ++ "crossbeam-utils", ++ "lazy_static", ++ "num_cpus", +] + +[[package]] +name = "regex" -+version = "1.4.6" ++version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ -+ "aho-corasick 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.23" ++version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "rustc_version" -+version = "0.2.3" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "semver" -+version = "0.9.0" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" + +[[package]] -+name = "semver-parser" -+version = "0.7.0" ++name = "serde" ++version = "1.0.130" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "svd-parser" -+version = "0.10.1" ++version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "697e7645ad9f5311fe3d872d094b135627b1616aea9e1573dddd28ca522579b9" +dependencies = [ -+ "anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "once_cell 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "xmltree 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "once_cell", ++ "rayon", ++ "regex", ++ "thiserror", ++ "xmltree", +] + +[[package]] +name = "svd2rust" -+version = "0.18.0" ++version = "0.19.0" +dependencies = [ -+ "anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cast 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "svd-parser 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "cast", ++ "clap", ++ "clap_conf", ++ "env_logger", ++ "inflections", ++ "log", ++ "proc-macro2", ++ "quote", ++ "svd-parser", ++ "syn", ++ "thiserror", +] + +[[package]] +name = "syn" -+version = "1.0.70" ++version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +dependencies = [ -+ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "unicode-xid", +] + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ -+ "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ -+ "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] +name = "thiserror" -+version = "1.0.24" ++version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" +dependencies = [ -+ "thiserror-impl 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.24" ++version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" +dependencies = [ -+ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++dependencies = [ ++ "serde", +] + +[[package]] +name = "unicode-width" -+version = "0.1.8" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ -+ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "xml-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", +] + +[[package]] +name = "xmltree" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff8eaee9d17062850f1e6163b509947969242990ee59a35801af437abe041e70" +dependencies = [ -+ "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "xml-rs", +] -+ -+[metadata] -+"checksum aho-corasick 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" -+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+"checksum autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum cast 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75" -+"checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+"checksum clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)" = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -+"checksum crossbeam-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -+"checksum crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -+"checksum crossbeam-epoch 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" -+"checksum crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" -+"checksum either 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -+"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+"checksum hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -+"checksum inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)" = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" -+"checksum log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -+"checksum memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" -+"checksum memoffset 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" -+"checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -+"checksum once_cell 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" -+"checksum proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -+"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -+"checksum quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -+"checksum rayon 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" -+"checksum rayon-core 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" -+"checksum regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" -+"checksum regex-syntax 0.6.23 (registry+https://github.com/rust-lang/crates.io-index)" = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum svd-parser 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6b787831d8f6a1549ccd1b0d62772d0526425a7da687f0f98591ab18e53bfe98" -+"checksum syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883" -+"checksum termcolor 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" -+"checksum thiserror-impl 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -+"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -+"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -+"checksum vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -+"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2" -+"checksum xmltree 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8eaee9d17062850f1e6163b509947969242990ee59a35801af437abe041e70" diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index c66cbe3c2c82..5f67b335bc35 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -4,17 +4,17 @@ with rustPlatform; buildRustPackage rec { pname = "svd2rust"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "rust-embedded"; repo = "svd2rust"; rev = "v${version}"; - sha256 = "1p0zq3q4g9lr0ghavp7v1dwsqq19lkljkm1i2hsb1sk3pxa1f69n"; + sha256 = "04mm0l7cv2q5yjxrkpr7p0kxd4nmi0d7m4l436q8p492nvgb75zx"; }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0c0f86x17fzav5q76z3ha3g00rbgyz2lm5a5v28ggy0jmg9xgsv6"; + cargoSha256 = "1v1qx0r3k86jipyaaggm25pinsqicmzvnzrxd0lr5xk77s1kvgid"; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 282d9728821e..6f58e3e8f1d9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -111,7 +111,7 @@ let description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; - maintainers = with maintainers; [ baracoder ]; + maintainers = with maintainers; [ ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; }; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 893537e167ad..e36390f85271 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-07-27T06-46-19Z"; + version = "2021-09-02T09-21-27Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1h0r8c22v94w2hhbc0hv9rc9jyr5ar7gpa76lhr9l8ra0k3qra43"; + sha256 = "sha256-6G0MyeDYc8Y6eib2T+2VB5mDjyO13FdBsufy57osIEk="; }; - vendorSha256 = "1s1bq166dlhqll0r5lcdjpd2446cwi1slbi895582jgs38zpkzvw"; + vendorSha256 = "sha256-J1khnNTiHkTPRjNlU2yQu8b+bwKP/KBF1KxTIvGLs+U="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index c54c4f8691ad..e7589862e511 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -1,24 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libnl, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, libnl +, ncurses +, pkg-config +}: stdenv.mkDerivation rec { pname = "wavemon"; - version = "0.9.3"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses libnl ]; + version = "0.9.4"; src = fetchFromGitHub { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "0m9n5asjxs1ir5rqprigqcrm976mgjvh4yql1jhfnbszwbf95193"; + sha256 = "0s3yz15vzx90fxyb8bgryksn0cr2gpz9inbcx4qjrgs7zfbm4pgh"; }; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libnl + ncurses + ]; + meta = with lib; { description = "Ncurses-based monitoring application for wireless network devices"; homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin fpletz ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix new file mode 100644 index 000000000000..76b0c1fa9824 --- /dev/null +++ b/pkgs/tools/security/amber/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + # Renaming it to amber-secret because another package named amber exists + pname = "amber-secret"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "fpco"; + repo = "amber"; + rev = "v${version}"; + sha256 = "1l5c7vdi885z56nqqbm4sw9hvqk3rfzm0mgcwk5cbwjlrz7yjq4m"; + }; + + cargoSha256 = "0dmhlyrw6yd7p80v7anz5nrd28bcrhq27vzy605dinddvncjn13q"; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "Manage secret values in-repo via public key cryptography"; + homepage = "https://github.com/fpco/amber"; + license = licenses.mit; + maintainers = with maintainers; [ psibi ]; + mainProgram = "amber"; + }; +} diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index baca0ed8b771..64bb10cb8bf2 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.8.4"; + version = "0.8.6"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-9e7O9SE7e8D6ULXhICabNCrL+QTH55jQm0AI7DVteE0="; + sha256 = "sha256-XvugcpoFQhdCBBg7hOgsUzSn4ad7RUuAEkvyiPLg4Lw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index d02ac5503afd..4d8107902e6e 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SdN8M3Mr3bywpBUwIVOIctYdkueq/0no4wlI7Ft8Uws="; + sha256 = "1rn4qys3af41f40zr4gi23zy9gawbbjddssm95v5a4zyd5xjfr6b"; }; - vendorSha256 = "sha256-Tz96AXGMyHNHG/3JrmZvisOEty/tDhoK1ZUngDSXOcc="; + vendorSha256 = "04q9japkv41127kl0x2268n6j13y22qg1icd783cl40584ajk2am"; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76339bf5dcff..144196b8fcdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1100,6 +1100,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + amber-secret = callPackage ../tools/security/amber { + inherit (darwin.apple_sdk.frameworks) Security; + }; + inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; @@ -12358,6 +12362,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; + cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; };