diff --git a/lib/default.nix b/lib/default.nix index bb99a1be8a8c..cabc1549c07b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -91,7 +91,7 @@ let concatImapStringsSep makeSearchPath makeSearchPathOutput makeLibraryPath makeBinPath optionalString hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape - escapeShellArg escapeShellArgs escapeRegex replaceChars lowerChars + escapeShellArg escapeShellArgs escapeRegex escapeXML replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast getName getVersion diff --git a/lib/strings.nix b/lib/strings.nix index a111e1e2597b..de135d1c2746 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -362,6 +362,19 @@ rec { if match "[a-zA-Z_][a-zA-Z0-9_'-]*" s != null then s else escapeNixString s; + /* Escapes a string such that it is safe to include verbatim in an XML + document. + + Type: string -> string + + Example: + escapeXML ''"test" 'test' < & >'' + => "\\[\\^a-z]\\*" + */ + escapeXML = builtins.replaceStrings + ["\"" "'" "<" ">" "&"] + [""" "'" "<" ">" "&"]; + # Obsolete - use replaceStrings instead. replaceChars = builtins.replaceStrings or ( del: new: s: diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 00eeaa2a77d7..7b3a6b4e60b8 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -246,6 +246,11 @@ runTests { }; }; + testEscapeXML = { + expr = escapeXML ''"test" 'test' < & >''; + expected = ""test" 'test' < & >"; + }; + # LISTS testFilter = { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eaee7514a166..7b2356094ea0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11508,8 +11508,8 @@ githubId = 25173827; name = "Vanilla"; keys = [{ - longkeyid = "rsa4096/0x4DFA2BDD7305E739"; - fingerprint = "5C16 5178 7DE2 EE5A AF98 3EA3 4DFA 2BDD 7305 E739"; + longkeyid = "rsa4096/0x3750028ED04FA42E"; + fingerprint = "2649 340C C909 F821 D251 6714 3750 028E D04F A42E"; }]; }; vanschelven = { diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index b84a756c2ce1..7ae8e17c78e5 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -2,22 +2,22 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.2"; + version = "3.4"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YouTube"; - sha256 = "0wmalfqnskglssq3gj6kkrq6h6c9yab503y72afhkm7n9r5c57zz"; + sha256 = "sha256-996MNByMcKq1woDGK6jsmAHS9TOoBrwSGgPmcShvTRw="; }; - patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; + postPatch = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; - propagatedBuildInputs = [ - mopidy - python3Packages.beautifulsoup4 - python3Packages.cachetools - python3Packages.youtube-dl - ]; + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + cachetools + youtube-dl + ytmusicapi + ] ++ [ mopidy ]; doCheck = false; diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index 6dd9b07bdb2a..b55cf9be3518 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub , python3Packages , gdk-pixbuf, glib, gobject-introspection, gtk3 +, libnotify , intltool , wrapGAppsHook }: @@ -20,7 +21,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - gdk-pixbuf glib + gdk-pixbuf glib libnotify ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/oxefmsynth/default.nix b/pkgs/applications/audio/oxefmsynth/default.nix index 427029f3c863..0e3e801d18ca 100644 --- a/pkgs/applications/audio/oxefmsynth/default.nix +++ b/pkgs/applications/audio/oxefmsynth/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; diff --git a/pkgs/applications/misc/lscolors/cargo.lock.patch b/pkgs/applications/misc/lscolors/cargo.lock.patch deleted file mode 100644 index 2f233a0667b8..000000000000 --- a/pkgs/applications/misc/lscolors/cargo.lock.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..3528c6c ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,153 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "ansi_term" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[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.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.86" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" -+ -+[[package]] -+name = "lscolors" -+version = "0.7.1" -+dependencies = [ -+ "ansi_term", -+ "tempfile", -+] -+ -+[[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.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" -+dependencies = [ -+ "libc", -+ "rand_chacha", -+ "rand_core", -+ "rand_hc", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "rand", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.10.2+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -+ -+[[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", -+ "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-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 85ed493da5aa..f29fdfda6c18 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -1,21 +1,15 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.7.1"; + version = "0.8.0"; - src = fetchFromGitHub { - owner = "sharkdp"; - repo = pname; - rev = "v${version}"; - sha256 = "0av3v31fvanvn59bdm9d0v9zh5lzrq0f4vqhg6xlvabkgsa8jk04"; + src = fetchCrate { + inherit version pname; + sha256 = "sha256-dwtrs9NlhJ+km2/146HMnDirWRB5Ur5LTmWdKAK03v0="; }; - cargoPatches = [ - ./cargo.lock.patch - ]; - - cargoSha256 = "0kfm1pq22dhiw138bf7jvf7amlkal90n1hc9fq44wr4chr9b2fmx"; + cargoSha256 = "sha256-vQnrLt+VSDPr61VMkYFtjSDnEt+NmWBZUd4qLzPzQBU="; meta = with lib; { description = "Rust library and tool to colorize paths using LS_COLORS"; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 812c9b72f99e..b229a56a8ca0 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,34 +1,27 @@ -{ lib, stdenv, fetchurl, cmake, libuuid, gnutls, python3, bash }: +{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils }: stdenv.mkDerivation rec { pname = "taskwarrior"; - version = "2.5.3"; + version = "2.6.0"; - srcs = [ - (fetchurl { - url = "https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz"; - sha256 = "0fwnxshhlha21hlgg5z1ad01w13zm1hlmncs274y5n8i15gdfhvj"; - }) - (fetchurl { - url = "https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/tests-${version}.tar.gz"; - sha256 = "165xmf9h6rb7l6l9nlyygj0mx9bi1zyd78z0lrl3nadhmgzggv0b"; - }) - ]; + src = fetchFromGitHub { + owner = "GothenburgBitFactory"; + repo = "taskwarrior"; + rev = "v${version}"; + sha256 = "sha256-2wVjRecfIlNFAxXFaiKfxy9zArDIYDTfDdrnSM7H8fM="; + fetchSubmodules = true; + }; - sourceRoot = "task-${version}"; - - postUnpack = '' - mv test ${sourceRoot} + postPatch = '' + substituteInPlace src/commands/CmdNews.cpp \ + --replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open" ''; - nativeBuildInputs = [ cmake libuuid gnutls ]; + nativeBuildInputs = [ cmake libuuid gnutls python3 ]; doCheck = true; preCheck = '' - find test -type f -exec sed -i \ - -e "s|/usr/bin/env python3|${python3.interpreter}|" \ - -e "s|/usr/bin/env bash|${bash}/bin/bash|" \ - {} + + patchShebangs --build test ''; checkTarget = "test"; @@ -37,15 +30,13 @@ stdenv.mkDerivation rec { ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash" mkdir -p "$out/share/fish/vendor_completions.d" ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/" - mkdir -p "$out/share/zsh/site-functions" - ln -s "../../../share/doc/task/scripts/zsh/_task" "$out/share/zsh/site-functions/" ''; meta = with lib; { description = "Highly flexible command-line tool to manage TODO lists"; homepage = "https://taskwarrior.org"; license = licenses.mit; - maintainers = with maintainers; [ marcweber ]; + maintainers = with maintainers; [ marcweber oxalica ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index fe156347c93d..6928496ae69f 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -7,6 +7,7 @@ , fribidi , harfbuzz , libunistring +, libwebp , mpg123 , openssl , pcre @@ -17,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.6.5"; + version = "1.7.1"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-ZrpgSst17jjly6UnEWmlIBYjjW9nGFs7GTbVaKpZMrM="; + sha256 = "sha256-I3U2Jh+PSF+j8Kuv5RejYwiMC1JYBpkYQGsgIFi7LL0="; fetchSubmodules = true; }; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ fribidi harfbuzz libunistring mpg123 openssl pcre SDL2 zlib ] + buildInputs = [ fribidi harfbuzz libunistring libwebp mpg123 openssl pcre SDL2 zlib ] ++ lib.optional stdenv.isDarwin AppKit; hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; @@ -60,5 +61,8 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; + # macOS SDK 10.13 or later required + # See https://github.com/NixOS/nixpkgs/issues/101229 + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 6d5d5d1bd4a3..ac85ef8a6a33 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,71 +1,8 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ callPackage }: -let generic = { channel, version, sha256, vendorSha256 }: - buildGoModule rec { - pname = "linkerd-${channel}"; - inherit version vendorSha256; - - src = fetchFromGitHub { - owner = "linkerd"; - repo = "linkerd2"; - rev = "${channel}-${version}"; - inherit sha256; - }; - - subPackages = [ "cli" ]; - runVend = true; - - preBuild = '' - env GOFLAGS="" go generate ./pkg/charts/static - env GOFLAGS="" go generate ./jaeger/static - env GOFLAGS="" go generate ./multicluster/static - env GOFLAGS="" go generate ./viz/static - ''; - - tags = [ - "prod" - ]; - - ldflags = [ - "-s" "-w" - "-X github.com/linkerd/linkerd2/pkg/version.Version=${src.rev}" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - mv $out/bin/cli $out/bin/linkerd - installShellCompletion --cmd linkerd \ - --bash <($out/bin/linkerd completion bash) \ - --zsh <($out/bin/linkerd completion zsh) \ - --fish <($out/bin/linkerd completion fish) - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/linkerd version --client | grep ${src.rev} > /dev/null - ''; - - meta = with lib; { - description = "A simple Kubernetes service mesh that improves security, observability and reliability"; - downloadPage = "https://github.com/linkerd/linkerd2/"; - homepage = "https://linkerd.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ Gonzih bryanasdev000 superherointj ]; - }; - }; -in - { - stable = generic { - channel = "stable"; - version = "2.10.2"; - sha256 = "sha256-dOD0S4FJ2lXE+1VZooi8tKvC8ndGEHAxmAvSqoWI/m0="; - vendorSha256 = "sha256-Qb0FZOvKL9GgncfUl538PynkYbm3V8Q6lUpApUoIp5s="; - }; - edge = generic { - channel = "edge"; - version = "21.9.3"; - sha256 = "0swqx4myvr24visj39icg8g90kj325pvf22bq447rnm0whq3cnyz"; - vendorSha256 = "sha256-fMtAR66TwMNR/HCVQ9Jg3sJ0XBx2jUKDG7/ts0lEZM4="; - }; - } +(callPackage ./generic.nix { }) { + channel = "stable"; + version = "2.10.2"; + sha256 = "sha256-dOD0S4FJ2lXE+1VZooi8tKvC8ndGEHAxmAvSqoWI/m0="; + vendorSha256 = "sha256-Qb0FZOvKL9GgncfUl538PynkYbm3V8Q6lUpApUoIp5s="; +} diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix new file mode 100644 index 000000000000..8f2b9cda0b9d --- /dev/null +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -0,0 +1,8 @@ +{ callPackage }: + +(callPackage ./generic.nix { }) { + channel = "edge"; + version = "21.9.3"; + sha256 = "0swqx4myvr24visj39icg8g90kj325pvf22bq447rnm0whq3cnyz"; + vendorSha256 = "sha256-fMtAR66TwMNR/HCVQ9Jg3sJ0XBx2jUKDG7/ts0lEZM4="; +} diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix new file mode 100644 index 000000000000..82172ebb9925 --- /dev/null +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -0,0 +1,59 @@ +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: + +{ channel, version, sha256, vendorSha256 }: + +buildGoModule rec { + pname = "linkerd-${channel}"; + inherit version vendorSha256; + + src = fetchFromGitHub { + owner = "linkerd"; + repo = "linkerd2"; + rev = "${channel}-${version}"; + inherit sha256; + }; + + subPackages = [ "cli" ]; + runVend = true; + + preBuild = '' + env GOFLAGS="" go generate ./pkg/charts/static + env GOFLAGS="" go generate ./jaeger/static + env GOFLAGS="" go generate ./multicluster/static + env GOFLAGS="" go generate ./viz/static + ''; + + tags = [ + "prod" + ]; + + ldflags = [ + "-s" "-w" + "-X github.com/linkerd/linkerd2/pkg/version.Version=${src.rev}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/cli $out/bin/linkerd + installShellCompletion --cmd linkerd \ + --bash <($out/bin/linkerd completion bash) \ + --zsh <($out/bin/linkerd completion zsh) \ + --fish <($out/bin/linkerd completion fish) + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/linkerd version --client | grep ${src.rev} > /dev/null + ''; + + passthru.updateScript = (./. + "/update-${channel}.sh"); + + meta = with lib; { + description = "A simple Kubernetes service mesh that improves security, observability and reliability"; + downloadPage = "https://github.com/linkerd/linkerd2/"; + homepage = "https://linkerd.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ Gonzih bryanasdev000 superherointj ]; + }; +} diff --git a/pkgs/applications/networking/cluster/linkerd/update-edge.sh b/pkgs/applications/networking/cluster/linkerd/update-edge.sh new file mode 100755 index 000000000000..0ad960edebdd --- /dev/null +++ b/pkgs/applications/networking/cluster/linkerd/update-edge.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq + +set -eu -o pipefail + +cd $(dirname "$0") + +TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \ + --silent https://api.github.com/repos/linkerd/linkerd2/releases | \ + jq 'map(.tag_name)' | grep edge | sed 's/["|,| ]//g' | sort -r | head -n1) + +VERSION=$(echo ${TAG} | sed 's/^edge-//') + +SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz) + +setKV () { + sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./edge.nix +} + +setKV version ${VERSION} +setKV sha256 ${SHA256} +setKV vendorSha256 "" # Necessary to force clean build. + +cd ../../../../../ +set +e +VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') +set -e + +if [ -n "${VENDOR_SHA256:-}" ]; then + cd - > /dev/null + setKV vendorSha256 ${VENDOR_SHA256} +else + echo "Update failed. VENDOR_SHA256 is empty." + exit 1 +fi diff --git a/pkgs/applications/networking/cluster/linkerd/update-stable.sh b/pkgs/applications/networking/cluster/linkerd/update-stable.sh new file mode 100755 index 000000000000..96280b507160 --- /dev/null +++ b/pkgs/applications/networking/cluster/linkerd/update-stable.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq + +set -eu -o pipefail + +cd $(dirname "$0") + +TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \ + --silent https://api.github.com/repos/linkerd/linkerd2/releases/latest | \ + jq -r '.tag_name') + +VERSION=$(echo ${TAG} | sed 's/^stable-//') + +SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz) + +setKV () { + sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix +} + +setKV version ${VERSION} +setKV sha256 ${SHA256} +setKV vendorSha256 "" # Necessary to force clean build. + +cd ../../../../../ +set +e +VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') +set -e + +if [ -n "${VENDOR_SHA256:-}" ]; then + cd - > /dev/null + setKV vendorSha256 ${VENDOR_SHA256} +else + echo "Update failed. VENDOR_SHA256 is empty." + exit 1 +fi diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 2040aa39cebd..7fffc5abc5b1 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.4.8"; + version = "1.5.0"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-lP6ASWizIQC3TkkIOHS6cBbgLNoGrSx/sThtl9bMjys="; + sha256 = "sha256-JY7AkTnrH/92IfUx/ujK7jMF3zwLsnEE9+/At4UnTNw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 3abc0458a00e..cd0b47a3957a 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; - rev = version; - sha256 = "sha256-p2jPpPHtOOmv0CCsXOECgMT9sqa4ZykcJwuGOSkYLaY="; + rev = "v${version}"; + sha256 = "016qpsb4dv9qb3ab3hmvk4vzf4ipr3xgmzv2cx46pxxsj0gnigd8"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - coreutils # for pwd and printf + coreutils # for printf dnsutils # for dig nettools # for hostname openssl # for openssl @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace testssl.sh \ - --replace /bin/pwd pwd \ --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" \ --replace PROG_NAME=\"\$\(basename\ \"\$0\"\)\" PROG_NAME=\"testssl.sh\" ''; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 1d08043f5ff7..f988dee102a2 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.42"; + version = "1.8.43"; src = fetchPypi { inherit pname version; - sha256 = "787f29f10d2cb7572206f874a255949d0da9a4e2ffd2bc28b94b78bb73cf05d8"; + sha256 = "685e595dc8ccf354a62b354b5ef4b1f9558c4b76b1216a093dd1cc1fae37dd27"; }; postPatch = '' diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index bc8396a7a214..2cb310109ba4 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.55.2"; + version = "0.60"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "0r7w58r80yblyzlh6qb57pmafxb3frg1iny644bfr3p64j4cbzzb"; + sha256 = "1zhl9yhx0dzkzc31i60lmcrizq8f3rkc7dbng5fal6iy8dwhnkmg"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/themes/venta/default.nix b/pkgs/data/themes/venta/default.nix index f536358d5dc8..1f739c660060 100644 --- a/pkgs/data/themes/venta/default.nix +++ b/pkgs/data/themes/venta/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "venta"; - version = "0.7"; + version = "0.7.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0vgm65mb8qd6nbkkinmqb1hldksfgd6281l58y28jc5q4244l9wp"; + sha256 = "14ckkvyarq1xmf48fh47by5h3jnkmksj2n4y6zvx3aw7pfg2jc51"; }; buildInputs = [ diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 09e97a65e664..d3ff6f48fef6 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,11 +9,11 @@ let in mkDerivation rec { pname = "supercollider"; - version = "3.12.0"; + version = "3.12.1"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"; - sha256 = "sha256-RgCL50pyjNgy+H+Crvfgds86pmTao2FS+IF3gRHu5NM="; + sha256 = "sha256-neYId2hJRAMx4+ZFm+5TzYuUbMRfa9icyqm2UYac/Cs="; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index e4a053601833..ec6e489f2845 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , perl , libtool @@ -16,8 +17,7 @@ stdenv.mkDerivation { sha256 = "0r6yimzbkgrsi9aaxwvxahai2lzgjd1ysblr6m6by5w459853q3n"; }; - buildInputs = [ perl ]; - nativeBuildInputs = [ libtool ]; + nativeBuildInputs = [ perl libtool ]; makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/development/libraries/py3c/default.nix index eec051f0cc1c..e46d01d0627a 100644 --- a/pkgs/development/libraries/py3c/default.nix +++ b/pkgs/development/libraries/py3c/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "04i2z7hrig78clc59q3i1z2hh24g7z1bfvxznlzxv00d4s57nhpi"; }; - postPatch = lib.optionalString stdenv.cc.isClang '' + postPatch = '' + # clang and gcc-11 complain about 'register' keywords used by + # python-2.7. Let's avoid blanket -Werror. substituteInPlace test/setup.py \ --replace "'-Werror', " "" ''; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 159625810bf0..db1312b5ccec 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -387,18 +387,19 @@ let }; vega-lite = super.vega-lite.override { - # npx tries to install vega from scratch at vegalite runtime if it - # can't find it. We thus replace it with a direct call to the nix - # derivation. This might not be necessary anymore in future vl - # versions: https://github.com/vega/vega-lite/issues/6863. postInstall = '' - substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2pdf \ - --replace "npx -p vega vg2pdf" "${self.vega-cli}/bin/vg2pdf" - substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2svg \ - --replace "npx -p vega vg2svg" "${self.vega-cli}/bin/vg2svg" - substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2png \ - --replace "npx -p vega vg2png" "${self.vega-cli}/bin/vg2png" + cd node_modules + for dep in ${self.vega-cli}/lib/node_modules/vega-cli/node_modules/*; do + if [[ ! -d $dep ]]; then + ln -s "${self.vega-cli}/lib/node_modules/vega-cli/node_modules/$dep" + fi + done ''; + passthru.tests = { + simple-execution = pkgs.callPackage ./package-tests/vega-lite.nix { + inherit (self) vega-lite; + }; + }; }; webtorrent-cli = super.webtorrent-cli.override { diff --git a/pkgs/development/node-packages/package-tests/vega-lite.nix b/pkgs/development/node-packages/package-tests/vega-lite.nix new file mode 100644 index 000000000000..5be356f0683f --- /dev/null +++ b/pkgs/development/node-packages/package-tests/vega-lite.nix @@ -0,0 +1,24 @@ +{ runCommand, vega-lite }: + +let + inherit (vega-lite) packageName version; +in + +runCommand "${packageName}-tests" { meta.timeout = 60; } + '' + # get version of installed program and compare with package version + claimed_version="$(${vega-lite}/bin/vl2vg --version)" + if [[ "$claimed_version" != "${version}" ]]; then + echo "Error: program version does not match package version ($claimed_version != ${version})" + exit 1 + fi + + # run dummy commands + ${vega-lite}/bin/vl2vg --help > /dev/null + ${vega-lite}/bin/vl2svg --help > /dev/null + ${vega-lite}/bin/vl2png --help > /dev/null + ${vega-lite}/bin/vl2pdf --help > /dev/null + + # needed for Nix to register the command as successful + touch $out + '' diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix new file mode 100644 index 000000000000..e49fda936c83 --- /dev/null +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -0,0 +1,52 @@ +{ lib +, anyio +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, pytestCheckHook +, pythonOlder +, trio +}: + +buildPythonPackage rec { + pname = "asyncclick"; + version = "8.0.1.3"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-trio"; + repo = pname; + rev = version; + sha256 = "03b8zz8i3aqzxr3ffzb4sxnrcm3gsk9r4hmr0fkml1ahi754bx2r"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + anyio + ]; + + checkInputs = [ + pytestCheckHook + trio + ]; + + disabledTests = [ + # RuntimeWarning: coroutine 'Context.invoke' was never awaited + "test_context_invoke_type" + ]; + + pythonImportsCheck = [ "asyncclick" ]; + + meta = with lib; { + description = "Python composable command line utility"; + homepage = "https://github.com/python-trio/asyncclick"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 82e046c7b378..4b48d74c43f7 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -1,11 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, cmake, perl, stdenv, gcc10, darwin }: +{ lib, buildPythonPackage, fetchPypi, cmake, perl, stdenv, gcc10, CoreFoundation, Security }: buildPythonPackage rec { pname = "awscrt"; - version = "0.12.3"; + version = "0.12.4"; - buildInputs = lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; # Required to suppress -Werror # https://github.com/NixOS/nixpkgs/issues/39687 @@ -23,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "441262c36b450286132fde7f110823f7ae7ae909c0f6483a0a2d56150b62f2b5"; + sha256 = "6ad69336bc5277f501bd7e33f82e11db2665370c7d279496ee39fe2f369baeb2"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 2ccba6995ade..ef63c4b9a654 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "1.2.2"; + version = "2.0.0"; disabled = isPy27; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = version; - sha256 = "1r4b4w5xhf6p4vs7yx89kighlqim9f96v2ryknmrnmblgr4kg0h1"; + sha256 = "1amlaq119mk8fa3fxi3d6vgp83vcd81mbk53jzbixacklmcsp50k"; }; patches = [ diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index 7ba0d106e25b..f87298cf0875 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "python-digitalocean"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "koalalorenzo"; repo = pname; rev = "v${version}"; - sha256 = "16fxlfpisj4rcj9dvlifs6bpx42a0sn9b07bnyzwrbhi6nfvkd2g"; + sha256 = "1c50ka4y712rr551gq3kdfw7fgfxr4w837sww6yy683yz7m1d1h8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 995db0636116..fcf2441b2e83 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "4.3.0"; + version = "4.4.0"; pname = "geoip2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "599914784cea08b50fb50c22ed6a59143b5ff2d027ba782d2d5b6f3668293821"; + sha256 = "f150bed3190d543712a17467208388d31bd8ddb49b2226fba53db8aaedb8ba89"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index d1bacfbe826a..c1fb86b951c1 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.7.1"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "v${version}"; - sha256 = "1jdgdby33fd63mnxrfv04dz4fsrikkfmc0ybwwxi816mbkml7n34"; + sha256 = "09s1409ln1x6sxsls2ndqz3piapbwf880rrhmydfm6y7hqxlmzvy"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index e1dc687f54fb..054a21f539a1 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.4.8"; + version = "1.5.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-sxPogzQW+P8yrqaaJHrQu7e0ztgwWUI0kLikcmrhYoQ="; + sha256 = "sha256-OMqCwJTsg4RMK138cKDYz+iQV0HvelGTZfE4m+UkSzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monkeyhex/default.nix b/pkgs/development/python-modules/monkeyhex/default.nix index 715665f1b1ba..f627505cbddd 100644 --- a/pkgs/development/python-modules/monkeyhex/default.nix +++ b/pkgs/development/python-modules/monkeyhex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "monkeyhex"; - version = "1.7.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "5ba913df664c34f3ce53916c83872fddf750adc78a0b0ecdd316ac3e728bb019"; + sha256 = "e2add1f7f1f620be9ccec0618342e6a9e47de50e0d2252628bffd452bfd3762b"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 2a1206bef6f9..aa8daa1a2e8d 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "0d389ef5db19ca8a30ae88fe05ba633a4623d3202d90f8dfcc81973dc28ee834"; + sha256 = "00d3cc77c3bcd8e2accaf178aa58a1d036918faa9c0f3039772cc16a470bdacc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 253ac874ea12..0bc184d138f3 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.6.2"; + version = "3.6.4"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "57d556abed621ab9be225cc6d2df1edce17572efb67a3d754630c9f8381503eb"; + sha256 = "dd7e8012af25737e6aa7bc26568a319508dca789f13e62afa09798dccc7798b5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index d64b2719f3d6..dd22bc5be65b 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "efbbfb14cf37ed7ab2c71936bae44707dfed6bb3be7ea5214e9c44c8c258c7af"; + sha256 = "a067c121654917ecbe07fbd71c807c34bbdb1ea029e269ddd11925ee7e191d3f"; }; buildInputs = [ poppler ]; diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 2027953443e5..be947f4c2ac0 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.74"; + version = "0.1.75"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-Z0226G0eivU+Uo7MShGv9xqcl1QtAmbEzhI1IBjPL5M="; + sha256 = "36b76d7269273888f61db085f3fb47e5516c4d1bd15b2b39a54305cdb6a9a8b8"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix new file mode 100644 index 000000000000..10ff6ddf6217 --- /dev/null +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -0,0 +1,72 @@ +{ lib +, asyncclick +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, importlib-metadata +, poetry-core +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, voluptuous +}: + +buildPythonPackage rec { + pname = "python-kasa"; + version = "0.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "08blmz5kg826l08pf6yrvl8gc8iz3hfb6wsfqih606dal08kdhdi"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + asyncclick + importlib-metadata + ]; + + checkInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + voluptuous + ]; + + patches = [ + # Switch to poetry-core, https://github.com/python-kasa/python-kasa/pull/226 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/python-kasa/python-kasa/commit/05c2a4a7dedbd60038e177b4d3f5ac5798544d11.patch"; + sha256 = "0cla11yqx88wj2s50s3xxxhv4nz4h3wd9pi12v79778hzdlg58rr"; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'asyncclick = "^7"' 'asyncclick = "*"' + ''; + + disabledTestPaths = [ + # Skip the examples tests + "kasa/tests/test_readme_examples.py" + ]; + + pythonImportsCheck = [ "kasa" ]; + + meta = with lib; { + description = "Python API for TP-Link Kasa Smarthome products"; + homepage = "https://python-kasa.readthedocs.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix index 5f060fd9b9e4..ade67876ea0c 100644 --- a/pkgs/development/python-modules/python-osc/default.nix +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-osc"; - version = "1.7.7"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "4c7d68a7719d9425ab2a4ee9a2b9d5a9f5b66593fb46e20e38f91e1452bea2d2"; + sha256 = "2f8c187c68d239960fb2eddcb5346a62a9b35e64f2de045b3e5e509f475ca73d"; }; pythonImportsCheck = [ "pythonosc" ]; diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 72f75e7a13a5..9b9254bdcc1a 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "qrcode"; - version = "7.3"; + version = "7.3.1"; src = fetchPypi { inherit pname version; - sha256 = "d72861b65e26b611609f0547f0febe58aed8ae229d6bf4e675834f40742915b3"; + sha256 = "375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578"; }; propagatedBuildInputs = [ six pillow pymaging_png setuptools ]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 6d32422fa09a..fb4f59c6d792 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.59.4"; + version = "2.59.6"; src = fetchPypi { inherit pname version; - sha256 = "16b325966c1a05413994831ff29e3c7656a4be947a7771541af5935b1d01c024"; + sha256 = "4bf7a6c541dbb0d29af9a7fba0159946f67974fbc8e76d2587e601d59f83fd45"; }; pythonImportsCheck = [ diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix new file mode 100644 index 000000000000..72c5595e2883 --- /dev/null +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, ronn, installShellFiles }: + +buildGoModule rec { + pname = "actionlint"; + version = "1.6.4"; + + subPackages = [ "cmd/actionlint" ]; + + src = fetchFromGitHub { + owner = "rhysd"; + repo = "actionlint"; + rev = "v${version}"; + sha256 = "1516892wikz3zda0la57s8nbm6459pf4vd123rv09s4nivznbmcx"; + }; + + vendorSha256 = "1i7442n621jmc974b73pfz1gyqw74ilpg1zz16yxqpfh5c958m7n"; + + nativeBuildInputs = [ ronn installShellFiles ]; + + postInstall = '' + ronn --roff man/actionlint.1.ronn + installManPage man/actionlint.1 + ''; + + ldflags = [ "-s" "-w" "-X github.com/rhysd/actionlint.version=${version}" ]; + + meta = with lib; { + homepage = "https://rhysd.github.io/actionlint/"; + description = "Static checker for GitHub Actions workflow files"; + changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 6ce86c44d7f9..7ac3655760b5 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.15824"; + version = "0.1.15848"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bTRtzjIm5NI89O09hMyiDVL4skkfg1C8/92IEDaIAak="; + sha256 = "sha256-JybhHglqMgQzsmloUhVgIcSMPinE9XaUljvcpdQTSx4="; }; vendorSha256 = "sha256-VOPXM062CZ6a6CJGzYTHav1OkyiH7XUHXWrRdGekaGQ="; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 76ef33f7947d..eda2bb4960c6 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,11 +15,11 @@ }: let - merlinVersion = "4.1"; + merlinVersion = "4.3.1"; hashes = { - "4.1-411" = "9e2e6fc799c93ce1f2c7181645eafa37f64e43ace062b69218e1c29ac459937d"; - "4.1-412" = "fb4caede73bdb8393bd60e31792af74b901ae2d319ac2f2a2252c694d2069d8d"; + "4.3.1-411" = "0lhxkd1wa8k3fkcnhvzlahx3g519cdi5h7lgs60khqqm8nfvfcr5"; + "4.3.1-412" = "0ah2zbj1hhrrfxp4nhfh47jsbkvm0b30dr7ikjpmvb13wa8h20sr"; }; ocamlVersionShorthand = lib.concatStrings diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 96720a549a90..24bccb05ca4b 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QN9N3o6gnr/pUTvRHxl3Wv42KxFOlRDpIr5pw2vB1x4="; + sha256 = "sha256-Op800CGzbSGwYvd18ba7Gvw2bVHeBHCQq1pmAMW9CUs="; }; - cargoSha256 = "sha256-rgiOwkbQLnaREvd5yMmipnVnl5Lqb+g+SHeP0V8XVTQ="; + cargoSha256 = "sha256-vguDrmNYtHHR8kA6GElEx8+jVj/V853o0uW6hfg/tlI="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch index 3d0324a692cc..2dbf11bdf2e3 100644 --- a/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch +++ b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch @@ -17,12 +17,12 @@ index 834f1cd..10ab1e7 100644 * parameter given to the kernel. So reserving memory from low to high - * satisfies this constraint again. Reserving 1M at 0x02600000-0x02700000 for - * the DTB leaves rest of the free RAM to the initrd starting at 0x02700000. -+ * satisfies this constraint again. Reserving 1M at 0x02e00000-0x02f00000 for -+ * the DTB leaves rest of the free RAM to the initrd starting at 0x02f00000. ++ * satisfies this constraint again. Reserving 1M at 0x03700000-0x03800000 for ++ * the DTB leaves rest of the free RAM to the initrd starting at 0x03800000. * Even with the smallest possible CPU-GPU memory split of the CPU getting - * only 64M, the remaining 25M starting at 0x02700000 should allow quite - * large initrds before they start colliding with U-Boot. -+ * only 64M, the remaining 17M starting at 0x02f00000 should allow reasonably ++ * only 64M, the remaining 9M starting at 0x03800000 should allow reasonably + * sized initrds before they start colliding with U-Boot. */ #define ENV_MEM_LAYOUT_SETTINGS \ @@ -33,10 +33,10 @@ index 834f1cd..10ab1e7 100644 - "pxefile_addr_r=0x02500000\0" \ - "fdt_addr_r=0x02600000\0" \ - "ramdisk_addr_r=0x02700000\0" -+ "scriptaddr=0x02c00000\0" \ -+ "pxefile_addr_r=0x02d00000\0" \ -+ "fdt_addr_r=0x02e00000\0" \ -+ "ramdisk_addr_r=0x02f00000\0" ++ "scriptaddr=0x03500000\0" \ ++ "pxefile_addr_r=0x03600000\0" \ ++ "fdt_addr_r=0x03700000\0" \ ++ "ramdisk_addr_r=0x03800000\0" #if CONFIG_IS_ENABLED(CMD_MMC) #define BOOT_TARGET_MMC(func) \ diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 11b580ed8a0c..3e90857d8db8 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lwan"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "lpereira"; repo = pname; rev = "v${version}"; - sha256 = "1znkcsbxw3r10prqvf2x27w1wmm9kd485pj59c364wlvqdhidwqr"; + sha256 = "sha256-Z8kiuZHLEupCKFrj8guiu9fTG7s+5KiQ6x0pg9iMy0c="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index db7b39ac5c7a..f35b1285da40 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -15,16 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ openssl zlib ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=format-truncation" - "-Wno-error=address-of-packed-member" - "-Wno-error=format-overflow" - "-Wno-error=stringop-truncation" - ]; - preBuild = '' patchShebangs build/gen_version substituteInPlace build/gen_version --replace 'git describe' 'echo ${version}' + + # drop blanket -Werror + substituteInPlace make_in/Makefile.in --replace '-Werror' "" ''; installPhase = '' diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index d3785a737f9c..f694cb935b42 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "drawterm"; - version = "unstable-2021-08-02"; + version = "unstable-2021-10-02"; src = fetchgit { url = "git://git.9front.org/plan9front/drawterm"; - rev = "a130d441722ac3f759d2d83b98eb6aef7e84f97e"; - sha256 = "R+W1XMqQqCrMwgX9lHRhxJPG6ZOvtQrU6HUsKfvfrBQ="; + rev = "c6f547e1a46ebbf7a290427fe3a0b66932d671a0"; + sha256 = "09v2vk5s23q0islfz273pqy696zhzh3gqi25hadr54lif0511wsl"; }; buildInputs = [ diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index ebb816b1887a..35d342beb1a9 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -11,13 +11,21 @@ rustPlatform.buildRustPackage rec { sha256 = "014blvrv0kk4gzga86mbk7gd5dl1szajfi972da3lrfznck1w24n"; }; - cargoSha256 = "119szaighki565w28la6qg25s3cv8wviqin9f7f9w8x2rif3ipb3"; + cargoSha256 = "sha256-Vrd5DIfhUSb3BONaUG8RypmVF+HWrlM0TodlWjOLa/c="; buildInputs = lib.optional stdenv.isDarwin Security; # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 doCheck = !stdenv.isDarwin; + # FIXME: remove when the linked-hash-map dependency is bumped upstream + cargoPatches = [ + (fetchpatch { + url = "https://github.com/imsnif/bandwhich/pull/222/commits/be06905de2c4fb91afc22d50bf3cfe5a1e8003f5.patch"; + sha256 = "sha256-FyZ7jUXK7ebXq7q/lvRSe7YdPnpYWKZE3WrSKLMjJeA="; + }) + ]; + meta = with lib; { description = "A CLI utility for displaying current network utilization"; longDescription = '' diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index bdf048273c0d..4bc181717168 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -40,6 +40,7 @@ in extraMeta.knownVulnerabilities = [ "CVE-2021-28041" + "CVE-2021-41617" ]; }; @@ -70,6 +71,7 @@ in extraMeta.knownVulnerabilities = [ "CVE-2021-28041" + "CVE-2021-41617" ]; }; } diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 719e1d9b44f3..b37b98d7efc6 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.42.1"; + version = "4.43.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "19xkbkzv9bgj68kmvrxsdqzx40vlyvzl8nn2n19hwwmkrazqgf04"; + sha256 = "sha256-kOTQQUbaRQBABopU0x36j8Qre+Ko0UecUDNN8dvFni8="; }; - vendorSha256 = "sha256-N1DYV0zSzCepkRMbcQUHqjITvmGahYKNn1uhL+csMSc="; + vendorSha256 = "sha256-7zSIAKcMwtaTvokKuLJ8orqJc2jGuaw5FglEJadeZ9I="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202109102251"; - geoipSha256 = "0qh8yf0m6sna3z5i2plbgw61q08qcfcx0l1z5bmwxijagf1yb7fa"; + geoipRev = "202109300030"; + geoipSha256 = "1d2z3ljs0v9rd10cfj8cpiijz3ikkplsymr44f7y90g4dmniwqh0"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210910080130"; - geositeSha256 = "0d6bzrs5mhca59j1w73kqw10jqkwic9ywm3jvszpd077qwh64dwn"; + geositeRev = "20211001023210"; + geositeSha256 = "02d55i1pdndwvmi4v42hnncjng517s0k06gr3yn5krnj2qfjli2w"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index f83ebc928da6..492bfd63f402 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-30"; + version = "2021-10-02"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-chGmv6zeiYKNY8oA54FmVU7RGXd+uM6MHfUQXb6YfqE="; + sha256 = "sha256-gUjFFxzkHHhNMDAgFmmIAuEACSCn1YXuauvjGAkrK6k="; }; installPhase = '' diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index cca97913913b..0871a51b6d33 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.7" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.8" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 3c744fb08433..3b799b4f9ea0 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 6dddd6d372c75acadc183f6a4efdd44e453559b4 - ref: refs/tags/6.1.7 + revision: d50b53eafca062b7270a91894e4e9de7a526aa10 + ref: refs/tags/6.1.8 specs: - metasploit-framework (6.1.7) + metasploit-framework (6.1.8) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,9 +31,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.54) + metasploit-payloads (= 2.0.58) metasploit_data_models - metasploit_payloads-mettle (= 1.0.10) + metasploit_payloads-mettle (= 1.0.13) mqtt msgpack nessus_rest @@ -127,7 +127,7 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.506.0) + aws-partitions (1.510.0) aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -232,7 +232,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-credential (5.0.4) + metasploit-credential (5.0.5) metasploit-concern metasploit-model metasploit_data_models (>= 5.0.0) @@ -246,7 +246,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.54) + metasploit-payloads (2.0.58) metasploit_data_models (5.0.4) activerecord (~> 6.0) activesupport (~> 6.0) @@ -257,7 +257,7 @@ GEM railties (~> 6.0) recog (~> 2.0) webrick - metasploit_payloads-mettle (1.0.10) + metasploit_payloads-mettle (1.0.13) method_source (1.0.0) mini_portile2 (2.6.1) minitest (5.14.4) @@ -273,7 +273,7 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.12.4) + nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) nori (2.6.0) @@ -329,7 +329,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.17) + rex-core (0.1.18) rex-encoder (0.1.6) metasm rex-arch diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 0d9216b95f2d..9d0728b0303b 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -14,13 +14,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.7"; + version = "6.1.8"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-UzWNQnDo/o296GGd+C1ImHccOMAXfE55dJDB9hw9B8s="; + sha256 = "sha256-KDexgv5rsaOyAJhaiLiU1z0st7ncwIayoqn+fvJnSng="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index f985d592ca82..d529c58ef58c 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gfp7hqflr5gd3xfvcrwdmx4zzmhr6511bflwkfvrs5rn6n5dacs"; + sha256 = "1lszcza7k1jc57pivjajz1bdgsg3bxfp60phsidv729yhjw3yzwv"; type = "gem"; }; - version = "1.506.0"; + version = "1.510.0"; }; aws-sdk-core = { groups = ["default"]; @@ -654,22 +654,22 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1czh3a3bi54l5i7j9jw4p0arf8i3y8pm08w2f995x02rk4f7x5wf"; + sha256 = "0a17zm8cq71rd8qilxai7s3dzb8n5lzvjfwyxk7slblfcgbsl9np"; type = "gem"; }; - version = "5.0.4"; + version = "5.0.5"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "6dddd6d372c75acadc183f6a4efdd44e453559b4"; - sha256 = "1jq77lfgdhchfiwlwz0pq0w1qxwq90nzi7b1x2yqvzp8f118sdak"; + rev = "d50b53eafca062b7270a91894e4e9de7a526aa10"; + sha256 = "0y2aczr7xzm9lar8dh6wp6vjqgfpjjw8hnlq02ra7cbbzs1b2dr8"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.7"; + version = "6.1.8"; }; metasploit-model = { groups = ["default"]; @@ -686,10 +686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0javwkzhfngjdhz8rn566gli3a0jd1ns6hajim1nwwwiaici2bdc"; + sha256 = "05z0lqa2w6n1nqw3k2s0cxfbqa7bf1p199gccfahjyxjn9xzhcf7"; type = "gem"; }; - version = "2.0.54"; + version = "2.0.58"; }; metasploit_data_models = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12mm3bqcirbzn7337zg96w79i6in49z2gmg41cwjywi1p2iawk61"; + sha256 = "108jm8nz4xs62k33w5frw15xadd17pbmwpczhvcpzh3bf54sihsr"; type = "gem"; }; - version = "1.0.10"; + version = "1.0.13"; }; method_source = { groups = ["default"]; @@ -857,10 +857,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sad16idsxayhaaswc3bksii1ydiqyzikl7y0ng35cn7w4g1dv3z"; + sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; type = "gem"; }; - version = "1.12.4"; + version = "1.12.5"; }; nori = { groups = ["default"]; @@ -1127,10 +1127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b0f9s18d2ax2k1xmwrvr97gxh8gfm79kfibv55fqmv846vgkkvk"; + sha256 = "1i3rn2ndf9ijgjfn3c8rpblw8lnqynm2flmfmm6dbfhjyhhawnaz"; type = "gem"; }; - version = "0.1.17"; + version = "0.1.18"; }; rex-encoder = { groups = ["default"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 019215207ac1..4f59bd7f7286 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13462,6 +13462,8 @@ with pkgs; abuild = callPackage ../development/tools/abuild { }; + actionlint = callPackage ../development/tools/analysis/actionlint { }; + adtool = callPackage ../tools/admin/adtool { }; inherit (callPackage ../development/tools/alloy { @@ -25664,9 +25666,9 @@ with pkgs; fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; - linkerd_edge = (callPackage ../applications/networking/cluster/linkerd { }).edge; - linkerd_stable = (callPackage ../applications/networking/cluster/linkerd { }).stable; - linkerd = linkerd_stable; + linkerd = callPackage ../applications/networking/cluster/linkerd { }; + linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; + linkerd_stable = linkerd; kile-wl = callPackage ../applications/misc/kile-wl { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a17fe149734..c15f5520b9b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -623,6 +623,8 @@ in { async-lru = callPackage ../development/python-modules/async-lru { }; + asyncclick = callPackage ../development/python-modules/asyncclick { }; + asynccmd = callPackage ../development/python-modules/asynccmd { }; asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; @@ -741,7 +743,9 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; - awscrt = callPackage ../development/python-modules/awscrt { }; + awscrt = callPackage ../development/python-modules/awscrt { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; + }; awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { }; @@ -5641,6 +5645,8 @@ in { python-juicenet = callPackage ../development/python-modules/python-juicenet { }; + python-kasa = callPackage ../development/python-modules/python-kasa { }; + python-keystoneclient = callPackage ../development/python-modules/python-keystoneclient { }; python-lsp-black = callPackage ../development/python-modules/python-lsp-black { };