diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index f079fba5eaac..b1c4f7b1f40a 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -121,3 +121,17 @@ c759efa5e7f825913f9a69ef20f025f50f56dc4d # python3Packages: format with nixfmt 59b1aef59071cae6e87859dc65de973d2cc595c0 + +# treewide description changes (#317959) +bf995e3641950f4183c1dd9010349263dfa0123b +755b915a158c9d588f08e9b08da9f7f3422070cc +f8c4a98e8e138e21353a2c33b90db3359f539b37 + +# vscode-extensions.*: format with nixfmt (RFC 166) +7bf9febfa6271012b1ef86647a3a06f06875fdcf + +# remove uses of mdDoc (#303841) +1a24330f792c8625746d07d842290e6fd95ae6f9 +acd0e3898feb321cb9a71a0fd376f1157d0f4553 +1b28414d2886c57343864326dbb745a634d3e37d +6afb255d976f85f3359e4929abd6f5149c323a02 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9015d8eb5051..54630cbf6837 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -108,6 +108,9 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius # NixOS QEMU virtualisation /nixos/virtualisation/qemu-vm.nix @raitobezarius +# ACME +/nixos/modules/security/acme @arianvp @flokli @aanderse # no merge permission: @m1cr0man @emilazy + # Systemd /nixos/modules/system/boot/systemd.nix @NixOS/systemd /nixos/modules/system/boot/systemd @NixOS/systemd diff --git a/nixos/modules/config/stevenblack.nix b/nixos/modules/config/stevenblack.nix index 5b85073c6908..95f6c9e73eb3 100644 --- a/nixos/modules/config/stevenblack.nix +++ b/nixos/modules/config/stevenblack.nix @@ -1,34 +1,49 @@ -{ config, lib, pkgs, ... }: - +{ + config, + lib, + pkgs, + ... +}: let - inherit (lib) optionals mkOption mkEnableOption types mkIf elem concatStringsSep maintainers; + inherit (lib) + getOutput + maintainers + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; + cfg = config.networking.stevenblack; - - # needs to be in a specific order - activatedHosts = with cfg; [ ] - ++ optionals (elem "fakenews" block) [ "fakenews" ] - ++ optionals (elem "gambling" block) [ "gambling" ] - ++ optionals (elem "porn" block) [ "porn" ] - ++ optionals (elem "social" block) [ "social" ]; - - hostsPath = "${pkgs.stevenblack-blocklist}/alternates/" + concatStringsSep "-" activatedHosts + "/hosts"; in { options.networking.stevenblack = { enable = mkEnableOption "the stevenblack hosts file blocklist"; + package = mkPackageOption pkgs "stevenblack-blocklist" { }; + block = mkOption { - type = types.listOf (types.enum [ "fakenews" "gambling" "porn" "social" ]); + type = types.listOf ( + types.enum [ + "fakenews" + "gambling" + "porn" + "social" + ] + ); default = [ ]; description = "Additional blocklist extensions."; }; }; config = mkIf cfg.enable { - networking.hostFiles = [ ] - ++ optionals (activatedHosts != [ ]) [ hostsPath ] - ++ optionals (activatedHosts == [ ]) [ "${pkgs.stevenblack-blocklist}/hosts" ]; + networking.hostFiles = map (x: "${getOutput x cfg.package}/hosts") ([ "ads" ] ++ cfg.block); }; - meta.maintainers = [ maintainers.moni maintainers.artturin ]; + meta.maintainers = with maintainers; [ + moni + artturin + frontear + ]; } diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3278fc9ef158..983d661fef52 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -38,7 +38,7 @@ let pname = "RStudio"; - version = "2024.04.1+748"; + version = "2024.04.2+764"; RSTUDIO_VERSION_MAJOR = lib.versions.major version; RSTUDIO_VERSION_MINOR = lib.versions.minor version; RSTUDIO_VERSION_PATCH = lib.versions.patch version; @@ -50,7 +50,7 @@ let owner = "rstudio"; repo = "rstudio"; rev = "v" + version; - hash = "sha256-fzxbhN9NdM0E2rxezj2BMEZ8obUbX0Zw8haDNmfAkWs="; + hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw="; }; mathJaxSrc = fetchurl { @@ -134,39 +134,29 @@ in ./pandoc-nix-path.patch ./use-system-quarto.patch ./ignore-etc-os-release.patch - - (fetchpatch { - name = "use-system-yaml-patch"; - url = "https://github.com/rstudio/rstudio/commit/04de8ca8b83dcc7fee9fd65e6ef58c372489d5ef.patch"; - hash = "sha256-FHSSOPsw6AAYBj/fgNT6idyxvRj3SG+fbla0UDjug1Y="; - }) - ]; postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} - - substituteInPlace src/cpp/CMakeLists.txt \ - --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' + substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R} substituteInPlace src/gwt/build.xml \ - --replace '@node@' ${nodejs} \ - --replace './lib/quarto' ${quartoSrc} + --replace-fail '@node@' ${nodejs} \ + --replace-fail './lib/quarto' ${quartoSrc} substituteInPlace src/cpp/conf/rsession-dev.conf \ - --replace '@node@' ${nodejs} + --replace-fail '@node@' ${nodejs} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@libclang@' ${llvmPackages.libclang.lib} \ - --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + --replace-fail '@libclang@' ${llvmPackages.libclang.lib} \ + --replace-fail '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so substituteInPlace src/cpp/session/CMakeLists.txt \ - --replace '@pandoc@' ${pandoc} \ - --replace '@quarto@' ${quarto} + --replace-fail '@pandoc@' ${pandoc} \ + --replace-fail '@quarto@' ${quarto} substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace '@pandoc@' ${pandoc}/bin \ - --replace '@quarto@' ${quarto} + --replace-fail '@pandoc@' ${pandoc}/bin \ + --replace-fail '@quarto@' ${quarto} ''; hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); @@ -189,10 +179,10 @@ in unzip -q ${mathJaxSrc} -d dependencies/mathjax-27 - # As of Chocolate Cosmos, node 18.19.1 is used for runtime + # As of Chocolate Cosmos, node 18.20.3 is used for runtime # 18.18.2 is still used for build # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780 - mkdir -p dependencies/common/node/18.19.1 + mkdir -p dependencies/common/node/18.20.3 mkdir -p dependencies/pandoc/${pandoc.version} cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4ada5d56b35e..291d337ae937 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -17167,6 +17167,18 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; + yazi-nvim = buildVimPlugin { + pname = "yazi.nvim"; + version = "2024-06-29"; + src = fetchFromGitHub { + owner = "mikavilpas"; + repo = "yazi.nvim"; + rev = "05849f390175f2ba8fd277b224d4fd9e35455895"; + sha256 = "zj+lmxsOEW+YaCk5hb7u454gACUmqYPA/IeW6av4D7k="; + }; + meta.homepage = "https://github.com/DreamMaoMao/yazi.nvim"; + }; + yescapsquit-vim = buildVimPlugin { pname = "yescapsquit.vim"; version = "2022-08-31"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 52b49f86eee1..5b69dc3dc295 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1446,6 +1446,7 @@ https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, https://github.com/gbprod/yanky.nvim/,HEAD, https://github.com/HerringtonDarkholme/yats.vim/,, +https://github.com/mikavilpas/yazi.nvim/,HEAD, https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 075a76db846a..f5d7c2cf3d5e 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "0.0.26"; + version = "1.0.0"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-c3gicJWMiMZ0Suo30XcQoWhHRE3aXdQmSD0K5y2Quec="; + hash = "sha256-onTVA/VH5GrDYBDGKbWOSFeW1RCzDooh3PJxCD39e1o="; }; - cargoHash = "sha256-Clhd8ifbT+it0EGcysJvI9O89qzee9T6EGWlcMO8osE="; + cargoHash = "sha256-63792ztjnGcAiFpHTcaI03PV4dQxhOP2eRNda8MWiqc="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix index 87031d45006b..a7e80cd17bb2 100644 --- a/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/pkgs/by-name/jd/jdt-language-server/package.nix @@ -6,15 +6,15 @@ }: let - timestamp = "202405301306"; + timestamp = "202406271335"; in stdenv.mkDerivation (finalAttrs: { pname = "jdt-language-server"; - version = "1.36.0"; + version = "1.37.0"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; - hash = "sha256-Ao4nTQb0phytT/1W+J70FKj2VhPG0F2UZ2Ubf7A9rns="; + hash = "sha256-0EzZ9N9FzoWunPSVMMcqGjJLFO7nR68m4zdFAONrW9A="; }; sourceRoot = "."; @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { # than in the original package. In addition, hard-code the path to the jdk # in the wrapper, instead of searching for it in PATH at runtime. substituteInPlace bin/jdtls.py \ - --replace "jdtls_base_path = Path(__file__).parent.parent" "jdtls_base_path = Path(\"$out/share/java/jdtls/\")" \ - --replace "java_executable = get_java_executable(known_args.validate_java_version)" "java_executable = '${lib.getExe jdk}'" + --replace-fail "jdtls_base_path = Path(__file__).parent.parent" "jdtls_base_path = Path(\"$out/share/java/jdtls/\")" \ + --replace-fail "java_executable = get_java_executable(known_args)" "java_executable = '${lib.getExe jdk}'" ''; installPhase = diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch b/pkgs/by-name/ne/nexus/nexus-bin.patch similarity index 100% rename from pkgs/development/tools/repository-managers/nexus/nexus-bin.patch rename to pkgs/by-name/ne/nexus/nexus-bin.patch diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch b/pkgs/by-name/ne/nexus/nexus-vm-opts.patch similarity index 100% rename from pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch rename to pkgs/by-name/ne/nexus/nexus-vm-opts.patch diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/by-name/ne/nexus/package.nix similarity index 55% rename from pkgs/development/tools/repository-managers/nexus/default.nix rename to pkgs/by-name/ne/nexus/package.nix index 5f8a751aa0c7..00e4e7325e04 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/by-name/ne/nexus/package.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gawk }: +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre_headless, + gawk, +}: stdenv.mkDerivation rec { pname = "nexus"; - version = "3.68.1-02"; + version = "3.69.0-02"; src = fetchurl { url = "https://download.sonatype.com/nexus/3/nexus-${version}-unix.tar.gz"; - hash = "sha256-VHS4KDFgU3djteDzDAe43TZIwRG/8bb7u3usoOCJS5M="; + hash = "sha256-7sgLPuM93mFEPlTd3qJY+FGVHErvgcTGJWwSBcqBgWI="; }; preferLocalBuild = true; @@ -15,13 +22,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - patches = [ ./nexus-bin.patch ./nexus-vm-opts.patch ]; + patches = [ + ./nexus-bin.patch + ./nexus-vm-opts.patch + ]; postPatch = '' substituteInPlace bin/nexus.vmoptions \ - --replace ../sonatype-work /var/lib/sonatype-work \ - --replace etc/karaf $out/etc/karaf \ - --replace =. =$out + --replace-fail ../sonatype-work /var/lib/sonatype-work \ + --replace-fail etc/karaf $out/etc/karaf \ + --replace-fail =. =$out ''; installPhase = '' @@ -39,12 +49,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Repository manager for binary software components"; homepage = "https://www.sonatype.com/products/sonatype-nexus-oss"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl10; - platforms = platforms.all; - maintainers = with maintainers; [ aespinosa ironpinguin zaninime ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.epl10; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + aespinosa + ironpinguin + luftmensch-luftmensch + zaninime + ]; }; } diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix new file mode 100644 index 000000000000..eb77d5936486 --- /dev/null +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "stevenblack-blocklist"; + version = "3.14.84"; + + src = fetchFromGitHub { + owner = "StevenBlack"; + repo = "hosts"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-tahf6mdtmZofwMZfMsuDAqCR/V1qZt6vV+o6t4YTKG0="; + }; + + outputs = [ + # default src fallback + "out" + + # base hosts file + "ads" + + # extensions only + "fakenews" + "gambling" + "porn" + "social" + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out $ads $fakenews $gambling $porn $social + + # out + find alternates -type f -not -name "hosts" -exec rm {} + + cp -r alternates $out + install -Dm644 hosts $out + + # ads + install -Dm644 hosts $ads + + # extensions + install -Dm644 alternates/fakenews-only/hosts $fakenews + install -Dm644 alternates/gambling-only/hosts $gambling + install -Dm644 alternates/porn-only/hosts $porn + install -Dm644 alternates/social-only/hosts $social + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Unified hosts file with base extensions"; + homepage = "https://github.com/StevenBlack/hosts"; + license = licenses.mit; + maintainers = with maintainers; [ + moni + Guanran928 + frontear + ]; + }; +}) diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 89e68ece7e6b..4f6f0df26222 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - hash = "sha256-aktKJlwXpHpjSFxoz5wZJPGWZIcn4ax5iBP0GQEux78="; + hash = "sha256-rSPYnbZjCoAKJBNCJCKsLBenolOzS78Zm850BJ8mKhA="; }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index 8c5ec833c46f..9e1325a43457 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -4,13 +4,13 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = "v${version}"; - hash = "sha256-3VXc0Ksv6swmKEClNF5RRjX68RFLg2IRdBwcVgI5Syo="; + hash = "sha256-lRCkUF0BBX0nej/HxfV9u8NIuA5W0aBKP2xPR8C61NY="; }; nativeBuildInputs = [ @@ -67,8 +67,8 @@ let description = "Arduino from the command line"; mainProgram = "arduino-cli"; changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ryantm ]; + license = [ licenses.gpl3Only licenses.asl20 ]; + maintainers = with maintainers; [ ryantm sfrijters ]; }; }; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 87df1e7f6aec..53051eb2a310 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "assimp"; - version = "5.4.1"; + version = "5.4.2"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub { owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-F3aaEaHZyOLES6zOYqHRG0BtaKk9d/bAHCtal6FsIWc="; + hash = "sha256-4KpqH3rSNSTAXMFPWAvGTZA4jzKIChHFdtW97sK2EyY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 9f662a8b1479..2c70046108da 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.2.1"; + version = "9.3.1"; src = fetchFromGitHub { owner = "facebook"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-Zifn5Gu/4h6TaEqSaWQ2mFdryeAarqbHWW3fKUGGFac="; + hash = "sha256-bTUzh7ch14TDcm6GkfhA5I/qUVmUm+RE5d2HMZ3zaNc="; }; patches = [ ./fix-findliburing.patch ]; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 4c405f2fff83..905426bf53b2 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.5.0"; + version = "5.6.0"; minimalOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; - hash = "sha256-YokLMW4DV5KtKa8a2XFFbRDe/VJbdLU9sbZ/pCN1wXg="; + hash = "sha256-njBDP9tMpDemqo/7RHuspeunYV+4jnsM2KS0FsMggTM="; }; checkInputs = [ ppx_sexp_conv ounit2 ]; diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix index 909bf019cda7..7dd83aaae377 100644 --- a/pkgs/development/ocaml-modules/miou/default.nix +++ b/pkgs/development/ocaml-modules/miou/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "miou"; - version = "0.1.0"; + version = "0.2.0"; minimalOCamlVersion = "5.0.0"; src = fetchurl { url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz"; - hash = "sha256-WTs6L9j4z1/0wKcGIZVwaNrATRGCTN5A6RwO7tY2phE="; + hash = "sha256-hxYCG1NkDEbVyDvN8eS/Fj6s10YyS7NRGlyNOkLy6sA="; }; meta = { diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index 2390b1b138be..ece4555cc3f4 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.18.0"; + version = "2.18.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wYYSS4lABCbIhmUU3z3Wh0+4zwpEzXl8Kk9gi6LBrbQ="; + hash = "sha256-9GdBKUhueis8pnQP5ZNxvEyRXVGINTueVzLOR4xx5mU="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix index bc7b7b5160a1..3e3de9f26676 100644 --- a/pkgs/development/tools/misc/direvent/default.nix +++ b/pkgs/development/tools/misc/direvent/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "direvent"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "mirror://gnu/direvent/direvent-${version}.tar.gz"; - sha256 = "sha256-lAWop32kn+krvkrxi/kl/5H20zdMELfXAKAxusuUxJc="; + sha256 = "sha256-HbvGGSqrZ+NFclFIYD1XDGooKDgMlkIVdir5FSTXlbo="; }; meta = with lib; { diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 89bd9348491d..6a68f3a7b820 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { "--skip=semantic::types::infer::tests::resolve_visible_def" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ruff \ --bash <($out/bin/ruff generate-shell-completion bash) \ --fish <($out/bin/ruff generate-shell-completion fish) \ diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index b34074435c18..a02fdc1f1bc3 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-ecTwC0FHg0MHBkrsydTam4UfylldZQp06t/1BYUwgUI="; + hash = "sha256-FxBVNJVcVdAAvkIWzFmWiVdrVEQ4eQGGo8tmrlcH+6k="; }; - vendorHash = "sha256-GmLyYtgiUBd09mUktjNhbPN5QCUb9VNUzA0xT5mzQ0Q="; + vendorHash = "sha256-9eUUjcRQ/H3iPO2F+KE0nd5+b8slc6xacXSZt3jytgU="; subPackages = [ "." "tools/mount_gcsfuse" ]; diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix deleted file mode 100644 index 34f64cb5e480..000000000000 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, fetchFromGitHub }: - -let - version = "3.14.79"; -in -fetchFromGitHub { - name = "stevenblack-blocklist-${version}"; - - owner = "StevenBlack"; - repo = "hosts"; - rev = version; - hash = "sha256-MfQGu+Y4/A0GKIu9d//U+yiP0fN/7cWhEo2dut4UvcE="; - - meta = with lib; { - description = "Unified hosts file with base extensions"; - homepage = "https://github.com/StevenBlack/hosts"; - license = licenses.mit; - maintainers = with maintainers; [ - moni - Guanran928 - frontear - ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 920bf29f9521..2498822c47fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13160,8 +13160,6 @@ with pkgs; staticjinja = with python3.pkgs; toPythonApplication staticjinja; - stevenblack-blocklist = callPackage ../tools/networking/stevenblack-blocklist { }; - stress = callPackage ../tools/system/stress { }; stress-ng = callPackage ../tools/system/stress-ng { }; @@ -18996,10 +18994,6 @@ with pkgs; nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { - jre_headless = jre8_headless; - }; - nexusmods-app-unfree = callPackage ../by-name/ne/nexusmods-app/package.nix { enableUnfree = true; };