diff options
97 files changed, 1267 insertions, 464 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ae60956ae9..61786ae676e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4474,7 +4474,7 @@ gordias = { name = "Gordias"; email = "gordias@disroot.org"; - github = "NotGordias"; + github = "gordiasdot"; githubId = 94724133; keys = [{ longkeyid = "ed25519/0x5D47284830FAA4FA"; diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 95c83796ece..a34bc07b6ab 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -45,7 +45,7 @@ in { Restart = "on-failure"; TimeoutStopSec = 10; - ExecStart = "${pkgs.grafana-loki}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; ProtectSystem = "strict"; ProtectHome = true; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index cd4408cef41..02485091d3a 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -88,7 +88,7 @@ let requireSignedBinaryCaches = "require-sigs"; trustedUsers = "trusted-users"; allowedUsers = "allowed-users"; - systemFeatures = "system-feature"; + systemFeatures = "system-features"; }; semanticConfType = with types; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index efc9bd39b36..e2323785149 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -569,6 +569,7 @@ in atomix five-or-more four-in-a-row + pkgs.gnome-2048 gnome-chess gnome-klotski gnome-mahjongg diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 740405493a4..b0e7702e9b8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -55,6 +55,7 @@ in borgbackup = handleTest ./borgbackup.nix {}; botamusique = handleTest ./botamusique.nix {}; bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {}; + breitbandmessung = handleTest ./breitbandmessung.nix {}; brscan5 = handleTest ./brscan5.nix {}; btrbk = handleTest ./btrbk.nix {}; buildbot = handleTest ./buildbot.nix {}; diff --git a/nixos/tests/breitbandmessung.nix b/nixos/tests/breitbandmessung.nix new file mode 100644 index 00000000000..12b1a094839 --- /dev/null +++ b/nixos/tests/breitbandmessung.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "breitbandmessung"; + meta.maintainers = with lib.maintainers; [ b4dm4n ]; + + machine = { pkgs, ... }: { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + # increase screen size to make the whole program visible + virtualisation.resolution = { x = 1280; y = 1024; }; + + test-support.displayManager.auto.user = "alice"; + + environment.systemPackages = with pkgs; [ breitbandmessung ]; + environment.variables.XAUTHORITY = "/home/alice/.Xauthority"; + + # breitbandmessung is unfree + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "breitbandmessung" ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + machine.execute("su - alice -c breitbandmessung >&2 &") + machine.wait_for_window("Breitbandmessung") + machine.wait_for_text("Breitbandmessung") + machine.wait_for_text("Datenschutz") + machine.screenshot("breitbandmessung") + ''; +}) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 761020571fa..5525c3117b7 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -306,6 +306,9 @@ let # The test cannot access the network, so any packages we # need must be included in the VM. system.extraDependencies = with pkgs; [ + brotli + brotli.dev + brotli.lib desktop-file-utils docbook5 docbook_xsl_ns @@ -315,6 +318,7 @@ let ntp perlPackages.ListCompare perlPackages.XMLLibXML + python3Minimal shared-mime-info sudo texinfo diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index b7f6bb3ee37..65ccf48e90b 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.43"; + version = "6.46"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz"; hash = { - x86_64-linux = "sha256-VQ91px9YZWbrw31fFQxS+H/6fsjkLDrYU6FtI8eSq6E="; - aarch64-linux = "sha256-x6z5+H7ASWiuNL0maNGK05VmJptHdFGRiFf6DgwlZDw="; + x86_64-linux = "sha256-cHjiO2hRK8gUaq2VfuE9GOtRJ0JyfH2rhdIbK+RxoEM="; + aarch64-linux = "sha256-j+05SdyDWzI1fekwwQ2RAGontEvppkUWPYfZEtOVXYg="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index cdfacaf92ed..31c43fb19a3 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -13,17 +13,20 @@ , nbdSupport ? !stdenv.isDarwin, libnbd , textStylingSupport ? true , dejagnu + +# update script only +, writeScript }: let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.4"; + version = "2.0"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-zgVN8pVgySEjATJwPuRJ/hMLbiWrA6psx5a7QBUGqiQ="; + sha256 = "sha256-W4Ir8+ESyftcDJqyKjCkWl1eTRbj90NgUrtyCqJrmlg="; }; outputs = [ "out" "dev" "info" "lib" "man" ]; @@ -65,6 +68,20 @@ in stdenv.mkDerivation rec { moveToOutput share/emacs "$out" ''; + passthru = { + updateScript = writeScript "update-poke" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of '<a href="...">poke 2.0</a>' + new_version="$(curl -s https://www.jemarch.net/poke | + pcregrep -o1 '>poke ([0-9.]+)</a>')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 2c3ddbf80b8..b0e26a8c7f1 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config, qmake -, python2, qtbase, qttools }: +, python3, qtbase, qttools }: mkDerivation rec { pname = "tiled"; @@ -13,7 +13,7 @@ mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ python2 qtbase qttools ]; + buildInputs = [ python3 qtbase qttools ]; meta = with lib; { description = "Free, easy to use and flexible tile map editor"; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 54efd0bf136..57439313bf2 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "16.4.0"; + version = "16.5.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "624f776478b6960adb1be565077f79aed72c95de5e995fc1216b78978c9c6857"; + sha256 = "a8ebf2560820d2d05677b9b16fc863f555dde8235b3e34acd7916eee3544eaa9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index 284339b13ee..6de5736e9ac 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -26,6 +26,9 @@ mkDerivation rec { mkdir -p $out/etc/udev/rules.d cp 60-openrgb.rules $out/etc/udev/rules.d + install -Dm444 -t "$out/share/applications" qt/OpenRGB.desktop + install -Dm444 -t "$out/share/icons/hicolor/128x128/apps" qt/OpenRGB.png + runHook postInstall ''; diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/applications/networking/breitbandmessung/default.nix new file mode 100644 index 00000000000..31f33be3867 --- /dev/null +++ b/pkgs/applications/networking/breitbandmessung/default.nix @@ -0,0 +1,153 @@ +{ lib +, stdenv +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, autoPatchelfHook +, cairo +, cups +, dbus +, dpkg +, expat +, fetchurl +, gdk-pixbuf +, glib +, gtk3 +, libdrm +, libxkbcommon +, makeWrapper +, mesa +, nixosTests +, nspr +, nss +, pango +, pciutils +, systemd +, undmg +, writeShellScriptBin +, xorg +}: + +let + inherit (stdenv.hostPlatform) system; + + version = "3.1.0"; + + # At first start, the program checks for supported operating systems by calling `lsb_release -a` + # and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy. + fake-lsb-release = writeShellScriptBin "lsb_release" '' + echo "Distributor ID: Debian" + echo "Description: Debian GNU/Linux 10 (buster)" + echo "Release: 10" + echo "Codename: buster" + ''; + + binPath = lib.makeBinPath [ + fake-lsb-release + ]; + + systemArgs = rec { + x86_64-linux = rec { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-linux.deb"; + sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + ]; + + buildInputs = runtimeDependencies; + + runtimeDependencies = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libdrm + libxkbcommon + mesa + nspr + nss + pango + pciutils + systemd + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + xorg.libxshmfence + ]; + + installPhase = '' + dpkg-deb -x $src $out + mkdir -p $out/bin + + chmod -R g-w $out + + addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung + autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung + + makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \ + --prefix PATH : ${binPath} + + mv $out/usr/share $out/share + rmdir $out/usr + + # Fix the desktop link + substituteInPlace $out/share/applications/breitbandmessung.desktop \ + --replace /opt/Breitbandmessung $out/bin + ''; + + dontAutoPatchelf = true; + dontPatchELF = true; + }; + + x86_64-darwin = { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-mac.dmg"; + sha256 = "sha256-2c8mDKJuHDSw7p52EKnJO5vr2kNTLU6r9pmGPANjE20="; + }; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications/Breitbandmessung.app + cp -R . $out/Applications/Breitbandmessung.app + runHook postInstall + ''; + }; + + aarch64-darwin = x86_64-darwin; + }.${system} or { src = throw "Unsupported system: ${system}"; }; +in +stdenv.mkDerivation ({ + pname = "breitbandmessung"; + inherit version; + + passthru.tests = { inherit (nixosTests) breitbandmessung; }; + + meta = with lib; { + description = "Broadband internet speed test app from the german Bundesnetzagentur"; + homepage = "https://www.breitbandmessung.de"; + license = licenses.unfree; + maintainers = with maintainers; [ b4dm4n ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} // systemArgs) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 74133a9d47e..5640b993013 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -171,13 +171,6 @@ let sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw="; }) ./patches/m97-ozone-wayland-fix-surface_augmenter.patch - ] ++ lib.optionals (versionRange "98" "99") [ - (githubPatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. - commit = "dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d"; - sha256 = "sha256-FH7lBQTruMzkBT2XQ+kgADmJA0AxJfaV/gvtoqfQ4a4="; - }) - ] ++ lib.optionals (versionRange "97" "99") [ (githubPatch { # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup) commit = "a84b79daa8897b822336b8f348ef4daaae07af37"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 981861d6a2f..1ea90bec07f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "98.0.4758.66", - "sha256": "06hdd2cy6mdiiwbrn2jawmcidxbf46z9wyklkm3mmzbrj1xrh0gd", - "sha256bin64": "0r1lmgvvxb1h6p20gzp8qwdfs4czvqyg6bgp4wb2aax1n0448rbr", + "version": "98.0.4758.74", + "sha256": "01v9bfq3905zqhyp78zq69ipz2b5ldsrm8yjr9qb6434zrhlcvyb", + "sha256bin64": "0p85zanpmlkxc34zhx2rybbwriwqbjmg27rrjcf76gvfljlj3g51", "deps": { "gn": { "version": "2021-12-07", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a5e92bedef6..00175a19aec 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, buildEnv , buildGoModule , fetchFromGitHub , makeWrapper @@ -102,16 +101,35 @@ let terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) else - lib.appendToName "with-plugins" (buildEnv { + lib.appendToName "with-plugins" (stdenv.mkDerivation { inherit (terraform) name meta; - paths = actualPlugins; nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - mkdir -p $out/bin + + buildCommand = '' + # Create wrappers for terraform plugins because Terraform only + # walks inside of a tree of files. + for providerDir in ${toString actualPlugins} + do + for file in $(find $providerDir/libexec/terraform-providers -type f) + do + relFile=''${file#$providerDir/} + mkdir -p $out/$(dirname $relFile) + cat <<WRAPPER > $out/$relFile + #!${runtimeShell} + exec "$file" "$@" + WRAPPER + chmod +x $out/$relFile + done + done + + # Create a wrapper for terraform to point it to the plugins dir. + mkdir -p $out/bin/ makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \ --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ --prefix PATH : "${lib.makeBinPath wrapperInputs}" ''; + + inherit passthru; }); in withPlugins (_: [ ]); diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index c9cc9f901a3..e373c443ea5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.5.0"; + version = "91.5.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "e1cafbd99e67e8fef346e936890a22aeadded4aa8be604607535ae933251bc1b2a3b56c2b62045b3d37ecb09999adb746157df188d1a32dfe75685f3af959b7d"; + sha512 = "5939e09b143e440efa906d95cda06826bd3a73b2edde5eed86229b8a0e4d1434519059f37d319d26978d7eea9b3906c5e1c1543a2bc2465625d5ab5438855717"; }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix deleted file mode 100644 index f46d893d894..00000000000 --- a/pkgs/applications/office/impressive/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ fetchurl, stdenv, python2, makeWrapper, lib -, SDL, ghostscript, pdftk, dejavu_fonts }: - -let - version = "0.12.1"; - pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]); -in stdenv.mkDerivation { - # This project was formerly known as KeyJNote. - # See http://keyj.emphy.de/apple-lawsuit/ for details. - - pname = "impressive"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pythonEnv ]; - - configurePhase = '' - # Let's fail at build time if the library we're substituting in doesn't - # exist/isn't marked as executable - test -x ${SDL}/lib/libSDL.so - sed -i "impressive.py" \ - -e '/^__website__/a SDL_LIBRARY = "${SDL}/lib/libSDL.so"' \ - -e 's/sdl = CDLL.*/sdl = CDLL(SDL_LIBRARY)/' \ - -e 's^FontPath =.*/usr/.*$^FontPath = ["${dejavu_fonts}/share/fonts", ""]^' - ''; - - installPhase = '' - mkdir -p "$out/bin" "$out/share/doc/impressive" "$out/share/man/man1" - mv impressive.py "$out/bin/impressive" - mv impressive.1 "$out/share/man/man1" - mv changelog.txt impressive.html license.txt "$out/share/doc/impressive" - - wrapProgram "$out/bin/impressive" \ - --prefix PATH ":" "${ghostscript}/bin:${pdftk}/bin" - ''; - - meta = { - description = "Impressive, an effect-rich presentation tool for PDFs"; - - longDescription = '' - Impressive is a program that displays presentation slides. - But unlike OpenOffice.org Impress or other similar - applications, it does so with style. Smooth alpha-blended - slide transitions are provided for the sake of eye candy, but - in addition to this, Impressive offers some unique tools that - are really useful for presentations. Read below if you want - to know more about these features. - - Creating presentations for Impressive is very simple: You just - need to export a PDF file from your presentation software. - This means that you can create slides in the application of - your choice and use Impressive for displaying them. If your - application does not support PDF output, you can alternatively - use a set of pre-rendered image files – or you use Impressive - to make a slideshow with your favorite photos. - ''; - - homepage = "http://impressive.sourceforge.net/"; - - license = lib.licenses.gpl2; - - maintainers = with lib.maintainers; [ lheckemann ]; - platforms = lib.platforms.mesaPlatforms; - }; - } diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 159e15cf247..5ee89dfa8c4 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,25 +1,31 @@ -{ lib, stdenv, fetchurl -, perl, flex, bison, python3 +{ lib, stdenv, fetchFromGitHub +, perl, flex, bison, python3, autoconf }: stdenv.mkDerivation rec { pname = "verilator"; - version = "4.210"; + version = "4.218"; - src = fetchurl { - url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "sha256-KoIfJeV2aITnwiB2eQgQo4ZyXfMe6erFiGKXezR+IBg="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FukC60z7Y3bb3I/dgzqCh6kFP6DDBOGi0M8IIZ50P3g="; }; enableParallelBuilding = true; buildInputs = [ perl ]; - nativeBuildInputs = [ flex bison python3 ]; + nativeBuildInputs = [ flex bison python3 autoconf ]; # these tests need some interpreter paths patched early on... # see https://github.com/NixOS/nix/issues/1205 doCheck = false; checkTarget = "test"; + preConfigure = '' + autoconf + ''; + postPatch = '' patchShebangs \ src/flexfix \ diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index e0e26b804f5..ffd5fdaab7c 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,18 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, git, gnupg, installShellFiles }: +{ lib +, stdenv +, resholvePackage +, fetchFromGitHub +, git +, bash +, openssl +, gawk +/* +TODO: yadm can use git-crypt and transcrypt +but it does so in a way that resholve 0.6.0 +can't yet do anything smart about. It looks +like these are for interactive use, so the +main impact should just be that users still +need both of these packages in their profile +to support their use in yadm. +*/ +# , git-crypt +# , transcrypt +, j2cli +, esh +, gnupg +, coreutils +, gnutar +, installShellFiles +, runCommand +, yadm +}: -stdenv.mkDerivation rec { +resholvePackage rec { pname = "yadm"; version = "3.1.1"; - buildInputs = [ git gnupg ]; - nativeBuildInputs = [ installShellFiles ]; src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk="; + hash = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk="; }; dontConfigure = true; @@ -31,6 +56,72 @@ stdenv.mkDerivation rec { --bash completion/bash/yadm ''; + solutions = { + yadm = { + scripts = [ "bin/yadm" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + git + gnupg + openssl + gawk + # see head comment + # git-crypt + # transcrypt + j2cli + esh + bash + coreutils + gnutar + ]; + fake = { + external = if stdenv.isCygwin then [ ] else [ "cygpath" ]; + }; + fix = { + "$GPG_PROGRAM" = [ "gpg" ]; + "$OPENSSL_PROGRAM" = [ "openssl" ]; + "$GIT_PROGRAM" = [ "git" ]; + "$AWK_PROGRAM" = [ "awk" ]; + # see head comment + # "$GIT_CRYPT_PROGRAM" = [ "git-crypt" ]; + # "$TRANSCRYPT_PROGRAM" = [ "transcrypt" ]; + "$J2CLI_PROGRAM" = [ "j2" ]; + "$ESH_PROGRAM" = [ "esh" ]; + # not in nixpkgs (yet) + # "$ENVTPL_PROGRAM" = [ "envtpl" ]; + # "$LSB_RELEASE_PROGRAM" = [ "lsb_release" ]; + }; + keep = { + "$YADM_COMMAND" = true; # internal cmds + "$template_cmd" = true; # dynamic, template-engine + "$SHELL" = true; # probably user env? unsure + "$hook_command" = true; # ~git hooks? + "exec" = [ "$YADM_BOOTSTRAP" ]; # yadm bootstrap script + + # not in nixpkgs + "$ENVTPL_PROGRAM" = true; + "$LSB_RELEASE_PROGRAM" = true; + }; + /* + TODO: these should be dropped as fast as they can be dealt + with properly in binlore and/or resholve. + */ + execer = [ + "cannot:${j2cli}/bin/j2" + "cannot:${esh}/bin/esh" + "cannot:${git}/bin/git" + "cannot:${gnupg}/bin/gpg" + ]; + }; + }; + + passthru.tests = { + minimal = runCommand "${pname}-test" {} '' + export HOME=$out + ${yadm}/bin/yadm init + ''; + }; + meta = { homepage = "https://github.com/TheLocehiliosan/yadm"; description = "Yet Another Dotfiles Manager"; @@ -40,6 +131,7 @@ stdenv.mkDerivation rec { * Provides a way to use alternate files on a specific OS or host. * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; + changelog = "https://github.com/TheLocehiliosan/yadm/blob/${version}/CHANGES"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ abathur ]; platforms = lib.platforms.unix; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 2bed43daeed..9f88687449c 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202201200035"; + version = "202201270031"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "8d388b019028fb6fa9f0756b745331ffb9eb7c03"; - sha256 = "sha256-ymXaDmmMucTuvJRqjJv6n22e7ONRt1awtOMABFJ+Y/w="; + rev = "236a5edc951685cf11d5fcbd08d82d74bd425f92"; + sha256 = "sha256-y2hVSlfUwbbKpd2O8VBwTEL/djhXjd2XhBbDlmmqJCc="; }; installPhase = '' diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/desktops/gnome/games/gnome-2048/default.nix new file mode 100644 index 00000000000..bba3000b7f2 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-2048/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchurl +, wrapGAppsHook +, meson +, vala +, pkg-config +, ninja +, itstool +, clutter-gtk +, libgee +, gnome +, gtk3 +}: + +stdenv.mkDerivation rec { + pname = "gnome-twenty-forty-eight"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz"; + sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"; + }; + + nativeBuildInputs = [ + itstool + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + clutter-gtk + libgee + gnome.libgnome-games-support + gtk3 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-2048"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/2048"; + description = "Obtain the 2048 tile"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index ee610b26202..5f55ed5ecaf 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -340,13 +340,19 @@ def _update_package(path, target): raise ValueError("no file available for {}.".format(pname)) text = _replace_value('version', new_version, text) + # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts + # sri hashes have been the default format since nix 2.4+ + try: + sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + except subprocess.CalledProcessError: + # nix<2.4 compat + sri_hash = subprocess.check_output(["nix", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + # fetchers can specify a sha256, or a sri hash try: - text = _replace_value('sha256', new_sha256, text) + text = _replace_value('sha256', sri_hash, text) except ValueError: - # hashes from pypi are 16-bit encoded sha256's, need translate to an sri hash if used with "hash" - sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index a5057c0fbec..6975dfff24a 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SDL2_ttf"; - version = "2.0.15"; + version = "2.0.18"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; + sha256 = "sha256-cjTriINRTgGed0fHA+SndFdbGNQ1wipKKdBoy3aKIlE="; }; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin darwin.libobjc; meta = with lib; { - description = "SDL TrueType library"; + description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; platforms = platforms.unix; license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_ttf/"; + homepage = "https://github.com/libsdl-org/SDL_ttf"; }; } diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 9d21d8e06f0..c8138431a0a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -198,7 +198,10 @@ stdenv.mkDerivation rec { getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; inherit flattenInclude; - updateScript = gnome.updateScript { packageName = "glib"; }; + updateScript = gnome.updateScript { + packageName = "glib"; + versionPolicy = "odd-unstable"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index f5aba82956e..afb6c0d037c 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.4.1"; + version = "1.4.3"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iZGWteZvA7jiXwRqemWM0qaFG+y4Py1VNFqzKBZV3Aw="; + sha256 = "sha256-FO2nd5NNot90PQckiZM72YETMre1v0Fia4Ay77KLM7o="; }; patches = [ diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index e5123fa61af..53aab443108 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -6,13 +6,13 @@ let in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.12"; + version = "0.12.4"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "0ayhp3ym30hzp5f6dz7mmp9hpxf6a48nx3kq5crcmzycm5fllbn7"; + sha256 = "sha256-CZZ5/uCls2tY3PKmD+hBBvp7d7KX8nZuCPf03sa4iXc="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index e987e5a892c..7443ec4c502 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -13,12 +13,12 @@ , libsoup , gtk4 , xvfb-run -, unstableGitUpdater +, gnome }: stdenv.mkDerivation rec { pname = "libshumate"; - version = "unstable-2021-10-06"; + version = "1.0.0.alpha.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libshumate"; - rev = "7a0a03f299881e8faaac7d904cc47b74795ae5dd"; - sha256 = "df8ZHn/wmkzaYH0L3E6ULUtqxqU71EqL0jSgKhWqlT8="; + rev = version; + sha256 = "4kCXFUJRglh1aIBk03MNUV8jfx0mJzIFCUDM4g9tzlg="; }; nativeBuildInputs = [ @@ -68,11 +68,14 @@ stdenv.mkDerivation rec { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput share/doc/libshumate-0.0 "$devdoc" + moveToOutput share/doc/libshumate-1.0 "$devdoc" ''; - passthru.updateScript = unstableGitUpdater { - url = meta.homepage; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 9e6cec471d4..7dee1d6b1ec 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libunibreak"; - version = "4.3"; + version = "5.0"; src = let rev_version = lib.replaceStrings ["."] ["_"] version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "adah1972"; repo = pname; rev = "libunibreak_${rev_version}"; - sha256 = "19g3ixs1ycisfdnzd8v7j5r49h0x0hshchk9qwlz4i0mjv825plx"; + sha256 = "sha256-ju+DNCzwD+y/ebLVBU96iNpE1Wt7/K0qLcZHzWGzrWQ="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index e68c60ebbdb..a711fab6314 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.10.0"; + version = "1.12.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-uJ39NQCk3scREyzXv/clmeZ9VqQZ0ABzDhS7mVR1Ccw="; + sha256 = "sha256-YjnJwVUjQQeY1mMV3mtJFxKrMACboYDz4N0HbZsAdKw="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 6ff8d54ca30..2e5ec92cf4c 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,6 +3,9 @@ , fetchurl , darwin , openssl + +# major and only downstream dependency +, vlc }: stdenv.mkDerivation rec { @@ -62,6 +65,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit vlc; + }; + meta = with lib; { homepage = "http://www.live555.com/liveMedia/"; description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 14ff06324bb..8fbe99e2a11 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -16,7 +16,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.3.3"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "v${version}"; - sha256 = "1hjdhj1y9xhq1i36r7g2lccsicbvgm7lzkyrxygs16dw11ah46mx"; + sha256 = "185lzyqimi02l6q9dazkps7nlj08lf9l730ndyk59470jivccc21"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 44748f2fdb0..f3e47bfc901 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -57,6 +57,12 @@ buildPythonPackage rec { ./fix-cython.patch ]; + # See https://github.com/NixOS/nixpkgs/issues/156957. + postPatch = '' + substituteInPlace setup.py \ + --replace "typing-extensions>=3.7.0,<4" "typing-extensions" + ''; + sourceRoot = "source/sdks/python"; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix new file mode 100644 index 00000000000..9fc959126b3 --- /dev/null +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, appdirs +, tabulate +, msgpack +, orjson +, semver +, packageurl-python +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "appthreat-vulnerability-db"; + version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "AppThreat"; + repo = "vulnerability-db"; + rev = "v${version}"; + sha256 = "sha256-fqpBnxcRBBXsjJepxDuoDbT3hk5rXAvky11sIvQS9XI="; + }; + + propagatedBuildInputs = [ + requests + appdirs + tabulate + msgpack + orjson + semver + packageurl-python + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov-append --cov-report term --cov vdb" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTests = [ + # Tests require network access + "test_bulk_search" + "test_download_recent" + ]; + + pythonImportsCheck = [ + "vdb" + ]; + + meta = with lib; { + description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; + homepage = "https://github.com/appthreat/vulnerability-db"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index bf3eab19d4f..105775a4547 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -1,25 +1,25 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib - -# pythonPackages +{ lib +, buildPythonPackage , click -, pytest -, pytest-cov -, pytest-runner +, fetchFromGitHub +, pytestCheckHook +, pythonOlder , pyyaml , six }: buildPythonPackage rec { pname = "cfn-flip"; - version = "1.2.2"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-cfn-template-flip"; rev = version; - sha256 = "05fk725a1i3zl3idik2hxl3w6k1ln0j33j3jdq1gvy1sfyc79ifm"; + hash = "sha256-1cV0mHc6+P0CbnLIMSSwNEzDB+1QzNjioH/EoIo40xU="; }; propagatedBuildInputs = [ @@ -29,27 +29,27 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest - pytest-cov - pytest-runner + pytestCheckHook ]; - checkPhase = '' - py.test \ - --cov=cfn_clean \ - --cov=cfn_flip \ - --cov=cfn_tools \ - --cov-report term-missing \ - --cov-report html + postPatch = '' + sed -i "/--cov/d" tox.ini ''; + disabledTests = [ + # TypeError: load() missing 1 required positional argument: 'Loader' + "test_flip_to_yaml_with_longhand_functions" + "test_yaml_no_ordered_dict" + ]; + + pythonImportsCheck = [ + "cfn_flip" + ]; + meta = with lib; { description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; homepage = "https://github.com/awslabs/aws-cfn-template-flip"; license = licenses.asl20; - maintainers = with maintainers; [ - kamadorueda - psyanticy - ]; + maintainers = with maintainers; [ kamadorueda psyanticy ]; }; } diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index 9b4bc575cab..1525c5ac905 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.4"; + version = "1.0.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i6ylxtw1dMtylS4m0mz6rATU1trbMpcmsB2WhD++CeM="; + hash = "sha256-2pC6sFRwgAwIEanZXe99848XMxK/lyLGxiA+UA+q3H0="; }; patches = [ diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 19c64fb5c99..9b001f743ae 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.7"; + version = "9.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2d4712b190c9df3459432af8c16f7b9c33ebc3394c1f9811a70717b530467a41"; + sha256 = "sha256-gSclZatH5r3r6o8K2gXaNlkowQxFT7h0t/0ubr3d0n0="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 5468776c72d..14ceebf0a19 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -4,6 +4,7 @@ , dill , dm-tree , fetchFromGitHub +, jaxlib , jmp , lib , pytestCheckHook @@ -31,6 +32,7 @@ buildPythonPackage rec { chex cloudpickle dm-tree + jaxlib pytestCheckHook tensorflow ]; diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix index ec968dce8ec..5b0cb293c0a 100644 --- a/pkgs/development/python-modules/elegy/default.nix +++ b/pkgs/development/python-modules/elegy/default.nix @@ -4,6 +4,7 @@ , deepmerge , dm-haiku , fetchFromGitHub +, jaxlib , lib , poetry , pytestCheckHook @@ -35,6 +36,8 @@ buildPythonPackage rec { poetry ]; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ cloudpickle deepdish diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index b8479c0f73c..b5a22858b57 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchFromGitHub +, jaxlib , keras , lib , matplotlib @@ -21,6 +22,8 @@ buildPythonPackage rec { sha256 = "0zvq0vl88hiwmss49bnm7gdmndr1dfza2bcs1fj88a9r7w9dmlsr"; }; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ matplotlib msgpack diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 3f8b2c1f814..249f0b2f302 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.27.2"; + version = "0.28.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-XBGA3wRZdl8rJ1hLLPPLK7E87Ggoly+kePbLY4x9/ZE="; + sha256 = "sha256-zYSJMP/uwgyIHdI8E7NHLaHrpAQeLpaEcXXXlzIO5ns="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/httpagentparser/default.nix b/pkgs/development/python-modules/httpagentparser/default.nix index e0c9dd09bcb..44c521ff330 100644 --- a/pkgs/development/python-modules/httpagentparser/default.nix +++ b/pkgs/development/python-modules/httpagentparser/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "httpagentparser"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "73Y9MZk912GCWs7myLNL4yuVzxZ10cc8PNNfnlKDGyY="; + sha256 = "a190dfdc5e63b2f1c87729424b19cbc49263d6a1fb585a16ac1c9d9ce127a4bf"; }; # PyPi version does not include test directory diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index da18e5a9236..635d7b48064 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.5"; + version = "2.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VXQ9lyouwAuw2iGr1m/2KFklUFgmQOP2/gwInATKB4k="; + sha256 = "sha256-ZOvp7vCvAf0AFtHogUwuUqDc5wfdXQHHJwl+4F/AI+g="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix new file mode 100644 index 00000000000..2ea3f01d2cc --- /dev/null +++ b/pkgs/development/python-modules/importlab/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, networkx +, pytestCheckHook +}: + +buildPythonPackage { + pname = "importlab"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "google"; + repo = "importlab"; + rev = "676d17cd41ac68de6ebb48fb71780ad6110c4ae3"; + sha256 = "sha256-O8y1c65NQ+19BnGnUnWrA0jYUqF+726CFAcWzHFOiHE="; + }; + + propagatedBuildInputs = [ networkx ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ "tests/test_parsepy.py" ]; + + pythonImportsCheck = [ "importlab" ]; + + meta = with lib; { + description = "A library that automatically infers dependencies for Python files"; + homepage = "https://github.com/google/importlab"; + license = licenses.mit; + maintainers = with maintainers; [ sei40kr ]; + }; +} diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 6989c4257c7..97e500eebcf 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.8.1"; + version = "3.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "db57ee517356b1bfc1603ef412f5da61eae92241ba0bcaf0851028cae424780c"; + sha256 = "c685687e3f39e1b9a3ba9c00ed9d8e88603bc8994413e84623e6c5d43214e6f8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jmp/default.nix b/pkgs/development/python-modules/jmp/default.nix index dc096b93ae4..09c41a7eded 100644 --- a/pkgs/development/python-modules/jmp/default.nix +++ b/pkgs/development/python-modules/jmp/default.nix @@ -19,10 +19,9 @@ buildPythonPackage rec { sha256 = "0hh4cmp93wjyidj48gh07vhx2kjvpwd23xvy79bsjn5qaaf6q4cm"; }; - # Wheel requires only `numpy`, but the import needs both `jax` and `jaxlib`. + # Wheel requires only `numpy`, but the import needs `jax`. propagatedBuildInputs = [ jax - jaxlib ]; pythonImportsCheck = [ @@ -30,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + jaxlib pytestCheckHook ]; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 9193d059069..36656281675 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.76"; + version = "1.2.77"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-LQo7TwD91o9j/fJ5BTNV7WoCDFXnJVy1PDObH5FiNtk="; + sha256 = "sha256-Z5YwZccyQ3LOuOf9NFuRQc8lYr6mbPp38Y4iIpD02CI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index ebd2b3f0b6b..0279261e0ed 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.15"; + version = "0.2.16"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "20fae3cf1b329451eb3cba55d6b3c5b44501db5a23e49f47bc770e7461308672"; + sha256 = "sha256-66idXGSSQaM2eDnr0cAzO5qeT+UUdG4kamofLLe94m4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix index 566540a4c97..c422278c830 100644 --- a/pkgs/development/python-modules/nengo/default.nix +++ b/pkgs/development/python-modules/nengo/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "nengo"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nengo"; repo = "nengo"; rev = "v${version}"; - sha256 = "1wkayimf2jqkbr6piikh5zd6yw8gf2qv4v4bfrprs4laa6wzh2qh"; + sha256 = "12lz8lzirxvwnpa74k9k48c64gs6gi092928rh97siya3i6gjs6i"; }; propagatedBuildInputs = [ numpy ] diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index bf0383fa153..6a3b6a9d3e6 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -22,10 +22,11 @@ buildPythonPackage rec { sha256 = "1q8cxc42a5xais2ll1l238cnn3l7w28savhgiz0lg01ilz2ysbli"; }; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ absl-py chex - jaxlib numpy ]; diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 11d677e1100..aa99d5f23f7 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.9.4"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2o2FuuvS5PW7uhxl3EGBP75CZ3dcyjPoug1k0irl51c="; + sha256 = "83bb71a7588df69ea0d77dc6524741c3a1af54ad5f421341428de648bfc03a29"; }; preCheck = '' diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 27c35abe573..4cea071d277 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.15rc1"; + version = "0.7.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ponyorm"; repo = pname; rev = "v${version}"; - hash = "sha256-EoMpVvPCwxJbNPoeF73djcaQ4lY9jRx5nJYR2A2LXoQ="; + hash = "sha256-yATIsX2nKsW5DBwg9/LznQqf+XPY3q46WZut18Sr0v0="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix new file mode 100644 index 00000000000..320e6d51c7a --- /dev/null +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pydantic +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pycfmodel"; + version = "0.13.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Skyscanner"; + repo = pname; + rev = version; + hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A="; + }; + + propagatedBuildInputs = [ + pydantic + ]; + + checkInputs = [ + httpx + pytestCheckHook + ]; + + disabledTests = [ + # Test require network access + "test_cloudformation_actions" + ]; + + pythonImportsCheck = [ + "pycfmodel" + ]; + + meta = with lib; { + description = "Model for Cloud Formation scripts"; + homepage = "https://github.com/Skyscanner/pycfmodel"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix index 7d75896397f..5b0ffade588 100644 --- a/pkgs/development/python-modules/pydash/default.nix +++ b/pkgs/development/python-modules/pydash/default.nix @@ -1,23 +1,46 @@ -{ lib, buildPythonPackage, fetchFromGitHub, mock, pytestCheckHook, invoke }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, invoke +, mock +, pytestCheckHook +, pythonOlder +, sphinx_rtd_theme +}: buildPythonPackage rec { pname = "pydash"; - version = "4.9.3"; + version = "5.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dgilland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ="; + hash = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ="; }; - patches = [ ./0001-Only-build-unit-tests.patch ]; + checkInputs = [ + invoke + mock + sphinx_rtd_theme + pytestCheckHook + ]; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov/d" setup.cfg + ''; - checkInputs = [ mock pytestCheckHook invoke ]; + pythonImportsCheck = [ + "pydash" + ]; meta = with lib; { - homepage = "https://github.com/dgilland/pydash"; - description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library."; + description = "Python utility libraries for doing stuff in a functional way"; + homepage = "https://pydash.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index b153b14c5f3..fdc7e1f6787 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "eb4b275bcdfbf947e00b27c20dfc8ebcedfc1fb1252449141eccb5c39d782440"; + sha256 = "d51619cfbd90f4bb4e8fbfe1bccd58d4f5ece9bdb78d8f33fed1776d749d5fa9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index cd07a104038..eb04881455d 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { pname = "pytest_httpserver"; inherit version; - sha256 = "87561c4fa6a7bc306d76d1979a3eb9d54eb26bfb2f3f51f1643bf3c090ce629d"; + sha256 = "6de464ba5f74628d6182ebbdcb56783edf2c9b0caf598dc35c11f014f24a3f0d"; }; propagatedBuildInputs = [ werkzeug ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 6853bddf54c..6704cb8ad00 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.1.0"; + version = "3.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7216c9100b2a17cae5cf53b4b40ee36a7262d4ead7526c5a6278d911eba74847"; + sha256 = "sha256-ytEzjB/xp5GnuueZXcYh4mx3378iW63kVqzsdRJ4KCU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index a59ec10be03..26ccb1aacc5 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -109,6 +109,8 @@ buildPythonPackage rec { "test_circular_references" # Failing wsgi test "test_session_mode_defaults_to_request_mode_in_wsgi_handler" + # Network requests to public web + "test_crumb_capture" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index 9a0cf1a30f8..145b24e5578 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "33f075dc853807e56e92d6dc404104c6ccc7fb5388d96ab943d7b349b1c924c7"; + sha256 = "c77a0702fafd367c0fdca08ca1b7e1ee10058bde3bae252f49a3836e51e54519"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 58bf190495f..d8cc7a9e011 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -3,37 +3,21 @@ , fetchFromGitHub , pytestCheckHook , requests +, pytest +, pythonOlder }: python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.1.2"; + version = "22.1.3"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "0xrajx0iij7r70ch17m4y6ydyh368dn6nbjsv74pn1x8frd686rw"; + sha256 = "1x0hy9wnifi694glwv6irhnjvwh1kgl6wn6qlk5qy4x6z6bkii24"; }; - meta = with lib; { - homepage = "https://timetagger.app"; - license = licenses.gpl3; - description = "Tag your time, get the insight"; - maintainers = with maintainers; [ matthiasbeyer ]; - }; - - checkInputs = [ - pytestCheckHook - requests - ]; - - preCheck = '' - # https://github.com/NixOS/nixpkgs/issues/12591 - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - propagatedBuildInputs = with python3Packages; [ asgineer itemdb @@ -44,4 +28,23 @@ python3Packages.buildPythonPackage rec { uvicorn ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkInputs = [ + pytestCheckHook + requests + pytest + ]; + + # fails with `No module named pytest` on python version 3.10 + doCheck = pythonOlder "3.10"; + + meta = with lib; { + homepage = "https://timetagger.app"; + license = licenses.gpl3Only; + description = "Tag your time, get the insight"; + maintainers = with maintainers; [ matthiasbeyer ]; + }; } diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index 3629b47e8a2..4eac9ddeae1 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { poetry-core ]; - # These deps are not needed for the wheel, but required during the import. + # jax is not declared in the dependencies, but is necessary. propagatedBuildInputs = [ jax - jaxlib ]; + checkInputs = [ jaxlib ]; pythonImportsCheck = [ "treeo" ]; diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index 1f4a55416d5..0b5ad0c8983 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , flax , hypothesis +, jaxlib , keras , lib , poetry-core @@ -38,6 +39,8 @@ buildPythonPackage rec { poetry-core ]; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ einops flax diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 9032b7637cb..31459b2afb5 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.42"; + version = "3.9.43"; src = fetchPypi { inherit pname version; - sha256 = "d9a6e977989f1f8344b1f86dbce0511dc431733deb0ad21ff8375f6f47282b39"; + sha256 = "f7d4adf2df0fe19ea49c5f3268c33ffe28b3be818d280bb4c113d7463c58ddf9"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index e668f324fab..f8dc74c00f9 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.3"; + version = "5.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "15d859bec0adca9edd948e94a5773c32710ee5dd4ad14ec983f08f979a821610"; + sha256 = "463c04b192108e2b3f409df8a3eaaf8d44e3e98965c11e473ed2a97da591798b"; }; # Modules doesn't have tests diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 33066483682..ecf98d75ce7 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.2.24"; - source.sha256 = "1x3czmqhlyb593ap7mxkk47idi2jnbnrpwj8xlsjdpi7iair9y62"; + version = "2.3.6"; + source.sha256 = "1531z805j3gls2x0pqp2bp1vv1rf5k7ynjl4qk72h8lpm1skqk9r"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb index 0d501bd9add..b0be71102c3 100644 --- a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb +++ b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb @@ -118,9 +118,7 @@ else source = Bundler::Source::Path.new(options) end spec = source.specs.search_all(name).first -Bundler.rubygems.with_build_args build_flags do - source.install(spec) -end +source.install(spec, :build_args => build_flags) msg = spec.post_install_message if msg diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix new file mode 100644 index 00000000000..2177c20a972 --- /dev/null +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -0,0 +1,52 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "appthreat-depscan"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "AppThreat"; + repo = "dep-scan"; + rev = "v${version}"; + hash = "sha256-HCOS8/jn7BOzDwSpenVGo6QpI/1ey6L1zBucTyqsSY4="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appthreat-vulnerability-db + defusedxml + pyyaml + rich + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov-append --cov-report term --cov depscan" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTests = [ + # Assertion Error + "test_query_metadata2" + ]; + + pythonImportsCheck = [ + "depscan" + ]; + + meta = with lib; { + description = "Tool to audit dependencies based on known vulnerabilities and advisories"; + homepage = "https://github.com/AppThreat/dep-scan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index a52a6ca8179..f6842dacec9 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -4,7 +4,6 @@ , nix-update-script , meson , ninja -, python3 , rustPlatform , pkg-config , glib @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { pname = "ashpd-demo"; - version = "0.0.1-alpha"; + version = "0.2.2"; src = let @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { owner = "bilelmoussaoui"; repo = "ashpd"; rev = version; - sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; + sha256 = "9O6XqM4oys/hXgztQQ8tTobJV8U52db/VY6FlTMUvGY="; }; in "${share}/ashpd-demo"; @@ -38,14 +37,13 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; + hash = "sha256-eFq42m16zzrUBbAqv7BsAf4VxyO93WynLjvIzKbZwnQ="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc @@ -70,13 +68,6 @@ stdenv.mkDerivation rec { # <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h> BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; - postPatch = '' - patchShebangs build-aux/meson_post_install.py - # https://github.com/bilelmoussaoui/ashpd/pull/32 - substituteInPlace build-aux/meson_post_install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - passthru = { updateScript = nix-update-script { attrPath = pname; @@ -86,7 +77,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for playing with XDG desktop portals"; homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; - broken = true; # requires older libadwaita license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 05f96c0695b..3c48506a6bf 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -25,12 +25,12 @@ let }; in stdenv.mkDerivation rec { pname = "laminar"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "ohwgiles"; repo = "laminar"; rev = version; - sha256 = "sha256-9JiFO5Vi/NT/o7v/KXZw3/P5s5qQwmQXjrQq+uUXHQk="; + sha256 = "sha256-PLnfiWpelgKhs4FNry60sm6/QdhYs76FnZ/ZcRmb4Ok="; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 31ea03a2f86..5eec86d0247 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -19,11 +19,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.71.0"; + version = "1.72.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "8LsYkzNy98qQ9niXrRCkL47Ouyd33ZICnSXx29WIWl4="; + sha256 = "FczlRevMn3VGCW+mtIqjGMNZKjsqzCGW3DQLQG7dJ8c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix new file mode 100644 index 00000000000..173de27d945 --- /dev/null +++ b/pkgs/development/tools/skjold/default.nix @@ -0,0 +1,79 @@ +{ lib +, fetchFromGitHub +, fetchpatch +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "skjold"; + version = "0.4.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "twu"; + repo = pname; + rev = "v${version}"; + hash = "sha256-xz6N7/LS3wOymh9tet8OLgsSaretzuMU4hQd+LeUPJ4="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + packaging + pyyaml + toml + ]; + + checkInputs = with python3.pkgs; [ + pytest-mock + pytest-watch + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/twu/skjold/pull/91 + (fetchpatch { + name = "switch-poetry-core.patch"; + url = "https://github.com/twu/skjold/commit/b341748c9b11798b6a5182d659a651b0f200c6f5.patch"; + sha256 = "sha256-FTZTbIudO6lYO9tLD4Lh1h5zsTeKYtflR2tbbHZ5auM="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'packaging = "^21.0"' 'packaging = "*"' \ + --replace 'pyyaml = "^5.3"' 'pyyaml = "*"' + ''; + + disabledTestPaths = [ + # Too sensitive to pass + "tests/test_cli.py" + ]; + + disabledTests = [ + # Requires network access + "pyup-werkzeug" + "test_ensure_accessing_advisories_triggers_update" + "test_ensure_accessing_advisories_triggers_update" + "test_ensure_gemnasium_update" + "test_ensure_missing_github_token_raises_usage_error" + "test_ensure_pypi_advisory_db_update" + "test_ensure_source_is_affected_single" + "test_osv_advisory_with_vulnerable_package_via_osv_api" + "urllib3" + ]; + + pythonImportsCheck = [ + "skjold" + ]; + + meta = with lib; { + description = "Tool to Python dependencies against security advisory databases"; + homepage = "https://github.com/twu/skjold"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index a276907f377..f4f51d25cce 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ov2zCINh4uH5pvhML1fgpnxFhWs680bdv9oqUESFkpw="; + sha256 = "sha256-YaQOYhnbzoLyMpEPYyGXdVTWKN8dvcpLcb++8HO51qQ="; }; - cargoSha256 = "sha256-qYz5p+3QNA/zir2M9/aWxKYOMYI01OsIWZCJ4njjFPc="; + cargoSha256 = "sha256-2+77mILB5vaiejeXJ75l5LedQ55ibq/nlEzxfbANvgI="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c3599c908ad..ce5ffb483b7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-01-19"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "845a1052f7d8c084eab15d190b62d87350f6fa37"; - sha256 = "0k16c83qn8rcg0gfmwlwlj27apj1k081yy4aqgyrkn485fdlv3sl"; + rev = "95916d1b5f171eb44faf54bb414f48856ec96aa6"; + sha256 = "14a4h0h6g8rkglhn3f77s3bil63y1vz1qnd03026r8bhzcdbqn3j"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -497,12 +497,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-01-24"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7f1b916fabbae134b37c0a5ac09f0bfc555ab010"; - sha256 = "0xmm0fikqj95m836nv8y6cyvqkn3p0iklqhqj32cxqfrvh0mbnb6"; + rev = "723d926f75680badc6cb95ba69668324833be8a3"; + sha256 = "19wxzny2xha79ajjqwya5c20nlpmn584g97i0j9y83fvcx1bljs6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -545,12 +545,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-08-21"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "a2fb69aabbe2bbbf1fd08d34c168f2348a4af493"; - sha256 = "1fd6pk0vl8il42d53rzddlbbk5r4k0gz95bk964pc81z38bmskcw"; + rev = "6d0254b845e1cf42ee778763190f852b6d013dc3"; + sha256 = "15z2mfjgpr36bqady1ijvaha41d1rfw5prcwr9czcmh2iaphp2j8"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -773,12 +773,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-01-20"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "276f3a5e43465c479164f00258f7454ff0b4d3a1"; - sha256 = "145gpizsa28g3rd872hxflnw644k9ki5qvw9012yjrfm5n8mmfcp"; + rev = "2a051347190a22b738e9784426199b9db745e1da"; + sha256 = "1z3imhw4jgswd957aqhf1yf5dihb1k9dfd22abshziv45fb0fggy"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -881,12 +881,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-01-14"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "eae915d529503a7a281e2e80aaa0bcb7ef04a576"; - sha256 = "18pfamaczbcpf35dh2sn9cp1wd6fha882qpbzvhx8qrvhjdz0n2a"; + rev = "80a1100866354d2e057fb5a7ef979978b5990ecc"; + sha256 = "1jqx2195c01im5gnp5knqwgrb9fkxsasb9m54s8c2vhqg7i7j7pg"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -917,12 +917,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-01-22"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "5b8cc589540e82e6862b2948924f06461261a09a"; - sha256 = "0j1v9nckv86b4z2pz6b9kssp59fl3da9hyadjplnqgilbbcqplxm"; + rev = "873b5942be70bb00541b995d501ac7c96ae5b185"; + sha256 = "181drp1dyrprfv7ljprmyh1mn1nqdqw4c2lb4kna5qh9bfg6051i"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -990,12 +990,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-01-02"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "90df2f87c0b17193d073d1f72cea2e528e5b162d"; - sha256 = "1zrmcmz7vr74pamr8ig7a4r0y9jqjs2rh4zd66gx67ccf4bjapsy"; + rev = "7365bfe9fc6dc004cc97b8977aa8129999d81bf5"; + sha256 = "160pd7d2n66p3nxjp80sm6qhxlcmsg6nlv79ssyi9sxh1z27qm0l"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1182,24 +1182,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-01-24"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "c878e9f1886f86a0210753fa9c146b2e863d84bc"; - sha256 = "1nhzj0pslfzzski3z0synv5vpacfbx359ggsq1z5d9cyapsxchkx"; + rev = "120fcb4231fb8f9852a7c366c183b300ffcf5aef"; + sha256 = "0b29qdgwglj84m4brpn3ic6pdky3xhjnw3mgb97slb7vqkpq450y"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-01-23"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "a036b5e3c15baeda71bd76f4b7e9d3de9a057e42"; - sha256 = "1i2yygw4j6g7zihcbja58k2qh0sdn3mqbx277k91bdkf4y1hjdxd"; + rev = "9d386079d0fb5598598a3bbbe62cfba96e764ce2"; + sha256 = "0rg97cqp91cj6czhs6fjk5xw1ydxazvm3dqn01n7l2bngbx44b0j"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1314,12 +1314,12 @@ final: prev: dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2021-08-17"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "08764627ce85fc0c0bf9d8fd11b3cf5fc05d58ba"; - sha256 = "0fqjgnpc6zajqr4pd3hf73fg0cjx7cnkhz6cjdf5mvjwllgv92gp"; + rev = "42e6f57f2404b882cb7e491d50e525f8a8eb7f1f"; + sha256 = "1lla0ldgayryib0868zl10dz6yy9dxa0k86fxl5sr6y0csfpi23z"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -1906,12 +1906,12 @@ final: prev: fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2021-09-30"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "eee93cca626fdcdfae0ddcc6f8a956c85455acd3"; - sha256 = "1jm8dnr7p8k9ilc97vqrr5cx1adfhla0rc679iajg2h5ydxngfxk"; + rev = "e4a51e0f6763720ab1d1889e1ce3fa3beaaf00d3"; + sha256 = "11v3jh8qrpwpnvjj1r9z522v9bsyvxwxb8s8856a2zl6vn9caqml"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; @@ -1976,6 +1976,18 @@ final: prev: meta.homepage = "https://github.com/wincent/ferret/"; }; + fidget-nvim = buildVimPluginFrom2Nix { + pname = "fidget.nvim"; + version = "2022-01-26"; + src = fetchFromGitHub { + owner = "j-hui"; + repo = "fidget.nvim"; + rev = "66c5ba6ea5f9da9e6a9ef0da07ab594768d5bd39"; + sha256 = "0065rw25rw4r7bnh80z6bis543zynk961w28dqz7pp1x3i4h9lmg"; + }; + meta.homepage = "https://github.com/j-hui/fidget.nvim/"; + }; + file-line = buildVimPluginFrom2Nix { pname = "file-line"; version = "2016-10-21"; @@ -2075,12 +2087,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-01-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "a8efb538f4be58b4f4586bc964f9f10496c05e31"; - sha256 = "0yj7ijr091jsd8rny4zx34427w8v87iywysig5pgrz7iz421wib4"; + rev = "4f6bd8eb5fbe0e45d57e732783ead2c3a01f549c"; + sha256 = "07g44znpv866m1p4hms8ksvadnlhlbbgfx2b8q0kqjidn674z2gy"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2207,12 +2219,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-12-10"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "b6027756f5bdfaaa24b26c5472f8904f78e86c3e"; - sha256 = "0w0nvf1ha065d16zlgqf77rvf52qs350zzy2rb4b741h1fk34v59"; + rev = "dad100bf745aef2739c56ac53c7d34c84956c0eb"; + sha256 = "0bsgmjxdl2vcf786qibksg8psh5zmmvf6cx4x7nkamc4xpy67jhp"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -2255,12 +2267,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-01-19"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "d0c1ad8cdb6ad9455f9e084e55c6e411bdb03b49"; - sha256 = "0mavqgxf4ryd5p101c7nzzaxhpcpxlrzlr2mznfg23i1a36ibzxy"; + rev = "d1412ddfadc845f6a98789d7583b2bd428bae14f"; + sha256 = "0r4c2a0fv8y5r97yg37p2v7v1ab6hvwrq5knn2ya29b1am6zzhi3"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2315,12 +2327,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-01-22"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f43cee333fdfeb27aae86bab73a38c5885d5c7f4"; - sha256 = "1rxx8abg4kx6n6xbg2fyw3cjixcnynkg4l00xjh4yk44bi0f65f8"; + rev = "4a2d30f5fb77750c7a42be9bb58a9cc2c6c7f31d"; + sha256 = "0w105nggv6k2b22hkhlh7j19fp6gra70i3skaq1gihhh0x0h5pav"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2351,12 +2363,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-01-20"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "df202bd09bab4b63f5f64857eb8f3411d46fdf11"; - sha256 = "1ndgrrlhw87vwy12fzvf5fhnjdsl9na1a3j4hj6slq9v48rkv87f"; + rev = "c6685381d31df262b776775b9f4252f6c7fa98d0"; + sha256 = "08f6qi6ncicw7zj9vyf08pays9sbxvzwm920i3mbkld6nmb87j39"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3012,12 +3024,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-12-21"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "5626a1f71bcc2dd7a74156f22c53734621c12433"; - sha256 = "0xr76yf5wm4mggf5993m5sywim08dg3qsgx84xck5zcqiz84i3q9"; + rev = "18dc0d630250c3d3b8cb4139bed53327aa4fed50"; + sha256 = "0cxvhinwd7afsy8jxy9c6ql9ybv1w0m8xv4dh5sl1bpybf8dsg96"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -3132,12 +3144,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-10-05"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "61c7c8668b80537aefa69654a6e5a5e63095be61"; - sha256 = "0aa7cwzaqzma1w5xyvppj6g3i8kc7199zwd4nhc9ydx9isn885sh"; + rev = "81c3ed800ce24bc09802899c1dc0c0b4d8d4f9b2"; + sha256 = "1ahbd3l2jjjjcwsvjlbr0q4vhhlsngz9jwvmrkl5a7q9c7h0y7m6"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -3887,24 +3899,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-01-17"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "d31b4251cb9985a2c21e6c6dc53decdc48954680"; - sha256 = "1j8h9gv3ilx42gm36xh9z2br3hzakf99z49s08cwfy5xvfwbm2ds"; + rev = "0d665b05efa344977208c230f164440e3a5ce52f"; + sha256 = "1ckz7lrnwgnijf6mm6dxamqhwkr0y0wswc5gcm3np37r58yc5mbh"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-01-16"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "3086635873ae37fc8e28d7de55c2969682104a7d"; - sha256 = "1kff4hzgvp5fplzzi4gkmjc99mn5h414c5g1i6i0kddk4cpmhh2z"; + rev = "c8a320359cea86834f62225849a75632258a7503"; + sha256 = "070ji1x52hj0xnmxhdncwq78fybpsvak6b8bdy19rf7grg3ddrzk"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3959,12 +3971,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-01-24"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "02b185ff04083df22d8d1f957eaee9d1d50c6684"; - sha256 = "1kqcnyk8hb80w4ngggjmhnqnpmks3bzb8l0sqh3vdxzpz2d8bpj1"; + rev = "c5f9957b00aa54cc66bcccb686e586859d44b484"; + sha256 = "1ml0zrrij6a1f42q35wv7ml36yngc9gszzq1nqqh7mdad5zszxk5"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4151,12 +4163,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-01-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "9c536aa95f80dd9f5eb08da8499fc5f6145407aa"; - sha256 = "1hcbzwyqr5zypl6v9q6b2c2y7zjvql84mc2ip07066090v6l3qx7"; + rev = "90e616ac6ee2363577cc54f87c50dd958c2e32f9"; + sha256 = "1x87d69fypz0k424xzd8vy1x4lwhgb8hkmc7mybl4bqfdwi00fhr"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4211,24 +4223,24 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-01-20"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "2ec29eda54f5bbc8856794361847729b0f724095"; - sha256 = "1fz30h6nvgy71yc6ccn6m8wbc18kz29xm11zmsxc1qlp0a6j7c59"; + rev = "5fdd8f273145f493c05eeff3d46c7538aea9f126"; + sha256 = "0fj7w8ckp8949ysxnkq9h136pkd9ddqj54rzdb2dnia59wl2i2s1"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-01-14"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "b97cc5faafb10edd8fb5b261423b2f917ba43e1b"; - sha256 = "0b1643j492v7pm9b1z6ana3pjvaf4dqz1zvbqnl5r0bmkl2bb4m4"; + rev = "a7cf7e887454b86a45243bfc3e8dbd4aa73007ba"; + sha256 = "0ri0m0l8kv78ddkf9rgh4dn2857swrnsp6lnx6svpipi38cwz3w1"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -4271,12 +4283,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-01-23"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "0adceda4fb3fdd25ff015e68ebe176268b12bb2c"; - sha256 = "1nczxn4mxnl5qylzg0kmd7jbybf856x554xv83kwhjv4zzwpaj84"; + rev = "59067dae4bf2367eb06326e419c23353722ecbec"; + sha256 = "0337mwsvd1jjjyvfg6xnmmadjw199i35wc0aiycv22kfdn7y4ybw"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4379,12 +4391,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-01-24"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "27123b1297e37109bdb2fd0cd4638621b0eab65a"; - sha256 = "0wn1jb9pfq541k7lq6qm6434p5vgd6bj7f374rn56x93nxlll1g1"; + rev = "d93104244c3834fbd8f3dd01da9729920e0b5fe7"; + sha256 = "1gn4m5ppqbhk3y5ad98kkgc72ms5xdgx6jdz3176dkd8ah6lnpf0"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4643,12 +4655,12 @@ final: prev: nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-01-11"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "fb2f9d86c036b52eaf6b7901e36a71632ceea264"; - sha256 = "13ddy2g3dlg1b9wy08bxkrq2bjmqmi4xdddrwad7jv47fwpmwgrb"; + rev = "64d233a8859e27139c55472248147114e0be1652"; + sha256 = "1isnz4pys9wdf7w4qfiyjl4a2h66b0iwnxlbs88pn0r7hc8kgr74"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; @@ -4659,8 +4671,8 @@ final: prev: src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "12a0d3a81af173a330c957ca51b81e5f66144ef8"; - sha256 = "06qxdr8dzc7i9fvn9yyjnb1yypdgj35dppivx8752c8czd5bmshw"; + rev = "c51096481dc13193991571b7132740d762902355"; + sha256 = "02gpqp2r6f6zz3mfbxhsg2hvs00yldkz5wn3snk8nyqllm13i3dm"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4799,12 +4811,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-01-24"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "91fdda9b5c3896b4b630d98292d657afa00bba2d"; - sha256 = "0qknkalnsjbyqfi9kgmscswwwck40vpwwx6cbrrk4pgkwykabi21"; + rev = "620cc936ad6b26c59bb2d888b3890bb8d06c50c7"; + sha256 = "0f2lg3dwcfvgjal1b87sgf6kvqs16h3a90w4994hp0ps9imipsp8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4847,12 +4859,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-01-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "1ce9933a1be6e16f788d51dcaa9602accfa25030"; - sha256 = "120gqzh205sx26gadilwawx761s6ibyzkbhwybfdd2f1fq832pag"; + rev = "f107174097df7ec29dfeb573ebc2ede8a1f0a067"; + sha256 = "18nwch845kfasgrjfn5asgak02s71cg4n1xxbzqdq4y3g4fvbxjq"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5087,12 +5099,12 @@ final: prev: package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-01-06"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "c862335f303c631f53a642a1ea60f15634c720fa"; - sha256 = "05n17r2grh25d6srb5lwazj790xp00l3jsyjc0drf4npyd1m424r"; + rev = "139bcf19837213d4e5d541b46f79390a75e84701"; + sha256 = "0siir143hkw87dzkmm64fdyq3raqd9k50wppjafnvdz6i1pgb7nz"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -5521,12 +5533,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-01-21"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "4f63e903fbcfa5d17fdbe6ae9b03e0b09ab5af89"; - sha256 = "0krvp2q20f6iwk33www097c2i8ah9pls6j1lmbx92n437k6sj5gj"; + rev = "d05b5c1e144f4e0617d184741338d55cb5553538"; + sha256 = "173wff2zys45s3bz14lqzm8s766ypw51gwg3qq0hxig4mb3qmyzm"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5701,12 +5713,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-01-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "c9d7de2dc3dc23d2bd6d3f1d147f40ee4c016f79"; - sha256 = "1va0zbhr7j2hym6arg4nfdgk30ypsw2k8nb6j3lfi1fj41l3lmr4"; + rev = "6c831123b78a352216adb640d34bebe355b7df15"; + sha256 = "016r63vkyb2dpc6nvnky7ypv351893pyr5d1b11wpv53s0hr5z4y"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -6462,12 +6474,12 @@ final: prev: telescope-github-nvim = buildVimPluginFrom2Nix { pname = "telescope-github.nvim"; - version = "2022-01-21"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-github.nvim"; - rev = "36df6b281eb3cb47494933a3dc44c874086fa688"; - sha256 = "1lra7c38m3amqgdlb4gnl3rnvszwzn0yv624v2h4lhax8nzzq85j"; + rev = "b46686fd5a928aaf5d433dc9e2aae7d26453f530"; + sha256 = "1dv4m8xycqq1npc99m5mdv4vh6dwcgf6p7nh1lk82kwyhz1rcw8l"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; @@ -6691,12 +6703,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-01-13"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "f23866b8fbb0703be4e15d50c814ffe496242a67"; - sha256 = "0rvsba0zr3d35dxyjk99shgn7h15r93diwnga1k4s9mcxg07fsmm"; + rev = "d2ceb2ca3268d09db3033b133c0ee4642e07f059"; + sha256 = "0ijmx8rsf8v4m32044bfzprlmbsnlphjcrzvh3jryf6sc58spx6k"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6823,12 +6835,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-01-24"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e12dd76d4a4d9d18c985bbafe8b6a55f7f8ea917"; - sha256 = "0i64rrg3q8w80hskwxsbs1a1nzbkbbwz5vs62dpd6vbi02ghkkzg"; + rev = "e98466fe8e95ceea51dae3337430accbc7a20151"; + sha256 = "0wvd4lr4mspsj8gzh4b5y5byiifyf7lkwbzn7x8g8gifx245vh9m"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -7543,12 +7555,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-01-21"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "7aa3959cad43302601d530671808f1b9cd1b5233"; - sha256 = "07298d5fzsg1jyvwiqpphn9add0ihvk0cdhmsvz3zvabh32mx8lz"; + rev = "5ce5ea352432acfe8e9a15ee86dfe623e28b96f6"; + sha256 = "1yh0iqcq6v5gj9bm2ni58bh69cy4y6ihlmp8x49lsr2jv9x4hck9"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8059,12 +8071,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-10-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "8ace05a9a4e225d103a9c06f6d5148d0e07408df"; - sha256 = "0b3lk6z5l3bmxkh4syk8jrqh9s0d4kikna23990f3j06k141k6gp"; + rev = "ff7a1223dfc5386c41bb582039a90a262d488607"; + sha256 = "0a82c6vmdjfq1cjiakdxd9mz0ivqivrjcrppqpwch9rzp98qspag"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -8251,12 +8263,12 @@ final: prev: vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2021-07-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "ddceec6c457fd59bc2a9321cbf817e42aa4bfd86"; - sha256 = "0w0g0wjikvvah6fckay2slrcl7zh9f199safhfs875g6f8halj6g"; + rev = "5bd58732be452a32e923179673b94e5f1ed5dc9e"; + sha256 = "0x79nnscv11xdldb26j42w268bfhw9haph03l587j2pm5bnkd9qb"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; @@ -8347,12 +8359,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-01-13"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a93ceff61f070a095c3c712c389247a80897e3b0"; - sha256 = "0shf5l5rax465hsppswf58lypz9x80jaz74g93jlrx4xfs9k1agl"; + rev = "59529a2c3634dc1cb3956c4faaf824f5c4dd7be1"; + sha256 = "06hj3xl0xpah7hq63lxhlrr66h6prk6x30vxih8sm3ahrhmcwf9w"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8455,12 +8467,12 @@ final: prev: vim-github-dashboard = buildVimPluginFrom2Nix { pname = "vim-github-dashboard"; - version = "2018-09-03"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-github-dashboard"; - rev = "8012a2016a9e39a50081c9d5db2deb09ae4a6010"; - sha256 = "0jkr6mz5zcpbyswmiyprcbm8l93lkg5sr46r8kyds1n2vz19cf7x"; + rev = "a639ab203418210eff3e09cea820102a53e15f5b"; + sha256 = "10dw9lmii3li5hw9sfbam8b2hv19dz6cxfkadmv1xz12cqwfdlwi"; }; meta.homepage = "https://github.com/junegunn/vim-github-dashboard/"; }; @@ -8684,12 +8696,12 @@ final: prev: vim-highlightedyank = buildVimPluginFrom2Nix { pname = "vim-highlightedyank"; - version = "2022-01-15"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "9669226c6db7da5fe96f9ea069f9db254a299796"; - sha256 = "079mhfiqkgn789wl18xd03307k28ixyz37rx6vd2nh0gsfscwf25"; + rev = "ff16bf3bac23fb4e17c976f4e1ff7941cd686c8d"; + sha256 = "0slnykqkbqnncz0vjwhf9p9x8wi5p8xfv485wbip1njd6vqhd965"; }; meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; @@ -9322,12 +9334,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-01-19"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "43483d27bc7abdd8f7c8c71f4d0bbf56d62e0461"; - sha256 = "0py53inwl5csh8aa0cnldqjq73m5yl46frgylcawkx1n99q350v6"; + rev = "07196cfb15070cb8f7f71f8ef4dfbebfc5e83304"; + sha256 = "1z6xnmvq7k0g9wxhzai61jkk5kdywj1jbmqjlm01mydn328nsqj0"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -10402,12 +10414,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-01-18"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "b14a41a070d774c562eba7ff63e5f5f6968812fc"; - sha256 = "1997ipivg7y712z2pmaqzgav6irff3gcc5vw809k8syds618w0hh"; + rev = "65ade2453342062010386e226eaa754889e2b557"; + sha256 = "005z7l99lp89lwz7y8a2gfrnby3j2macncbpprjfmnwc0f1y9wvg"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10630,12 +10642,12 @@ final: prev: vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-05-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "5695f97fc803767bf657a5e512daec19dd1fd786"; - sha256 = "0lksvgk3g2yqbm8pw8ba5f8594djh5cj795hwjhnxc8rrhl29qpq"; + rev = "6286cda3f9222bfd490fe34a00a2d8cd4925adec"; + sha256 = "1lsfxrdxqzk0pqrv6him2s4j0vl1khxa5njknsbn8bvmshv8grap"; }; meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; @@ -11111,12 +11123,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-01-21"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "e7f67547956667dd87c4c74bff2760567c3e3ab1"; - sha256 = "0v6kyjsw8ridyvvlwncprfz56iyk9rlsiva5k6sn5ir62cdwhipj"; + rev = "6fd8b9401af0597cfe8f05550d0194d057fce9c7"; + sha256 = "1j3d0fl449a539azm1ldralmijnc8qgn6c703k4qg2kzdkvpaa48"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11412,12 +11424,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-01-22"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c7c084a5215c9402f1cdfdaa662a7eaa9b67d81b"; - sha256 = "0mcd8wzq9xhidfyyir689050j2nfvwhgjp1ypnp3nib0m10n7kb8"; + rev = "5659e6ac5ffc3ae43bd401d78b3a62653a28b750"; + sha256 = "1nqq10isng6fdkxbn5bjy8c54i00h85m3m13sm0j94lzcia7qxqr"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d836b5247b8..587c93be4f7 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -277,6 +277,7 @@ itchyny/vim-gitbranch itspriddle/vim-shellcheck ivalkeen/vim-simpledb ivanov/vim-ipython +j-hui/fidget.nvim jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim jakwings/vim-pony diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 7592be483f5..1e4f50e42df 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -1,9 +1,9 @@ { stdenv, lib , kernel , fetchurl -, pkg-config, meson, ninja +, pkg-config, meson, ninja, makeWrapper , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core -, doxygen, python3 +, doxygen, python3, pciutils , withExamples ? [] , shared ? false }: @@ -20,6 +20,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ + makeWrapper doxygen meson ninja @@ -31,22 +32,27 @@ in stdenv.mkDerivation rec { buildInputs = [ jansson libbpf - libbsd libelf libpcap numactl openssl.dev zlib + python3 ] ++ lib.optionals mod kernel.moduleBuildDependencies; - # Propagated to support current DPDK users in nixpkgs which statically link - # with the framework (e.g. odp-dpdk). propagatedBuildInputs = [ + # Propagated to support current DPDK users in nixpkgs which statically link + # with the framework (e.g. odp-dpdk). rdma-core + # Requested by pkg-config. + libbsd ]; postPatch = '' patchShebangs config/arm buildtools + '' + lib.optionalString mod '' + # kernel_install_dir is hardcoded to `/lib/modules`; patch that. + sed -i "s,kernel_install_dir *= *['\"].*,kernel_install_dir = '$kmod/lib/modules/${kernel.modDirVersion}'," kernel/linux/meson.build ''; mesonFlags = [ @@ -59,30 +65,25 @@ in stdenv.mkDerivation rec { ++ lib.optional (!shared) "-Ddefault_library=static" ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" ++ lib.optional stdenv.isAarch64 "-Dmachine=generic" - ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}" + ++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; - # dpdk meson script does not support separate kernel source and installion - # dirs (except via destdir), so we temporarily link the former into the latter. - preConfigure = lib.optionalString mod '' - mkdir -p $kmod/lib/modules/${kernel.modDirVersion} - ln -sf ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ - $kmod/lib/modules/${kernel.modDirVersion} - ''; - - postBuild = lib.optionalString mod '' - rm -f $kmod/lib/modules/${kernel.modDirVersion}/build - ''; - postInstall = '' # Remove Sphinx cache files. Not only are they not useful, but they also # contain store paths causing spurious dependencies. rm -rf $out/share/doc/dpdk/html/.doctrees + + wrapProgram $out/bin/dpdk-devbind.py \ + --prefix PATH : "${lib.makeBinPath [ pciutils ]}" '' + lib.optionalString (withExamples != []) '' - find examples -type f -executable -exec install {} $out/bin \; + mkdir -p $examples/bin + find examples -type f -executable -exec install {} $examples/bin \; ''; - outputs = [ "out" ] ++ lib.optional mod "kmod"; + outputs = + [ "out" "doc" ] + ++ lib.optional mod "kmod" + ++ lib.optional (withExamples != []) "examples"; meta = with lib; { description = "Set of libraries and drivers for fast packet processing"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index e417ee6d389..52fc24e101e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2021-12-26" -, commit ? "b034dfb24fece43a7677b9a29781495aeb62767f" -, diffHash ? "0m7qrnfrcx3dki9lmsq3jk3mcrfm99djh83gwwjh401ql0cycx5p" +, date ? "2022-01-12" +, commit ? "0e6eb60f8be14b02e0a76cb330f4b22c80ec82e9" +, diffHash ? "091w4r7h93s5rv8hk65aix7l0rr4bd504mv998j7x360bqlb7vpi" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... diff --git a/pkgs/os-specific/linux/lsirec/default.nix b/pkgs/os-specific/linux/lsirec/default.nix new file mode 100644 index 00000000000..cf2da7d1648 --- /dev/null +++ b/pkgs/os-specific/linux/lsirec/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation rec { + pname = "lsirec"; + version = "unstable-2019-03-03"; + + src = fetchFromGitHub { + owner = "marcan"; + repo = "lsirec"; + rev = "2dfb6dc92649feb01a3ddcfd117d4a99098084f2"; + sha256 = "sha256-8v+KKjAJlJNpUT0poedRTQfPiDiwahrosXD35Bmh3jM="; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + install -Dm755 'lsirec' "$out/bin/lsirec" + install -Dm755 'sbrtool.py' "$out/bin/sbrtool" + + runHook postInstall + ''; + + meta = with lib; { + description = "LSI SAS2008/SAS2108 low-level recovery tool for Linux"; + homepage = "https://github.com/marcan/lsirec"; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 1ccaca42133..681d7b2ded5 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "0.11.5"; + version = "0.11.7"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+ojBVdglOTqdmWT8QPUzJRT7RgtXxEOLNC5GqP0vO6Y="; + sha256 = "sha256-7Q/mbY3Sh2Hl1iXDN/ZM3sLz0FCsYdT8QxiyCQC2qN0="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 4db534add8c..af6d6cfebb9 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { - owner = "wrouesnel"; + owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-QU/pPw0gOHF5SAET8S/v7nTPyEvBqkxwwGQ42PbQNvw="; + sha256 = "sha256-AH4nVwmNS4YtKxrWlFNqN+Q59TaSCGdoiCfpelPtJuM="; }; - vendorSha256 = "sha256-sSJjJR0wlW95I6bgzLKx4aVcqwKMRyzzWC4uz0BKLNY="; + vendorSha256 = "sha256-ST/Mc8RDEu2G6ufus8Gi7dwdBNIpaKJjn+Fw1AKCaXs="; doCheck = true; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index b69355dfa7b..69d542f4d9c 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -16,9 +16,9 @@ let owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-02Wsj2V7RNjKlkgAqj7IqyRGCxml8pw5h0vflqcGAB8="; + sha256 = "sha256-/Dn2X1VMQI1OYHmvNDlAjrLI64DFxmVmS3PeEKLFVjQ="; }; - version = "8.0.6"; + version = "8.1.1"; roleTester = rustPlatform.buildRustPackage { name = "teleport-roletester"; @@ -39,8 +39,8 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - rev = "240464d54ac498281592eb0b30c871dc3c7ce09b"; - sha256 = "sha256-8gt8x2fNh8mA1KCop5dEZmpBWBu7HsrTY5zVUlmKDgs="; + rev = "36ba49bb58dd6933d5ed5c9599e86d2b6c828137"; + sha256 = "sha256-XgH+IjTsaJUdM54Y+L8Rf/bt6y0vB4t8IcRES2EG70s="; }; in buildGo117Module rec { diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 030af847874..7d52b3a0a26 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -48,12 +48,12 @@ let in { varnish60 = common { - version = "6.0.9"; - sha256 = "1g0pwyckc0xh6ag6wj082x9wn4q6p6krjgc16fkw1arl71c18wsh"; + version = "6.0.10"; + sha256 = "1sr60wg5mzjb14y75cga836f19sbmmpgh13mwc4alyg3irsbz1bb"; }; varnish70 = (common { - version = "7.0.1"; - sha256 = "0q265fzarz5530g8lasvfpgks8z1kq1yh7rn88bn2qfly3pmpry4"; + version = "7.0.2"; + sha256 = "0q9z1iilqwbh5flfy9pl18kxv0yjs5z91c4j81z5pgyjd9d4jjjj"; }).overrideAttrs (oA: { patches = [ (fetchpatch { diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index cb8d74aa161..9e0752b5482 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2021-12-25"; + version = "unstable-2022-01-12"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "07b18011cc885f0ef5cadc299d0321322f442388"; - sha256 = "0yvdbjasl05w1afiszygrfv7hn39fxx7kcy42vk39rb6fb3xpvzy"; + rev = "7b15324de1095f3e2e423e9c53da076d208b52d5"; + sha256 = "0glpq0n1xv7ck28v0gahl1fak9dhyp04id8d1l8yxvnriyw19zxa"; }; postPatch = '' diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index fc7d909ca0d..ce3205f7b2e 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "10.96.2"; + version = "10.97.2"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4158"; - sha256 = "NK8GXCvCEnbQJWvVngB5UMOVmfsiyU4Fq0JIY9UNSjo="; + rev = "4242"; + sha256 = "ljfowjaa3whNXavrLTFVUq87nG47sykYtrtGSrZb/rE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 26d63791be8..270f508a88b 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.12.1"; + version = "8.12.2"; outputs = [ "bin" "out" "man" "dev" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-Zo1Y4pYa+o55+ASrAiDUO7SAC4zpcAniEKkTFvIoU6o="; + sha256 = "sha256-ffDJJWe/SzG+lppXEiyfXXL5KLdZgnMjv1SYnuYnh4c="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix index 3f5878472a7..7a7ac200254 100644 --- a/pkgs/tools/misc/h/default.nix +++ b/pkgs/tools/misc/h/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "h"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "zimbatm"; repo = "h"; rev = "v${version}"; - sha256 = "10y42nn9lgkwdjia74qfyf937nam4md3pkyfjinj7jybvcran4bj"; + hash = "sha256-RyQZ9F+rZ0a/90hljSyNCzYK8eA3rYJlJkV7B5NPRzY="; }; buildInputs = [ ruby ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 4dd19a7f397..4f3a4ef985b 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2021.14"; + version = "2022.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-WOG21wSbjXMc/6OHJBEKFOhvnIt+SFpZikB8XkfN32Y="; + sha256 = "sha256-v7vAj045gLHdH1kQ9oMnLLBYXu/oWOW+MS+m7w2VoW0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 7b61dcf746c..91d739679e6 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "sha256-cGG357Z0OI+aXGHWJaOPkkKUm1KcsYBvhHxNlIYlL+0="; + sha256 = "sha256-OM0kMQYYHjk17x4VmrIXyTq/DxXnTrt6oRHEdV+1+Ns="; }; # The Helm chart is go:embed'ed as a tarball in the binary. @@ -21,7 +21,7 @@ buildGoModule rec { go run ./build-aux/package_embedded_chart/main.go ${src.rev} ''; - vendorSha256 = "sha256-DzAxqSiWag9mOgPznjhMCQJhtJZo7hsezhwJBidsvJQ="; + vendorSha256 = "sha256-rl3vb5TbGnQNLfnEqj63c2h/U7UKkgPEy/zU3gmdtYU="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index ad6d02399ef..2a5708c8d05 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-zq1jpkMcq7WHc6weht2iEFMlxIJSoDreWqJCi8F+Lxs="; + sha256 = "sha256-+GiVehgU0g/rHeikSyACbTdCdpjHd8WxjkP+uxCylnY="; }; - cargoSha256 = "sha256-NcznWWMcgK4RixqvumPEQUlvIFRyYkbeTTGvjQ91ggE="; + cargoSha256 = "sha256-G3jaM6U7O+GLAiAbaWMIyh6Ksu4ypTK50s/RNe2wT3c="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 490ddcc53bf..51f09e5dc43 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -34,7 +34,7 @@ let boehmgc = boehmgc-nix; aws-sdk-cpp = aws-sdk-cpp-nix; }; -in rec { +in lib.makeExtensible (self: { nix_2_3 = (common rec { version = "2.3.16"; src = fetchurl { @@ -63,7 +63,7 @@ in rec { }; # FIXME: nix_2_6 is broken on aarch64-darwin for now. - stable = nix_2_5; + stable = self.nix_2_5; unstable = lib.lowPrio (common rec { version = "2.7"; @@ -75,4 +75,4 @@ in rec { sha256 = "sha256-aOM9MPNlnWNMobx4CuD4JIXH2poRlG8AKkuxY7FysWg="; }; }); -} +}) diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix new file mode 100644 index 00000000000..fd39847c014 --- /dev/null +++ b/pkgs/tools/security/cfripper/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cfripper"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "Skyscanner"; + repo = pname; + rev = version; + hash = "sha256-BWdXSHIicMa3PgGoF4GGAOh2LAJWt+7svMLFGhWIkn0="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + boto3 + cfn-flip + click + pluggy + pycfmodel + pydash + pyyaml + setuptools + ]; + + checkInputs = with python3.pkgs; [ + moto + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "click~=7.1.1" "click" \ + --replace "pluggy~=0.13.1" "pluggy" \ + --replace "pydash~=4.7.6" "pydash" + ''; + + disabledTestPaths = [ + # Tests are failing + "tests/test_boto3_client.py" + "tests/config/test_pluggy.py" + ]; + + pythonImportsCheck = [ + "cfripper" + ]; + + meta = with lib; { + description = "Tool for analysing CloudFormation templates"; + homepage = "https://github.com/Skyscanner/cfripper"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/extrude/default.nix b/pkgs/tools/security/extrude/default.nix new file mode 100644 index 00000000000..dbe9471bf2d --- /dev/null +++ b/pkgs/tools/security/extrude/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "extrude"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "liamg"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7gCEBhnNU5CqC5n0KP4Dd/fmddPRwNqyMFXTrRrJjfU="; + }; + + vendorSha256 = "sha256-auhRXKt5dcQ+gr3a9Wfen8/BISP17HVsIRP16sBmiZM="; + + meta = with lib; { + description = "Tool to analyse binaries for missing security features"; + homepage = "https://github.com/liamg/extrude"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 6191947ac32..829d249da5b 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ddrescue"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz"; - sha256 = "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf"; + sha256 = "sha256-5RPNOpDZgQ392RGX1AqkD23wFZe/tez9+yBd4RJ8VR8="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index 3a6686dba5f..c685ef60331 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -13,13 +13,13 @@ let link-grammar = stdenv.mkDerivation rec { pname = "link-grammar"; - version = "5.9.1"; + version = "5.10.2"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-4D/rqoIGlvR+q7Az8E1xPYSQQMJMRVeRM9HQIbjssLo="; + sha256 = "sha256-KM7HUuqg44l66WEzO2knRZ+Laf7+aMKqUnKYPX24abY="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 256ce30759b..42b4b8f59b4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -408,6 +408,7 @@ mapAliases ({ imagemagick7_light = imagemagick_light; # added 2021-02-22 imagemagick7 = imagemagick; # added 2021-02-22 imagemagick7Big = imagemagickBig; # added 2021-02-22 + impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # added 2022-01-27 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c29cec597f..391ecbbfa45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -200,6 +200,8 @@ with pkgs; fission = callPackage ../development/tools/fission { }; + appthreat-depscan = callPackage ../development/tools/appthreat-depscan { }; + authy = callPackage ../applications/misc/authy { }; avro-tools = callPackage ../development/tools/avro-tools { }; @@ -1083,6 +1085,8 @@ with pkgs; archi = callPackage ../tools/misc/archi { }; + breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; @@ -1762,7 +1766,7 @@ with pkgs; genymotion = callPackage ../development/mobile/genymotion { }; galene = callPackage ../servers/web-apps/galene { - buildGoModule = buildGo115Module; + buildGoModule = buildGo117Module; }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -2976,6 +2980,8 @@ with pkgs; eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + extrude = callPackage ../tools/security/extrude { }; + f3 = callPackage ../tools/filesystems/f3 { }; f3d = callPackage ../applications/graphics/f3d { @@ -5900,6 +5906,8 @@ with pkgs; gnirehtet = callPackage ../tools/networking/gnirehtet { }; + gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; + gnome-builder = callPackage ../applications/editors/gnome-builder { }; gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; @@ -14444,6 +14452,8 @@ with pkgs; cfr = callPackage ../development/tools/java/cfr { }; + cfripper = callPackage ../tools/security/cfripper { }; + checkra1n = callPackage ../development/mobile/checkra1n { }; checkstyle = callPackage ../development/tools/analysis/checkstyle { }; @@ -19855,6 +19865,8 @@ with pkgs; skaffold = callPackage ../development/tools/skaffold { }; + skjold = callPackage ../development/tools/skjold { }; + skalibs = skawarePackages.skalibs; skalibs_2_10 = skawarePackages.skalibs_2_10; @@ -20220,7 +20232,7 @@ with pkgs; triehash = callPackage ../tools/misc/triehash { }; trillian = callPackage ../tools/misc/trillian { - buildGoModule = buildGo115Module; + buildGoModule = buildGo117Module; }; twolame = callPackage ../development/libraries/twolame { }; @@ -21096,6 +21108,12 @@ with pkgs; buildGoModule = buildGo116Module; }; + promtail = grafana-loki.overrideAttrs (o: { + pname = "promtail"; + subPackages = ["clients/cmd/promtail"]; + CGO_ENABLED = 1; + }); + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; @@ -22606,6 +22624,8 @@ with pkgs; lockdep = callPackage ../os-specific/linux/lockdep { }; + lsirec = callPackage ../os-specific/linux/lsirec { }; + lsiutil = callPackage ../os-specific/linux/lsiutil { }; kaitai-struct-compiler = callPackage ../development/compilers/kaitai-struct-compiler { }; @@ -26526,9 +26546,6 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; - # Impressive, formerly known as "KeyJNote". - impressive = callPackage ../applications/office/impressive { }; - index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; @@ -26769,7 +26786,7 @@ with pkgs; kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; kuttl = callPackage ../applications/networking/cluster/kuttl { - buildGoModule = buildGo115Module; + buildGoModule = buildGo117Module; }; kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; @@ -33130,11 +33147,11 @@ with pkgs; neo = callPackage ../applications/misc/neo { }; - nixVersions = callPackage ../tools/package-management/nix { + nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; inherit (darwin.apple_sdk.frameworks) Security; - }; + }); nix = nixVersions.stable; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 785a78a8535..3e38ce116a4 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -288,6 +288,8 @@ in { dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; + dpdk = pkgs.dpdk.override { inherit kernel; }; + exfat-nofuse = callPackage ../os-specific/linux/exfat { }; evdi = callPackage ../os-specific/linux/evdi { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99da2711f62..ca29dee206f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -568,6 +568,8 @@ in { apptools = callPackage ../development/python-modules/apptools { }; + appthreat-vulnerability-db = callPackage ../development/python-modules/appthreat-vulnerability-db { }; + aprslib = callPackage ../development/python-modules/aprslib { }; APScheduler = callPackage ../development/python-modules/APScheduler { }; @@ -3925,6 +3927,8 @@ in { impacket = callPackage ../development/python-modules/impacket { }; + importlab = callPackage ../development/python-modules/importlab { }; + importlib-metadata = callPackage ../development/python-modules/importlib-metadata { }; importlib-resources = callPackage ../development/python-modules/importlib-resources { }; @@ -4125,6 +4129,14 @@ in { jaxlib = self.jaxlib-build; + jaxlibWithCuda = self.jaxlib-build.override { + cudaSupport = true; + }; + + jaxlibWithoutCuda = self.jaxlib-build.override { + cudaSupport = false; + }; + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; jc = callPackage ../development/python-modules/jc { }; @@ -6578,6 +6590,8 @@ in { inherit (pkgs) graphviz; }; + pycfmodel = callPackage ../development/python-modules/pycfmodel { }; + pychannels = callPackage ../development/python-modules/pychannels { }; pychart = callPackage ../development/python-modules/pychart { }; |