diff --git a/README.md b/README.md index 5ba68bbd64bb..5e6a8c54832b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@

[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over -80,000 software packages that can be installed with the +100,000 software packages that can be installed with the [Nix](https://nixos.org/nix/) package manager. It also implements [NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 38b8896c1883..62ca359b7982 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -58,6 +58,10 @@ nix-build lib/tests/maintainers.nix See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. + + When adding a new maintainer, be aware of the current commit conventions + documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions) + file located in the root of the Nixpkgs repo. */ { _0b11stan = { diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 23bb92f09ab9..b17416c1e3d3 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -152,9 +152,7 @@ let copyKeys = concatStrings (mapAttrsToList (keyName: keyOptions: '' secret=$(cat "${keyOptions.keyFile}") dest="${stateDir}/private/${keyName}" - echo " secret: \"$secret\"" > "$dest" - chown ${username}:${username} "$dest" - chmod 0400 "$dest" + install -m 0400 -o "${username}" -g "${username}" <(echo " secret: \"$secret\"") "$dest" '') cfg.keys); @@ -457,9 +455,7 @@ let dnssecTools = pkgs.bind.override { enablePython = true; }; signZones = optionalString dnssec '' - mkdir -p ${stateDir}/dnssec - chown ${username}:${username} ${stateDir}/dnssec - chmod 0600 ${stateDir}/dnssec + install -m 0600 -o "${username}" -g "${username}" -d "${stateDir}/dnssec" ${concatStrings (mapAttrsToList signZone dnssecZones)} ''; @@ -961,9 +957,9 @@ in rm -Rf "${stateDir}/private/" rm -Rf "${stateDir}/tmp/" - mkdir -m 0700 -p "${stateDir}/private" - mkdir -m 0700 -p "${stateDir}/tmp" - mkdir -m 0700 -p "${stateDir}/var" + install -dm 0700 -o "${username}" -g "${username}" "${stateDir}/private" + install -dm 0700 -o "${username}" -g "${username}" "${stateDir}/tmp" + install -dm 0700 -o "${username}" -g "${username}" "${stateDir}/var" cat > "${stateDir}/don't touch anything in here" << EOF Everything in this directory except NSD's state in var and dnssec @@ -971,10 +967,6 @@ in the nsd.service pre-start script. EOF - chown ${username}:${username} -R "${stateDir}/private" - chown ${username}:${username} -R "${stateDir}/tmp" - chown ${username}:${username} -R "${stateDir}/var" - rm -rf "${stateDir}/zones" cp -rL "${nsdEnv}/zones" "${stateDir}/zones" diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index a9a0aecb946e..7246fd93a231 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -18,6 +18,9 @@ let cacheDir = "/var/cache/mediawiki"; stateDir = "/var/lib/mediawiki"; + # https://www.mediawiki.org/wiki/Compatibility + php = pkgs.php81; + pkg = pkgs.stdenv.mkDerivation rec { pname = "mediawiki-full"; inherit (src) version; @@ -46,7 +49,7 @@ let } '' mkdir -p $out/bin for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php update.php; do - makeWrapper ${pkgs.php}/bin/php $out/bin/mediawiki-$(basename $i .php) \ + makeWrapper ${php}/bin/php $out/bin/mediawiki-$(basename $i .php) \ --set MEDIAWIKI_CONFIG ${mediawikiConfig} \ --add-flags ${pkg}/share/mediawiki/maintenance/$i done @@ -485,8 +488,7 @@ in services.phpfpm.pools.mediawiki = { inherit user group; phpEnv.MEDIAWIKI_CONFIG = "${mediawikiConfig}"; - # https://www.mediawiki.org/wiki/Compatibility - phpPackage = pkgs.php81; + phpPackage = php; settings = (if (cfg.webserver == "apache") then { "listen.owner" = config.services.httpd.user; "listen.group" = config.services.httpd.group; @@ -598,8 +600,8 @@ in fi echo "exit( wfGetDB( DB_MASTER )->tableExists( 'user' ) ? 1 : 0 );" | \ - ${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/eval.php --conf ${mediawikiConfig} && \ - ${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \ + ${php}/bin/php ${pkg}/share/mediawiki/maintenance/eval.php --conf ${mediawikiConfig} && \ + ${php}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \ --confpath /tmp \ --scriptpath / \ --dbserver ${lib.escapeShellArg dbAddr} \ @@ -613,7 +615,7 @@ in ${lib.escapeShellArg cfg.name} \ admin - ${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/update.php --conf ${mediawikiConfig} --quick + ${php}/bin/php ${pkg}/share/mediawiki/maintenance/update.php --conf ${mediawikiConfig} --quick ''; serviceConfig = { diff --git a/nixos/modules/services/x11/urserver.nix b/nixos/modules/services/x11/urserver.nix index 0beb62eb766a..30f8a9805cfb 100644 --- a/nixos/modules/services/x11/urserver.nix +++ b/nixos/modules/services/x11/urserver.nix @@ -14,7 +14,7 @@ in { allowedUDPPorts = [ 9511 9512 ]; }; - systemd.user.services.urserver = { + systemd.user.services.urserver = { description = '' Server for Unified Remote: The one-and-only remote for your computer. ''; diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index c3542f33632f..cae2a3b7f1a9 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "14.1.1"; + version = "14.1.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-qGKTQAEwkv5Bz09GzmUHWnQ/DzmiexOY/dTkFyCtH/M="; + sha256 = "sha256-CMqH9iy9U85bKj7YLcYsKFs5CDePGBEfUWL+sb7WzBw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 04b84e1ee263..deaec9e16d7c 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "2.0.0.1481"; + version = "2.0.0.1486"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "c751ef146265c243cdbd7c0353dd0b70ab51730c"; - hash = "sha256-wvHIKOTi/a5tdn7E4SnUrDz3htvyZQMJeQFa+24OKwI="; + rev = "fd4a82e7d0e53124d9618320f3c115d90654509d"; + hash = "sha256-nR2Px7VYjAktUsueEyBAV2392+/dX6JYIy7YSMh05c0="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 8b98b27667b2..e456fd595617 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -24,14 +24,14 @@ assert svgSupport -> enableCairo; stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; - version = "1.10.0"; + version = "1.10.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = finalAttrs.version; - hash = "sha256-4wTwsjnmPsg+kc05izeyXilzDO0LpD3g3PRBqgLPK2I="; + hash = "sha256-I+h93/I1Kra2S5QSi2XgICAVrcUmO9cmb8UttVuzjwg="; }; depsBuildBuild = [ diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 3824d7dee449..0bf2fd36c0fb 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.11.2"; + packageVersion = "11.12.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -22,7 +22,7 @@ repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-a9f4+t2w8aOOLNaKkr+FuY0ENa/Nkukg9pvJTiUMfWk="; + hash = "sha256-9mJW8VFYClQ3D8/nPtlCVaVULvEICS+RQhz1dLujn6Q="; }; extraConfigureFlags = [ diff --git a/pkgs/applications/networking/browsers/floorp/update.sh b/pkgs/applications/networking/browsers/floorp/update.sh index 08216123c54c..4f367f29e776 100755 --- a/pkgs/applications/networking/browsers/floorp/update.sh +++ b/pkgs/applications/networking/browsers/floorp/update.sh @@ -19,7 +19,7 @@ updateBaseVersion() { updateHash() { local hash - hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq .hash) + hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq -r .hash) sed -i "s|hash = \"[a-zA-Z0-9\/+-=]*\";|hash = \"$hash\";|g" "$dirname/default.nix" } diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index fe4d029cd35a..6c9cd4d9b0aa 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rke"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-4fan6+ka0CH8wa/+7ouTuOuTfWPQE5EqsjAfj3zdrA0="; + hash = "sha256-f1Ilf2HSsp0Ygp0fItJVd8iJq12Z1jw2WKmLR4NgUKA="; }; vendorHash = "sha256-/HsZAMPGCaM5Em6doC8qffoSEveX/yDNwAGog3I0+c4="; diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index 7108b2306b79..08c5243414da 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.5.3"; + version = "3.6.0"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-lCtFm360UeypzYpivlYXxuqZ0BzGzGkkq31dmgjwv4M="; + hash = "sha256-PMCetU+E0Kl50K7sJB6UiHVouWPtfW8ALXFacxCvAhE="; }; - vendorHash = "sha256-PXRy12JWYQQMMzh7jrEhquileY2oYFvqt8KZvrfp2o0="; + vendorHash = "sha256-RsmwTRVjhEgKAT9aekSfkRuai2165KG7q5aFjAiLSPU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index b44fc71c3d84..2f3927146f80 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -12,6 +12,9 @@ , dconf , librsvg , gdk-pixbuf +# some scripts need these when used in conjuction with firejail +, coreutils +, gnugrep # Configuration options for the wrapper , extraMakeWrapperArgs ? [] , dbusVerify ? stdenv.isLinux @@ -32,6 +35,7 @@ let "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" "--prefix" "GST_PLUGIN_SYSTEM_PATH_1_0" ":" "${lib.makeSearchPath "lib/girepository-1.0" unwrapped.gst_packages}" + "--suffix" "PATH" ":" "${lib.makeBinPath [ coreutils gnugrep ]}" ] ++ lib.optionals unwrapped.kdeIntegration [ "--prefix" "QT_PLUGIN_PATH" ":" "${ lib.makeSearchPath diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix index 08dd9eea9bbd..5be76fa51685 100644 --- a/pkgs/applications/office/pdfmm/default.nix +++ b/pkgs/applications/office/pdfmm/default.nix @@ -2,12 +2,11 @@ , coreutils , fetchFromGitHub , ghostscript -, glibc +, locale , gnome , gnused , lib , resholve -, xorg }: resholve.mkDerivation rec { @@ -35,15 +34,16 @@ resholve.mkDerivation rec { inputs = [ coreutils ghostscript - glibc + locale gnome.zenity gnused - xorg.xmessage ]; + fake = { + # only need xmessage if zenity is unavailable + external = [ "xmessage" ]; + }; execer = [ - "cannot:${glibc.bin}/bin/locale" "cannot:${gnome.zenity}/bin/zenity" - "cannot:${xorg.xmessage}/bin/xmessage" ]; keep."$toutLu" = true; }; @@ -54,5 +54,6 @@ resholve.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ urandom ]; mainProgram = "pdfmm"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 2e4911d829d1..d463b4fe5366 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.2"; + version = "4.2.1"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-PDIaOMA1QHrJC5xVW+Mzx8ja/YvZBMKvV88MjSoSpfM="; + sha256 = "sha256-ba5I/bsDNAhDb1Kq0lWTC6YgpZ1PpeHPmB/vXx/JRK0="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 9b4c711aba8f..7919dfd17682 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20240112164112"; + version = "3.1.20240404144621"; pyproject = true; src = fetchFromGitHub { owner = "common-workflow-language"; repo = "cwltool"; rev = "refs/tags/${version}"; - hash = "sha256-Y0DORypXlTDv04qh796oXPSTxCXGb7rLQ8Su+/As7Lo="; + hash = "sha256-atpXkMIQ60POuUk99uiiuCoRXt4Seg11g/eHCeTDe+Q="; }; postPatch = '' diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 948f6ab037c4..b6522aef2397 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.7.2"; + version = "6.7.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-enRwASn1wpwAYmDfU5djhDAJgcmv+dPVwut+kdPco1k="; + hash = "sha256-Da+J+NOXW+n55LvaPQw6XiRhJJQ4Pc4Z1p21qMym/Xw="; }; patches = [ diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix new file mode 100644 index 000000000000..1c43461ef58f --- /dev/null +++ b/pkgs/by-name/ar/aranym/package.nix @@ -0,0 +1,58 @@ +{ + lib, + SDL2, + autoreconfHook, + fetchFromGitHub, + libGLU, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aranym"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "aranym"; + repo = "aranym"; + rev = "ARANYM_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + hash = "sha256-dtcLIA1oC6sPOeGTRmXhMEbuLan9/JWTbQvO5lp3gKo="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libGLU + SDL2 + ]; + + strictDeps = true; + + meta = { + homepage = "https://aranym.github.io"; + description = "Atari Running on Any Machine"; + longDescription = '' + ARAnyM is a software virtual machine (similar to VirtualBox or Bochs) + designed and developed for running 32-bit Atari ST/TT/Falcon operating + systems (TOS, FreeMiNT, MagiC and Linux-m68k) and TOS/GEM applications on + any kind of hardware - be it an IBM clone (read it as "PC" :-), an Apple, + an Unix server, a graphics workstation or even a portable computer. + + ARAnyM is not meant as an emulator of Atari Falcon (even though it has a + rather high Falcon software compatibility and includes most of Falcon + custom chips including VIDEL and DSP). ARAnyM is better in the sense that + it's not tied to specification of an existing Atari machine so we were + free to select the most complete CPU (68040 with MMU) and FPU (68882), add + loads of RAM (up to 4 GB), host accelerated graphics (even with OpenGL) + and direct access to various host resources including sound, disk drives, + optical storage devices (CD/DVD-ROMs), parallel port and more. + ''; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "aranym"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 316e77748b97..60345adee0df 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.35.9"; + version = "3.4.36.3"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-Y2MGhzq4IbtjEG+CER+FWU8CY+hn5ehjMOcP02zIsR4="; + hash = "sha256-qeH3W7G6xxlIrLK04A3GTKtZsvmii6acWY4clPIL8Rk="; }; env.ICON = fetchurl { diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 287d8e1a0e0a..656c1e60ec21 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -10,18 +10,18 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.2.1"; + version = "2024.3.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-g9enDEIdVj9R3xkx5qllf7aTDa6F+MvozhwbJn9w/VY="; + hash = "sha256-JBEP4dNGL4rYKl2qNyhB2y/wZunikaGFltGVXLxgMWI="; }; nodejs = nodejs_18; - npmDepsHash = "sha256-fkoI8a8iVMWxtXAj5zNg2xwK/ZPyRZGPo7rnxHpKV7k="; + npmDepsHash = "sha256-vNudSHIMmF7oXGz+ZymQahyHebs/CBDc6Oy1g0A5nqA="; nativeBuildInputs = [ python3 diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index b43a7ed27b21..af391a5897d1 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -29,13 +29,13 @@ let electron = electron_28; in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.3.0"; + version = "2024.4.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g="; + hash = "sha256-UzVzo8tq719W2EwUE4NfvUrqhb61fvd60EGkavQmv3Q="; }; patches = [ @@ -60,7 +60,7 @@ in buildNpmPackage rec { makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc="; + npmDepsHash = "sha256-qkg1psct/ekIXB6QmJX1n/UOKUhYSD9Su7t/b4/4miM="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -76,7 +76,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI="; + hash = "sha256-lvEJmjzhpMhm+9INYHWpdltinUOI3DMtFN/ddDQrUvo="; }; cargoRoot = "apps/desktop/desktop_native"; diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index fe4ccf72df62..a9dc4b718c80 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dep-scan"; - version = "5.3.2"; + version = "5.3.3"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-2WV4f9vHdfnzoQWvwK/+lT9IS0v0sGBqnwDFHWG48G4="; + hash = "sha256-ehQsRTMoHr6LDXCka3/4YcyEKLN7DQW4mUp4nyid/aE="; }; postPatch = '' diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 7948fdd82966..4fc148542604 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-/yPP8GzeaVMauhcYLDAgXzOafUpOhJF2tyHOyD6KWS8="; + hash = "sha256-ePyMyKCI8fHKfoNCMYyYeCPkyYF5KyMYaPrB1NtovCs="; }; - cargoHash = "sha256-eKRFPnH9MvSykrnPo4dc5DtEfb79s0hBtmYfERGQbWg="; + cargoHash = "sha256-1komuFSucXYdgeAFWeeuMmZYxb6Mzku7hdltDwKAa7A="; nativeBuildInputs = [ pkg-config @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 8a5b9d847a04..391bc8b9680f 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "unstable-2024-04-06"; + version = "unstable-2024-04-10"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "b787726a8413e11b074cde42704b4af32d95545c"; - hash = "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo="; + rev = "31357486b0ef6f4e161e002b6893eeb4fafc3ca9"; + hash = "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/by-name/ir/iredis/package.nix similarity index 75% rename from pkgs/tools/admin/iredis/default.nix rename to pkgs/by-name/ir/iredis/package.nix index 2c57aa166978..6946abf5077a 100644 --- a/pkgs/tools/admin/iredis/default.nix +++ b/pkgs/by-name/ir/iredis/package.nix @@ -6,18 +6,19 @@ python3.pkgs.buildPythonApplication rec { pname = "iredis"; - version = "1.14.1"; + version = "1.15.0"; pyproject = true; src = fetchFromGitHub { owner = "laixintao"; repo = "iredis"; - rev = "refs/tags/v${version}"; - hash = "sha256-ojS2wtxggZPp73n9SjPRAzBlnF1ScK/pNVGvAYKmQ5Y="; + rev = "v${version}"; + hash = "sha256-wfjr/FVmKgkP8FMKxw6e8U+lfZQZ2q52REC0mU8Xp7Q="; }; postPatch = '' substituteInPlace pyproject.toml \ + --replace-fail 'packaging = "^23.0"' 'packaging = "*"' \ --replace-fail 'wcwidth = "0.1.9"' 'wcwidth = "*"' ''; @@ -26,20 +27,21 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - pygments click configobj mistune packaging - pendulum prompt-toolkit + pygments + python-dateutil redis wcwidth ]; nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook + freezegun pexpect + pytestCheckHook ]; pytestFlagsArray = [ @@ -50,7 +52,8 @@ python3.pkgs.buildPythonApplication rec { # Only execute unittests, because cli tests require a running Redis "tests/unittests/" ] ++ lib.optionals stdenv.isDarwin [ - # Flaky test + # Flaky tests + "--deselect=tests/unittests/test_entry.py::test_command_shell_options_higher_priority" "--deselect=tests/unittests/test_utils.py::test_timer" ]; @@ -58,8 +61,8 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A Terminal Client for Redis with AutoCompletion and Syntax Highlighting"; - changelog = "https://github.com/laixintao/iredis/raw/${src.rev}/CHANGELOG.md"; - homepage = "https://iredis.io/"; + changelog = "https://github.com/laixintao/iredis/blob/${src.rev}/CHANGELOG.md"; + homepage = "https://iredis.xbin.io/"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; mainProgram = "iredis"; diff --git a/pkgs/by-name/ka/kafka-cmak/package.nix b/pkgs/by-name/ka/kafka-cmak/package.nix new file mode 100644 index 000000000000..ee77800e3f88 --- /dev/null +++ b/pkgs/by-name/ka/kafka-cmak/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenvNoCC, + fetchzip, + jdk, + gawk, + makeBinaryWrapper, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + name = "CMAK"; + version = "3.0.0.6"; + + src = fetchzip { + url = "https://github.com/yahoo/CMAK/releases/latest/download/cmak-${finalAttrs.version}.zip"; + hash = "sha256-jMF1v2WV8ataFkz2VuVXOE6/QV+Kb0KBVRfj8yKdkUQ="; + }; + + buildInputs = [ + gawk + jdk + ]; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv ./* $out + wrapProgram $out/bin/cmak \ + --set JAVA_HOME ${jdk.home} \ + --prefix PATH : ${lib.makeBinPath [ gawk ]} + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Cluster Manager for Apache Kafka, previously known as Kafka Manager"; + license = licenses.apsl20; + maintainers = with maintainers; [cafkafk]; + platforms = lib.platforms.unix; + mainProgram = "cmak"; + }; +}) diff --git a/pkgs/by-name/ka/kafka-cmak/update.sh b/pkgs/by-name/ka/kafka-cmak/update.sh new file mode 100644 index 000000000000..8d527a01a74a --- /dev/null +++ b/pkgs/by-name/ka/kafka-cmak/update.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update + +nix-update kafka-cmak diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index b2dd2d806130..cba2661b00d9 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.6.8"; + version = "1.6.10"; in buildGoModule { inherit pname version; @@ -15,10 +15,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-GeI2vhTRiz8krYuolUxsWvFy4TIflOvFCAaa1b7Fex0="; + hash = "sha256-6VjvlGA6PBYLa1Ct05jokgF9zlYKihr+ESG4C8MHnO0="; }; - vendorHash = "sha256-/eNhVD/9MZm1nVNmfqmLEfoySa8Krdzle2SLKpf1XlM="; + vendorHash = "sha256-sDqP+fzAFavqtvJ98nwsD5+GxNhmLgtOkTzIK06wp9E="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 0f9325f842e4..01301c63757b 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.355"; + version = "0.0.356"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-St/zZqfoate9TwYo7q9Za+T6q4kRw9vSzcBfMW7AXkw="; + hash = "sha256-sQZ0kwZXaYoiXCaSvCcnMqYNeLHvtZzHih52+2AYdeY="; }; vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE="; diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 78491c24c697..ff69f23d6b29 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -12,14 +12,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "pacu"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; src = fetchFromGitHub { owner = "RhinoSecurityLabs"; repo = "pacu"; rev = "refs/tags/v${version}"; - hash = "sha256-Ty++jNJTk8YKy6Sl6xj1Xs25ZxJCeF9m/iwdA2fRXnI="; + hash = "sha256-DLyTWyfDOawtBZ7rIzVc0PFgagpM7qbaAbOJE6nh0Wo="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix new file mode 100644 index 000000000000..d3670ef96d13 --- /dev/null +++ b/pkgs/by-name/pg/pgroll/package.nix @@ -0,0 +1,28 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "pgroll"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "xataio"; + repo = "pgroll"; + rev = "v${version}"; + hash = "sha256-VYGwIJsPVilFxvglj+E7H9NpqUV1CV/ggBP3gFleWIA="; + }; + + vendorHash = "sha256-Fz+o1jSoMfqKYo1I7VUFqbhBEgcoQEx7aYsmzCLsbnI="; + + # Tests require a running docker daemon + doCheck = false; + + meta = with lib; { + description = "PostgreSQL zero-downtime migrations made easy"; + license = licenses.asl20; + homepage = "https://github.com/xataio/pgroll"; + maintainers = with maintainers; [ ilyakooo0 ]; + }; +} diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 62ca8f2b025d..20b5fa4b7e0a 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.32.2"; + version = "0.34.3"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-QxaVXggVfr3O26RwSuUx4qpabhWE9+ZFLKRin/ya2e4="; + hash = "sha256-4stIazXr7+P6gF98NTWQoVW52ov9tQ1DQjPPuN7ssLU="; }; - cargoHash = "sha256-j5wXmlauhrUnUVTj/KyqDrf1y9bq3ZInREZXIUQImVE="; + cargoHash = "sha256-lijDw55F7QBPqA17CPoee5unW/++LXo3Gbn24C7FLi8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/qp/qpoases/package.nix b/pkgs/by-name/qp/qpoases/package.nix new file mode 100644 index 000000000000..5dec04c6aee7 --- /dev/null +++ b/pkgs/by-name/qp/qpoases/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qpoases"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "qpOASES"; + rev = "releases/${finalAttrs.version}"; + hash = "sha256-NWKwKYdXJD8lGorhTFWJmYeIhSCO00GHiYx+zHEJk0M="; + }; + + patches = [ + # Allow building as shared library. + # This was merged upstream, and can be removed on next version + (fetchpatch { + name = "shared-libs.patch"; + url = "https://github.com/coin-or/qpOASES/pull/109/commits/cb49b52c17e0b638c88ff92f4c59e347cd82a332.patch"; + hash = "sha256-6IoJHCFVCZpf3+Im1f64VwV5vj+bbbwCSF0vqpdd5Os="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "Open-source C++ implementation of the recently proposed online active set strategy"; + homepage = "https://github.com/coin-or/qpOASES"; + license = licenses.lgpl21; + maintainers = with maintainers; [ nim65s ]; + }; +}) diff --git a/pkgs/by-name/rs/rs/macos-reallocarray.patch b/pkgs/by-name/rs/rs/macos-reallocarray.patch new file mode 100644 index 000000000000..ca89cc4c4894 --- /dev/null +++ b/pkgs/by-name/rs/rs/macos-reallocarray.patch @@ -0,0 +1,26 @@ +Original from OpenBSD src/lib/libc/stdlib/reallocarray.c + +--- a/rs.c 2024-04-15 10:13:41 ++++ b/rs.c 2024-04-15 10:15:20 +@@ -103,6 +103,21 @@ + ep = getptrs(ep); \ + } while(0) + ++#ifdef __APPLE__ ++#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) ++ ++void * ++reallocarray(void *optr, size_t nmemb, size_t size) ++{ ++ if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && ++ nmemb > 0 && SIZE_MAX / nmemb < size) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ return realloc(optr, size * nmemb); ++} ++#endif ++ + int + main(int argc, char *argv[]) + { diff --git a/pkgs/by-name/rs/rs/package.nix b/pkgs/by-name/rs/rs/package.nix index 1b369eec9b34..9361ca564dc6 100644 --- a/pkgs/by-name/rs/rs/package.nix +++ b/pkgs/by-name/rs/rs/package.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles ]; + patches = [ + # add an implementation of reallocarray() from openbsd (not available on darwin) + ./macos-reallocarray.patch + ]; + buildInputs = [ libbsd ]; buildPhase = '' @@ -63,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isx86_64 && stdenv.isDarwin; # missing strtonum() }; } diff --git a/pkgs/by-name/ry/ryujinx/deps.nix b/pkgs/by-name/ry/ryujinx/deps.nix index 04b6bab6647d..d01214484098 100644 --- a/pkgs/by-name/ry/ryujinx/deps.nix +++ b/pkgs/by-name/ry/ryujinx/deps.nix @@ -27,7 +27,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; }) - (fetchNuGet { pname = "DynamicData"; version = "8.3.27"; sha256 = "19y1zk2zga464jfv77qir8nlw7mx8lsfpgdswkgz5s3pbhpmzxl8"; }) + (fetchNuGet { pname = "DynamicData"; version = "8.4.1"; sha256 = "03mdxfrwgfprpn9g17sxhzxg09k3dkkm2xs29i4r36b5jlgmms5g"; }) (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; sha256 = "1likxhccg4l4g4i65z4dfzp9059hij6h1q7prx2sgakvk8zzmw9k"; }) (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.5"; sha256 = "1fk38vm4fqrhwv7zcffg34dfrgdwfqndpyjpyblyx7xj3nlpm8hi"; }) (fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; sha256 = "1ji816r8idwjmxk8bzyq1z32ybz7xdg3nb0a7pnvqr8vys11bkgb"; }) @@ -58,10 +58,10 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.4.0"; sha256 = "138jyzwap55a8wgg26zwzm0lifc3im1cs65cjgrpw3b13szfqd5g"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.4.0"; sha256 = "0dv05mh0g3g39plza0qlsaak52z1drkansh65nhfjwhj968v7rr1"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.4.0"; sha256 = "16r0qyxbn7gibwpgprlxra5c183ps3njrxp5si28k50jhyjm7rxf"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.4.0"; sha256 = "056dg7iwgdp4kmw87rq7yzp5a2l02krssxdpga4rxrkj21iranm9"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.1"; sha256 = "0kdxb47rafvk6mx0xkf2pik7b638b2d847jlhzi3fvj6swg3v15b"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.1"; sha256 = "1ny97mhld7vzn5xwxvcy1jhfq4mw15wrk9c77z6cg2fydkgawyzx"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.1"; sha256 = "1zharnx3vhrfdn761w16ygxyj9ig5zn71346aqkk0nmzlll3gfjf"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.1"; sha256 = "14fjr679hwal35mdwdv4w40mnxzfnnx65yc16807zzkyri011zc1"; }) (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.0"; sha256 = "1zl39k27r4zq75r1x1zr1yl4nzxpkxdnnv6dwd4qp0xr22my85aq"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 38891dbc1857..a32f86e2399b 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -19,19 +19,20 @@ , fontconfig , glew , libGL +, udev , SDL2 , SDL2_mixer }: buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1248"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1281"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "7124d679fd4345f2ed517e77ab40d90e6bef9650"; - sha256 = "11lp9j885j1ybl9arj51233396r9qdsy53ahwhwsmjgz71n1d2i5"; + rev = "8884d1fd732c9ba788f0ab711e6a9f507d934ac8"; + sha256 = "0g4x10whiybckvx8hhpdrpa8mbypwmpq1av6cjk53zc7iwkhvigw"; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; @@ -49,6 +50,7 @@ buildDotnetModule rec { pulseaudio vulkan-loader ffmpeg + udev # Avalonia UI libICE diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix index 300b011dc425..03ee6ad8d8bb 100644 --- a/pkgs/by-name/sp/spotube/package.nix +++ b/pkgs/by-name/sp/spotube/package.nix @@ -19,7 +19,7 @@ let pname = "spotube"; - version = "3.5.0"; + version = "3.6.0"; meta = { description = "An open source, cross-platform Spotify client compatible across multiple platforms"; @@ -53,7 +53,7 @@ let src = fetchArtifact { filename = "Spotube-macos-universal.dmg"; - hash = "sha256-omXhiH/hVxFef03GqmpYf65SfdLjLyeMyuAWuvSpYiI="; + hash = "sha256-Qsr+66ToyLCCUwirj/7V6vzSNmx7BZ3O34liLx6AdlI="; }; sourceRoot = "."; @@ -77,7 +77,7 @@ let src = fetchArtifact { filename = "Spotube-linux-x86_64.deb"; - hash = "sha256-Rea4GvxdkUfZF8lCBzI9UrD9Iz9D5vq9oxYBn5bahZE="; + hash = "sha256-dSFtjCuufrg5tG+FLgLgdx20WpO2s4wGOPtK+tel3dg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index badf0e86b7e8..1e2eab4da2f9 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-eAJe/AlYxp0v2LifXdlSxeZL+qwKf2wj+tnNJ2Y8LcQ="; + hash = "sha256-0SI7hRJxdtdpGgEsUCWNsIcT50W7uyxLs5Mp+alHE0I="; }; - vendorHash = "sha256-gir3RtIdQ/xDVL050kH8OxFuHoBOD2weeyRjguhubV0="; + vendorHash = "sha256-FXy3qVSf57cPmxkY2XPEjFz3qRYkH5pPmCoIiWb28FY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/su/supermodel/package.nix b/pkgs/by-name/su/supermodel/package.nix new file mode 100644 index 000000000000..27b9f633a661 --- /dev/null +++ b/pkgs/by-name/su/supermodel/package.nix @@ -0,0 +1,64 @@ +{ fetchFromGitHub +, lib +, libGLU +, SDL2 +, SDL2_net +, stdenv +, zlib +}: + +stdenv.mkDerivation rec { + pname = "supermodel"; + version = "0-unstable-2024-04-05"; + + src = fetchFromGitHub { + owner = "trzy"; + repo = "supermodel"; + rev = "250f84e78eba381adf8cd731ce20b1b9be43c8c8"; + hash = "sha256-3sDtNMW5R5Eq9GXJzKs0mQdiLUIWl6+4+rzKg8xpqEY="; + }; + + buildInputs = [ + libGLU + SDL2 + SDL2_net + zlib + ]; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + + makefile = "Makefiles/Makefile.UNIX"; + + makeFlags = [ "NET_BOARD=1" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/supermodel + cp bin/* $out/bin + cp -r Config Assets $out/share/supermodel + + runHook postInstall + ''; + + meta = { + description = "A Sega Model 3 Arcade Emulator"; + homepage = "https://github.com/trzy/supermodel"; + license = lib.licenses.gpl3; + longDescription = '' + Supermodel requires specific files to be present in the $HOME directory of + the user running the emulator. To ensure these files are present, move the + configuration and assets as follows: + + cp $out/share/supermodel/Config/Supermodel.ini ~/.config/supermodel/Config/Supermodel.ini + cp -r $out/share/supermodel/Assets/* ~/.local/share/supermodel/Assets/ + + Then the emulator can be started with: + supermodel -game-xml-file=$out/share/supermodel/Config/Games.xml /path/to/romset. + ''; + mainProgram = "supermodel"; + maintainers = with lib.maintainers; [ msanft ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/tc/tcsh/package.nix b/pkgs/by-name/tc/tcsh/package.nix index f254fed78080..404f0df5f833 100644 --- a/pkgs/by-name/tc/tcsh/package.nix +++ b/pkgs/by-name/tc/tcsh/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { - job control ''; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ AndersonTorres suominen ]; + maintainers = with lib.maintainers; [ suominen ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix index f1e6c36e24a8..d2ce33e4bab3 100644 --- a/pkgs/by-name/uc/uclibc-ng/package.nix +++ b/pkgs/by-name/uc/uclibc-ng/package.nix @@ -2,6 +2,7 @@ , stdenv , buildPackages , fetchurl +, gitUpdater , linuxHeaders , libiconvReal , extraConfig ? "" @@ -58,11 +59,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uclibc-ng"; - version = "1.0.45"; + version = "1.0.47"; src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-wvTGtuGdfJwiaZKjdG79erkyBARjwV7gvI9BMrV3esQ="; + hash = "sha256-KaTWhKBto0TuPuCazCynZJ1ZKuP/hI9pgUXEbe8F78s="; }; # 'ftw' needed to build acl, a coreutils dependency @@ -112,6 +113,11 @@ stdenv.mkDerivation (finalAttrs: { # Derivations may check for the existance of this attribute, to know what to # link to. libiconv = libiconvReal; + + updateScript = gitUpdater { + url = "https://git.uclibc-ng.org/git/uclibc-ng.git"; + rev-prefix = "v"; + }; }; meta = { diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index d1272f431389..1264ca82fc8b 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -10,15 +10,12 @@ , libtiff , gst_all_1 , libraw -, libsoup , libsecret , glib , gtk3 , gsettings-desktop-schemas , librsvg , libwebp -, json-glib -, webkitgtk , lcms2 , bison , flex @@ -65,17 +62,14 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gtk3 - json-glib lcms2 libheif libjpeg libraw librsvg libsecret - libsoup libtiff libwebp - webkitgtk xapp ]; @@ -89,6 +83,10 @@ stdenv.mkDerivation rec { pix/make-authors-tab.py ''; + # Avoid direct dependency on webkit2gtk-4.0 + # https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version + mesonFlags = [ "-Dwebservices=false" ]; + preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 9ec7a448b59f..8aed13444198 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -125,7 +125,7 @@ let cargoDeps = if yjitSupport then rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.pname}-${version}/${finalAttrs.cargoRoot}"; - hash = cargoHash; + hash = assert cargoHash != null; cargoHash; } else null; postUnpack = opString rubygemsSupport '' diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index d2b260e3a65b..0f56582c05c3 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "19.0.1"; + version = "19.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-MHoIVJ+x8GFzbO2YaknnzS/qSMyODvel88IHif9L97A="; + hash = "sha256-t+2bkJ1SFN7Bi1Mj74CKGhnL2vWpruQKf8lYJWLOqB8="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-r07neWK7d4407U941XtyUOlRcjQVNUsXJKavSNHvYZM="; + cargoHash = "sha256-Jr02AQWz4ILYZWlGtcVYWTcBojHWZk871bWuEyG5QxE="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 85214a79e2d3..a15c41f100b5 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -48,6 +48,8 @@ , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) , withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) , withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support +, withDvdnav ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing +, withDvdread ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing , withFdkAac ? withFullDeps && (!withGPL || withUnfree) # Fraunhofer FDK AAC de/encoder , withFlite ? withFullDeps # Voice Synthesis , withFontconfig ? withHeadlessDeps # Needed for drawtext filter @@ -228,6 +230,8 @@ , libcaca , libdc1394 , libdrm +, libdvdnav +, libdvdread , libGL , libGLU , libiconv @@ -522,6 +526,10 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withDav1d "libdav1d") (enableFeature withDc1394 "libdc1394") (enableFeature withDrm "libdrm") + ] ++ optionals (versionAtLeast version "7") [ + (enableFeature withDvdnav "libdvdnav") + (enableFeature withDvdread "libdvdread") + ] ++ [ (enableFeature withFdkAac "libfdk-aac") (enableFeature withFlite "libflite") (enableFeature withFontconfig "fontconfig") @@ -654,6 +662,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withDav1d [ dav1d ] ++ optionals withDc1394 [ libdc1394 libraw1394 ] ++ optionals withDrm [ libdrm ] + ++ optionals withDvdnav [ libdvdnav ] + ++ optionals withDvdread [ libdvdread ] ++ optionals withFdkAac [ fdk_aac ] ++ optionals withFlite [ flite ] ++ optionals withFontconfig [ fontconfig ] diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index b461a3c07864..e388f2fbacb6 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -4,7 +4,7 @@ let isQt6 = lib.versions.major qtbase.version == "6"; in stdenv.mkDerivation rec { pname = "libquotient"; - version = "0.8.1.2"; + version = "0.8.2"; outputs = [ "out" "dev" ]; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "quotient-im"; repo = "libQuotient"; rev = version; - hash = "sha256-qJTikc42sFUlb4g0sAEg6v9d4k1lhbn3MZPvghm56E8="; + hash = "sha256-6sR/80r9qW9kMYqIi2FeXgb6M795XKzpvyE6eTaBsjA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix new file mode 100644 index 000000000000..fff2d16aaf58 --- /dev/null +++ b/pkgs/development/ocaml-modules/miou/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "miou"; + version = "0.1.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="; + }; + + meta = { + description = "Composable concurrency primitives for OCaml"; + homepage = "https://git.robur.coop/robur/miou"; + changelog = "https://git.robur.coop/robur/miou/src/tag/v${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix index 18a0c6412886..0a25ac52148b 100644 --- a/pkgs/development/ocaml-modules/otoml/default.nix +++ b/pkgs/development/ocaml-modules/otoml/default.nix @@ -8,7 +8,7 @@ buildDunePackage rec { pname = "otoml"; - version = "1.0.4"; + version = "1.0.5"; minimalOCamlVersion = "4.08"; @@ -16,7 +16,7 @@ buildDunePackage rec { owner = "dmbaturin"; repo = pname; rev = version; - sha256 = "sha256-3bgeiwa0elisxZaWpwLqoKmeyTBKMW1IWdm6YdSIhSw="; + sha256 = "sha256-e9Bqd6KHorglLMzvsjakyYt/CLZR3yI/yZPl/rnbkDE="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index e13bc477e268..3de101383891 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ppx_blob"; - version = "0.7.2"; + version = "0.8.0"; duneVersion = "3"; src = fetchurl { url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; - sha256 = "00haz1cmplk3j9ysh6j656zrldy60585fmlndmfhpd5332mxrfdw"; + sha256 = "sha256-drobFwMTKd/a3aP5CX/08WhvgS1CkARH6zo+nSiwl08="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 1ead4ce1427c..57323e4b189d 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -1,29 +1,33 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchPypi -, jmespath -, pythonOlder -, pythonRelaxDepsHook +{ + lib, + buildPythonPackage, + cryptography, + fetchPypi, + jmespath, + pythonOlder, + pythonRelaxDepsHook, + setuptools, }: buildPythonPackage rec { pname = "aliyun-python-sdk-core"; - version = "2.15.0"; - format = "setuptools"; + version = "2.15.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7cRVVIjYqfHGG9QZx74nsjl0sqBSlxtGFPzSKerus4I="; + hash = "sha256-UYVQ0H9TfNOvrDtsk7XJl840QOTQwFTjrL2qgmHpCt8="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + pythonRelaxDeps = true; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ cryptography jmespath ]; @@ -31,11 +35,7 @@ buildPythonPackage rec { # All components are stored in a mono repo doCheck = false; - pythonRelaxDeps = true; - - pythonImportsCheck = [ - "aliyunsdkcore" - ]; + pythonImportsCheck = [ "aliyunsdkcore" ]; meta = with lib; { description = "Core module of Aliyun Python SDK"; diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index c31beceb1496..d44de866d323 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.12.2"; + version = "3.12.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,20 +18,14 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = "asyncstdlib"; rev = "refs/tags/v${version}"; - hash = "sha256-5DQM8m3aeCZAXOi+Rm+iM409juBBYdZDNqBAbhyTm/M="; + hash = "sha256-OLb4+7FFeVDW0ePyVJW8aaosouxlU/4Uq2ktvVLpDFY="; }; - build-system = [ - flit-core - ]; + build-system = [ flit-core ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "asyncstdlib" - ]; + pythonImportsCheck = [ "asyncstdlib" ]; meta = with lib; { description = "Python library that extends the Python asyncio standard library"; diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix index 079653a2aec1..c4709e80845d 100644 --- a/pkgs/development/python-modules/bip-utils/default.nix +++ b/pkgs/development/python-modules/bip-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bip-utils"; - version = "2.9.2"; + version = "2.9.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = "bip_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-qK1jSVfkebB9JM0sZjOu7ABc7xMrcybu1r7oQOw3bJo="; + hash = "sha256-3G37n/mfI+3JVIkmJWzbB1qPPTE6NJJlFZWdE0fIIWA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index f245b50d1343..4df10e61970c 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.22.6"; + version = "0.22.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-46REi+3dUY9dJrhXgKkQ1OfN6XCy1fV9cW6wk82ClOA="; + hash = "sha256-FfjvF6PBM+18JgQBP6vyElQYWMVizAEGk92ILwxpFSk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index 720d06e55560..8f7751dd912b 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-fhZMn0v908VzV+JLuS8tM+BPKJBoj77vEh1pINL4Cco="; + hash = "sha256-ca6VNC1AG+BAzEhH+N3cwXL9pIBwAX6qLWMpgkEjn98="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix index 705d03cbe6d8..f8618c1e5a89 100644 --- a/pkgs/development/python-modules/dirigera/default.nix +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dirigera"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Leggin"; repo = "dirigera"; rev = "refs/tags/v${version}"; - hash = "sha256-k5xChz3qfClWU131WH0CqaY8qrJXh85NQ0y1iPfnX5Y="; + hash = "sha256-EOnhkfU6DC0IfroHR8O45eNxIyyNS81Z/ptSViqyThU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 888f30793822..f19df6658fd2 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Sr83AAcYsgxD9LkGcrOriFBziwJFfv/9EfMYTgMnLtI="; + hash = "sha256-MIeRrDudrQFbNZFylwc5qjdT3VQhQqQW0H+foEfiI4Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 1bdec9f84b15..dd6485aa5d24 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,36 +1,35 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google-api-core -, google-cloud-core -, grpcio -, grpc-google-iam-v1 -, libcst -, mock -, proto-plus -, protobuf -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + google-api-core, + google-cloud-core, + grpcio, + grpc-google-iam-v1, + libcst, + mock, + proto-plus, + protobuf, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.23.0"; + version = "2.23.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w8q7Zhn18u6hGz23JzHoTSixaAVcnMF8LS2v8Vy4I3k="; + hash = "sha256-FHWiK/zhY7XELN9O717AUyPuozWFUpT5zk4j+qIk8Cg="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-cloud-core grpc-google-iam-v1 @@ -39,9 +38,7 @@ buildPythonPackage rec { ] ++ google-api-core.optional-dependencies.grpc; passthru.optional-dependencies = { - libcst = [ - libcst - ]; + libcst = [ libcst ]; }; nativeCheckInputs = [ @@ -55,9 +52,7 @@ buildPythonPackage rec { rm -r google ''; - disabledTests = [ - "policy" - ]; + disabledTests = [ "policy" ]; pythonImportsCheck = [ "google.cloud.bigtable_admin_v2" diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 0ae203f6331f..8f6acc289d6a 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -1,18 +1,19 @@ -{ lib -, aiofiles -, buildPythonPackage -, colorama -, fetchFromGitHub -, git -, jsonschema -, pdm-backend -, pytestCheckHook -, pythonOlder +{ + lib, + aiofiles, + buildPythonPackage, + colorama, + fetchFromGitHub, + git, + jsonschema, + pdm-backend, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "griffe"; - version = "0.42.1"; + version = "0.42.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,16 +22,12 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-KaD3j96FJJx43m/nfHa4kAft4FcDOdq+2dsiaMY7PPY="; + hash = "sha256-W6aOhz8UxJUc2kNRc4JaCqFgIOXsY8ctyQ3xZ+YaD9k="; }; - nativeBuildInputs = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ - colorama - ]; + dependencies = [ colorama ]; nativeCheckInputs = [ git @@ -39,21 +36,17 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - async = [ - aiofiles - ]; + async = [ aiofiles ]; }; - pythonImportsCheck = [ - "griffe" - ]; + pythonImportsCheck = [ "griffe" ]; meta = with lib; { description = "Signatures for entire Python programs"; - mainProgram = "griffe"; homepage = "https://github.com/mkdocstrings/griffe"; changelog = "https://github.com/mkdocstrings/griffe/blob/${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ fab ]; + mainProgram = "griffe"; }; } diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index d194a28123f8..82dc5a9882cf 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.46"; + version = "0.47"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-v0tufmOtxUP5pTsNNJJ9fevCPnsa68e0mdDtKGXEgVs="; + hash = "sha256-A4viSzUia4QBdD0svkqYtsCq/la7Nrf2xu/fVDZHb00="; }; build-system = [ diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 6df7a76dadd5..40f97138bb10 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "3.7.0"; + version = "4.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; rev = "refs/tags/v${version}"; - hash = "sha256-krMOjXzI9tmLGLEswXLLqc8J68Gwnl1VrRO2fLbDv0o="; + hash = "sha256-U6idxc5U2Bt581c/vnGgIou5+hoEJJZSPCo97MEDaW4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonfeed/default.nix b/pkgs/development/python-modules/jsonfeed/default.nix new file mode 100644 index 000000000000..8cde64656acc --- /dev/null +++ b/pkgs/development/python-modules/jsonfeed/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pythonOlder, + requests, +}: + +buildPythonPackage rec { + pname = "jsonfeed"; + version = "0.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Etfi59oOCrLHavLRMQo3HASFnydrBnsyEtGUgcsv1aQ="; + }; + + postPatch = '' + # Mixing of dev and runtime requirements + substituteInPlace setup.py \ + --replace-fail "install_requires=install_requires," "install_requires=[]," + ''; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + # Module has no tests, only a placeholder + doCheck = false; + + pythonImportsCheck = [ "jsonfeed" ]; + + meta = with lib; { + description = "Module to process json feed"; + homepage = "https://pypi.org/project/jsonfeed/"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/lmcloud/default.nix b/pkgs/development/python-modules/lmcloud/default.nix index 13fc93d3c707..cf98928e32ac 100644 --- a/pkgs/development/python-modules/lmcloud/default.nix +++ b/pkgs/development/python-modules/lmcloud/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lmcloud"; - version = "1.1.9"; + version = "1.1.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "lmcloud"; rev = "refs/tags/v${version}"; - hash = "sha256-0+UDSg57E/VvAU9pDZJ4LZYRY5TUlCgdPwVh5Nhohl4="; + hash = "sha256-oPUZ5EAvFhzMfAK5rbiy8O10FTSseWj7JHCZvZ/7PG4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lxml-html-clean/default.nix b/pkgs/development/python-modules/lxml-html-clean/default.nix new file mode 100644 index 000000000000..7c9b1b9de985 --- /dev/null +++ b/pkgs/development/python-modules/lxml-html-clean/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + lxml, + unittestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "lxml-html-clean"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fedora-python"; + repo = "lxml_html_clean"; + rev = "refs/tags/${version}"; + hash = "sha256-vnRsSkhjeDxZ2bYbIe+2D4GjymZWcIVo2LAPuCaYIZo="; + }; + + build-system = [ setuptools ]; + + dependencies = [ lxml ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "lxml_html_clean" ]; + + meta = with lib; { + description = "Separate project for HTML cleaning functionalities copied from lxml.html.clean"; + homepage = "https://github.com/fedora-python/lxml_html_clean/"; + changelog = "https://github.com/fedora-python/lxml_html_clean/blob/${version}/CHANGES.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 3b4e459669e4..f344a92445ab 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -1,38 +1,34 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub - -# build-system -, hatch-requirements-txt -, hatch-nodejs-version -, hatchling -, trove-classifiers - -# dependencies -, babel -, colorama -, jinja2 -, markdown -, mkdocs -, mkdocs-material-extensions -, paginate -, pygments -, pymdown-extensions -, pythonOlder -, regex -, requests - -# optional-dependencies -, mkdocs-minify-plugin -, mkdocs-redirects -, mkdocs-git-revision-date-localized-plugin -, pillow -, cairosvg +{ + lib, + babel, + buildPythonPackage, + cairosvg, + colorama, + fetchFromGitHub, + hatch-nodejs-version, + hatch-requirements-txt, + hatchling, + jinja2, + markdown, + mkdocs, + mkdocs-git-revision-date-localized-plugin, + mkdocs-material-extensions, + mkdocs-minify-plugin, + mkdocs-redirects, + mkdocs-rss-plugin, + paginate, + pillow, + pygments, + pymdown-extensions, + pythonOlder, + regex, + requests, + trove-classifiers, }: buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.17"; + version = "9.5.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-r+w3Nf7mAfWiDUeOelO+ykizeqxRiKWBnbUjakXov3U="; + hash = "sha256-5FCIDAWRY6YfZi4QbcEpJMFfbJ17vudxlUYx4czDxrY="; }; nativeBuildInputs = [ @@ -69,7 +65,7 @@ buildPythonPackage rec { recommended = [ mkdocs-minify-plugin mkdocs-redirects - # TODO: mkdocs-rss-plugin + mkdocs-rss-plugin ]; git = [ # TODO: gmkdocs-git-committers-plugin @@ -84,9 +80,7 @@ buildPythonPackage rec { # No tests for python doCheck = false; - pythonImportsCheck = [ - "mkdocs" - ]; + pythonImportsCheck = [ "mkdocs" ]; meta = with lib; { changelog = "https://github.com/squidfunk/mkdocs-material/blob/${src.rev}/CHANGELOG"; diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix new file mode 100644 index 000000000000..5328c196c31e --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + feedparser, + fetchFromGitHub, + gitpython, + jsonfeed, + mkdocs, + pytestCheckHook, + pythonOlder, + setuptools, + validator-collection, +}: + +buildPythonPackage rec { + pname = "mkdocs-rss-plugin"; + version = "1.12.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Guts"; + repo = "mkdocs-rss-plugin"; + rev = "refs/tags/${version}"; + hash = "sha256-cLQfhMYW/9Eb+IamQIC7fZRTm/ORD8xbcrmKkSkUrMs="; + }; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + build-system = [ setuptools ]; + + dependencies = [ + gitpython + mkdocs + ]; + + nativeCheckInputs = [ + feedparser + jsonfeed + pytestCheckHook + validator-collection + ]; + + pythonImportsCheck = [ "mkdocs_rss_plugin" ]; + + disabledTests = [ + # Tests require network access + "test_plugin_config_through_mkdocs" + "test_remote_image_ok" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/test_integrations_material_social_cards.py" + "tests/test_build_no_git.py" + "tests/test_build.py" + ]; + + meta = with lib; { + description = "MkDocs plugin to generate a RSS feeds for created and updated pages, using git log and YAML frontmatter"; + homepage = "https://github.com/Guts/mkdocs-rss-plugin"; + changelog = "https://github.com/Guts/mkdocs-rss-plugin/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index 9b835d52737a..2c3f2b76f0ae 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "napalm"; - version = "4.1.0"; + version = "5.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "napalm-automation"; repo = "napalm"; rev = "refs/tags/${version}"; - hash = "sha256-JqjuYMJcP58UMn1pPYg7x8KpqCKQUs19Ng9HbI2iX38="; + hash = "sha256-Abw3h69qTFwOOFeAfivqAIWLozErJ1yZZfx7CbMy1AI="; }; nativeBuildInputs = [ @@ -52,7 +52,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi - future jinja2 junos-eznc lxml diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 6fee91c77fce..a006c0cbd2d6 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nox"; - version = "2024.03.02"; + version = "2024.04.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "wntrblm"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-P86Jy/5MQnuWHelJFQ4kUCFg86Dwzx0Sm/sRonf0pZk="; + hash = "sha256-PagZR2IdS1gS/ukl4b0Al9sdEsFnFwP8oy0eOGKJHMs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix index 13a146b1dce6..c6429d3582bc 100644 --- a/pkgs/development/python-modules/oca-port/default.nix +++ b/pkgs/development/python-modules/oca-port/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oca-port"; - version = "0.14"; + version = "0.15"; format = "pyproject"; src = fetchPypi { inherit version; pname = "oca_port"; - hash = "sha256-P+uCoC2u5lR4oTtloNFd4N+CjssUa5PbzbnhEulaRoc="; + hash = "sha256-DqoIzZj++XF2ZYECpLQX1RD97Y3I2uvs1OI7QyfB7dE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index eb9b8e6a3463..e80b04011e94 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240412"; + version = "0.10.0.20240416"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G2hdl029MlirHH9HNEnPKlUnWnSplbYKhBDw8H1/W3g="; + hash = "sha256-Y0QP9SNJQOMGEKAEeDwKNTRQtFiwUOWGLbkGJx66SBk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 26a101389eb7..3bf3e8c67d1d 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.3.0"; + version = "2.4.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; rev = "refs/tags/v${version}"; - hash = "sha256-lSNdwM+b91XWILKjGsi73Tu29spOdnFznuE7ELg+mhw="; + hash = "sha256-EeUJOdGmYGy75/3RR5AeTu4oImnZGesve5pE+5YsTCI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index b2a0256415d1..5fa9e60ae5c6 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -16,7 +16,7 @@ let in buildPythonPackage rec { - version = "2.0.8"; + version = "2.0.9"; pname = "pyscard"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "LudovicRousseau"; repo = "pyscard"; rev = "refs/tags/${version}"; - hash = "sha256-UpTSbq4mf42tcSWL8wR54MQDZ+z2YjrTW0Ud2F5/J2E="; + hash = "sha256-DO4Ea+mlrWPpOLI8Eki+03UnsOXEhN2PAl0+gdN5sTo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index c36b607fb82b..b3235c70eee5 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1129"; + version = "3.0.1130"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-YYLlnj7qfF4iKJSnaq6EAtvjJKm1yWop6HT5vY/zTkc="; + hash = "sha256-NstigWCYGfsycosREvaupJ/oIEWfli38lYAq2jClvw4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 92481399143d..8e221c312bae 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,49 +1,59 @@ -{ lib -, buildPythonPackage -, click -, click-completion -, factory-boy -, faker -, fetchPypi -, inquirer -, notify-py -, pbr -, pendulum -, ptable -, pytest-mock -, pytestCheckHook -, pythonOlder -, requests -, twine -, validate-email +{ + lib, + buildPythonPackage, + click, + click-completion, + factory-boy, + faker, + fetchPypi, + inquirer, + notify-py, + pbr, + pendulum, + prettytable, + pytest-mock, + pytestCheckHook, + pythonOlder, + requests, + setuptools, + twine, + validate-email, }: buildPythonPackage rec { pname = "toggl-cli"; - version = "2.4.3"; - format = "setuptools"; + version = "2.4.4"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "togglCli"; inherit version; - hash = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; + hash = "sha256-P4pv6LMPIWXD04IQw01yo3z3voeV4OmsBOCSJgcrZ6g="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace requirements.txt \ + --replace-fail "==" ">=" + substituteInPlace pytest.ini \ + --replace ' --cov toggl -m "not premium"' "" + ''; + + build-system = [ pbr + setuptools twine ]; - propagatedBuildInputs = [ + dependencies = [ click click-completion inquirer notify-py pbr pendulum - ptable + prettytable requests validate-email ]; @@ -55,16 +65,6 @@ buildPythonPackage rec { factory-boy ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "notify-py==0.3.3" "notify-py>=0.3.3" \ - --replace "click==8.0.3" "click>=8.0.3" \ - --replace "pbr==5.8.0" "pbr>=5.8.0" \ - --replace "inquirer==2.9.1" "inquirer>=2.9.1" - substituteInPlace pytest.ini \ - --replace ' --cov toggl -m "not premium"' "" - ''; - preCheck = '' export TOGGL_API_TOKEN=your_api_token export TOGGL_PASSWORD=toggl_password @@ -74,23 +74,22 @@ buildPythonPackage rec { disabledTests = [ "integration" "premium" + "test_basic_usage" + "test_now" "test_parsing" "test_type_check" - "test_now" ]; - pythonImportsCheck = [ - "toggl" - ]; + pythonImportsCheck = [ "toggl" ]; # updates to a bogus tag passthru.skipBulkUpdate = true; meta = with lib; { description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; - mainProgram = "toggl"; homepage = "https://toggl.uhlir.dev/"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; + mainProgram = "toggl"; }; } diff --git a/pkgs/development/python-modules/validate-email/default.nix b/pkgs/development/python-modules/validate-email/default.nix index 1c8e8d3c384a..441a0671461c 100644 --- a/pkgs/development/python-modules/validate-email/default.nix +++ b/pkgs/development/python-modules/validate-email/default.nix @@ -1,23 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, +}: buildPythonPackage rec { pname = "validate-email"; version = "1.3"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; pname = "validate_email"; - sha256 = "1bxffaf5yz2cph8ki55vdvdypbwkvn2xr1firlcy62vqbzf1jivq"; + hash = "sha256-eEcZ3F94C+MZzdGF3IXdk6/r2267lDgRvEx8X5xyrq8="; }; + build-system = [ setuptools ]; + # No tests doCheck = false; + pythonImportsCheck = [ "validate_email" ]; + meta = with lib; { - homepage = "https://github.com/syrusakbary/validate_email"; description = "Verify if an email address is valid and really exists"; + homepage = "https://github.com/syrusakbary/validate_email"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix new file mode 100644 index 000000000000..8625956d7754 --- /dev/null +++ b/pkgs/development/python-modules/validator-collection/default.nix @@ -0,0 +1,145 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + alabaster, + attrs, + babel, + certifi, + cffi, + chardet, + codecov, + colorama, + coverage, + docutils, + filelock, + html5lib, + idna, + imagesize, + isort, + jinja2, + jsonschema, + lazy-object-proxy, + markupsafe, + mccabe, + more-itertools, + packaging, + pkginfo, + pluggy, + py, + py-cpuinfo, + pycparser, + pyfakefs, + pygments, + pyparsing, + pytest, + pytest-benchmark, + pytest-cov, + pytz, + readme-renderer, + requests, + requests-toolbelt, + restview, + six, + snowballstemmer, + sphinx, + sphinx-rtd-theme, + sphinx-tabs, + sphinxcontrib-websupport, + toml, + pytestCheckHook, + tox, + tqdm, + twine, + urllib3, + virtualenv, + webencodings, + wrapt, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "validator-collection"; + version = "1.5.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "insightindustry"; + repo = "validator-collection"; + rev = "refs/tags/v.${version}"; + hash = "sha256-CDPfIkZZRpl1rAzNpLKJfaBEGWUl71coic2jOHIgi6o="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + alabaster + attrs + babel + certifi + cffi + chardet + codecov + colorama + coverage + docutils + filelock + html5lib + idna + imagesize + isort + jinja2 + jsonschema + lazy-object-proxy + markupsafe + mccabe + more-itertools + packaging + pkginfo + pluggy + py + py-cpuinfo + pycparser + pyfakefs + pygments + pyparsing + pytest + pytest-benchmark + pytest-cov + pytz + readme-renderer + requests + requests-toolbelt + restview + six + snowballstemmer + sphinx + sphinx-rtd-theme + sphinx-tabs + sphinxcontrib-websupport + toml + tox + tqdm + twine + urllib3 + virtualenv + webencodings + wrapt + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "validator_collection" ]; + + meta = with lib; { + description = "Python library of 60+ commonly-used validator functions"; + homepage = "https://github.com/insightindustry/validator-collection/"; + changelog = "https://github.com/insightindustry/validator-collection/blob/${src.rev}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/xlsxwriter/default.nix b/pkgs/development/python-modules/xlsxwriter/default.nix index 9eb6c83716aa..115993e756bc 100644 --- a/pkgs/development/python-modules/xlsxwriter/default.nix +++ b/pkgs/development/python-modules/xlsxwriter/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "xlsxwriter"; - version = "3.1.9"; - format = "setuptools"; + version = "3.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = "XlsxWriter"; rev = "RELEASE_${version}"; - hash = "sha256-FkSInLinyn/eXBMSuivzFxCTZijOKdSG4l+gHyKENuY="; + hash = "sha256-HLSIKoGBSzU7N/lskVeVbfdOezTloMrwAahJbcnqJrw="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -29,10 +34,10 @@ buildPythonPackage rec { meta = with lib; { description = "Module for creating Excel XLSX files"; - mainProgram = "vba_extract.py"; homepage = "https://xlsxwriter.readthedocs.io/"; changelog = "https://xlsxwriter.readthedocs.io/changes.html"; license = licenses.bsd2; maintainers = with maintainers; [ jluttine ]; + mainProgram = "vba_extract.py"; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f908ee34e1a2..e2b2e7feea00 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -343,6 +343,7 @@ let fftw = [ pkgs.fftw.dev ]; fftwtools = with pkgs; [ fftw.dev pkg-config ]; Formula = [ pkgs.gmp ]; + gdalraster = [ pkgs.pkg-config ]; gdtools = with pkgs; [ cairo.dev fontconfig.lib freetype.dev ]; GeneralizedWendland = [ pkgs.gsl ]; ggiraph = with pkgs; [ pkgs.libpng.dev ]; @@ -549,6 +550,7 @@ let coga = [ pkgs.gsl.dev ]; deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; epialleleR = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; + gdalraster = with pkgs; [ gdal proj.dev sqlite.dev ]; gpg = [ pkgs.gpgme ]; webp = [ pkgs.libwebp ]; RMark = [ pkgs.which ]; @@ -583,6 +585,7 @@ let openssl = [ pkgs.pkg-config ]; pdftools = [ pkgs.pkg-config ]; qckitfastq = [ pkgs.zlib.dev ]; + raer = with pkgs; [ zlib.dev xz.dev bzip2.dev ]; RQuantLib = with pkgs; [ quantlib.dev boost.dev ]; sf = with pkgs; [ pkg-config sqlite.dev proj.dev ]; terra = with pkgs; [ pkg-config sqlite.dev proj.dev ]; @@ -595,6 +598,7 @@ let Cairo = [ pkgs.pkg-config ]; CLVTools = [ pkgs.gsl ]; excursions = [ pkgs.gsl ]; + gpuMagic = [ pkgs.ocl-icd ]; JMcmprsk = [ pkgs.gsl ]; KSgeneral = [ pkgs.fftw.dev ]; mashr = [ pkgs.gsl ]; @@ -639,7 +643,7 @@ let Rmmquant = [ pkgs.zlib.dev ]; SICtools = with pkgs; [ zlib.dev ncurses.dev ]; Signac = [ pkgs.zlib.dev ]; - TransView = [ pkgs.zlib.dev ]; + TransView = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; bigsnpr = [ pkgs.zlib.dev ]; zlib = [ pkgs.zlib.dev ]; divest = [ pkgs.zlib.dev ]; @@ -678,6 +682,7 @@ let crandep = [ pkgs.gsl ]; catSurv = [ pkgs.gsl ]; ccfindR = [ pkgs.gsl ]; + screenCounter = [ pkgs.zlib.dev ]; SPARSEMODr = [ pkgs.gsl ]; RKHSMetaMod = [ pkgs.gsl ]; LCMCR = [ pkgs.gsl ]; @@ -913,6 +918,7 @@ let "MSnID" "OmnipathR" "precommit" + "protGear" "PSCBS" "iemisc" "repmis" @@ -957,9 +963,11 @@ let ]; packagesToSkipCheck = [ + "MsDataHub" # tries to connect to ExperimentHub "Rmpi" # tries to run MPI processes "ReactomeContentService4R" # tries to connect to Reactome "PhIPData" # tries to download something from a DB + "RBioFormats" # tries to download jar during load test "pbdMPI" # tries to run MPI processes "data_table" # fails to rename shared library before check "coMethDMR" # tries to connect to ExperimentHub diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 5adeefc36d32..702fdeb47e89 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.60"; + version = "3.2.66"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-uHHNbfapnMDhIsOHRAsxNuRCvf6N3Wui/lU5lQpr+7Y="; + hash = "sha256-Wtpg3Fk3hxmbZ2Tz5XIjM2mdh8jq4O67nD2rxAGlcaY="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 63adb92c6ee5..fad90ae480f8 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-HLoTQrC8LVI2LZFJPRaobFX0TgT8mwVkmzyuii5bGA8="; + hash = "sha256-0Dk3f38kj4bSTffFVhMNwuQXmty7vZMAieKDmkH945Y="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-L7LDOfJ2v4FIdF8Ttpy7qOhMMLFFuhVxjuy5znn9Yb4="; + vendorHash = "sha256-WT30up/1Y2ar0pkHOq1s0Sz7qc4b+Yr6gILzDYDo0Uk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix index 7eb473ad7791..e6a964fa663d 100644 --- a/pkgs/development/tools/goresym/default.nix +++ b/pkgs/development/tools/goresym/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "goresym"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "mandiant"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bZOq3GvGRyeIyN/CEuMA6mQjjrRvoVU9fUEUptd6NH0="; + sha256 = "sha256-U3AjEKQKPS5ghrmEJTsGRIC2BoPYAWL6RDPhA+eN2hg="; }; subPackages = [ "." ]; diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix index aa7d7724acba..bdca841eeccb 100644 --- a/pkgs/development/tools/ijq/default.nix +++ b/pkgs/development/tools/ijq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ijq"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromSourcehut { owner = "~gpanders"; repo = pname; rev = "v${version}"; - sha256 = "sha256-su/PHUt4GpJxt9nm/oYnP1F8EDSl0fUgamWJj1TxuZA="; + sha256 = "sha256-KtWJwIofMKW+03DFY4UWf3ni1DKuH289svh8iOPo1so="; }; - vendorHash = "sha256-X91kW+dpcxd1+vTV1G1al5cdlwWpbUS85Xxf3yeVg1I="; + vendorHash = "sha256-oMkL4qZUS47h9izDad7Ar0Npd6toIZQuy1YIdEoJ2AM="; nativeBuildInputs = [ installShellFiles makeWrapper scdoc ]; diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 2fb1cfa5244a..7a791f75936e 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-1mq6tH3jFzyzQ0nsen9r08RrXMn16O7gOz7GS3nr10I="; + hash = "sha256-XUzXqzgAIZKWNpfyBvkYX/g1R8JcIJlVTUb2N4zL96w="; }; - cargoHash = "sha256-BtdMsJqAU9Y1QntUBymlYLJdfx9aP7hf/Za8G8D6w54="; + cargoHash = "sha256-U2ocN9UENms0KZQuEu75jmxphyNGz5OYCLrh6vhvKiI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/wizer/default.nix b/pkgs/development/tools/wizer/default.nix index 0f8e25e54bd6..7a46d673af9c 100644 --- a/pkgs/development/tools/wizer/default.nix +++ b/pkgs/development/tools/wizer/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { pname = "wizer"; - version = "5.0.0"; + version = "6.0.0"; # the crate does not contain files which are necessary for the tests # see https://github.com/bytecodealliance/wizer/commit/3a95e27ce42f1fdaef07b52988e4699eaa221e04 @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage rec { owner = "bytecodealliance"; repo = "wizer"; rev = "refs/tags/v${version}"; - hash = "sha256-VkWnmwOnlNkfgUyFXV+iwsUdJcJgzUCNus+FiV9sg0Y="; + hash = "sha256-JQrZysQJOM4G5EwyBlXXd7NTCCoGkOLDahwH0I1b0TY="; }; - cargoHash = "sha256-KSdQqt9szk8qmg3DxBatkJvv//KbSx/MEulJx1gNmB8="; + cargoHash = "sha256-qMBsk8dLmneAYx8FJ9QqW0kLKFTn11EvV9VeVJkr5FU="; cargoBuildFlags = [ "--bin" pname ]; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 47026485e9e6..fbafe8c1b326 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -5,16 +5,16 @@ callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-PUAHsFW8rb4SZlZKCIx6SO3U7I7uJgfUal2VXzUjQNs="; + hash = "sha256-CZOi3kLwYdA4U9LjgK4ukPTLFUodyubSQg9JaJpUB9s="; }; - depsHash = "sha256-QfAV6LYD6S/8ptaqqKSDtOe4kStwp6LJp8WVc3sH8yc="; + depsHash = "sha256-vihoR0bPh7590sRxeYJ1uuynNRxtRBuiFUrdmsRNUJc="; passthru.tests = { shattered-pixel-dungeon-starts = nixosTests.shattered-pixel-dungeon; diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix index 918bfb7684c9..26d89978c1a2 100644 --- a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix @@ -4,21 +4,21 @@ callPackage ./generic.nix rec { pname = "experienced-pixel-dungeon"; - version = "2.16.2"; + version = "2.17.2"; src = fetchFromGitHub { owner = "TrashboxBobylev"; repo = "Experienced-Pixel-Dungeon-Redone"; rev = "ExpPD-${version}"; - hash = "sha256-fTHAA3pCXAA9W32eeY29eaLnfcG5pLop/awQG5zKMt4="; + hash = "sha256-eX+wPw2Bi37yQZ+ftjEkiGzvheJZingqDqy1481ABvs="; }; postPatch = '' substituteInPlace build.gradle \ - --replace "gdxControllersVersion = '2.2.3-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" + --replace-fail "gdxControllersVersion = '2.2.3-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" ''; - depsHash = "sha256-MUUeWZUCVPakK1MJwn0lPnjAlLpPWB/J17Ad68XRcHg="; + depsHash = "sha256-PyBEhlOOVD3/YH4SWs1yMkdg3U96znk1/VV6SAr8S30="; desktopName = "Experienced Pixel Dungeon"; diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix index 062e76cf8526..6b52ebe0b5f3 100644 --- a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix @@ -4,18 +4,18 @@ callPackage ./generic.nix rec { pname = "shorter-pixel-dungeon"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "TrashboxBobylev"; repo = "Shorter-Pixel-Dungeon"; rev = "Short-${version}"; - hash = "sha256-8vmh65XlNqfIh4WHLPuWU68tb3ajKI8kBMI68CYlsSk="; + hash = "sha256-dfBFAXlMjazTjvvRZ87H48OmitZuHhaa3qUF81pF4wc="; }; postPatch = '' substituteInPlace build.gradle \ - --replace "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" + --replace-fail "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" ''; depsHash = "sha256-MUUeWZUCVPakK1MJwn0lPnjAlLpPWB/J17Ad68XRcHg="; diff --git a/pkgs/os-specific/linux/pam_rssh/default.nix b/pkgs/os-specific/linux/pam_rssh/default.nix index 2da53d462790..8b4224d6f4df 100644 --- a/pkgs/os-specific/linux/pam_rssh/default.nix +++ b/pkgs/os-specific/linux/pam_rssh/default.nix @@ -1,11 +1,12 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, coreutils -, pkg-config -, openssl -, pam -, openssh +{ + lib, + rustPlatform, + fetchFromGitHub, + coreutils, + pkg-config, + openssl, + pam, + openssh, }: rustPlatform.buildRustPackage rec { @@ -28,9 +29,7 @@ rustPlatform.buildRustPackage rec { --replace '/bin/false' '${coreutils}/bin/false' ''; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl @@ -42,9 +41,7 @@ rustPlatform.buildRustPackage rec { "--skip=tests::parse_user_authorized_keys" ]; - nativeCheckInputs = [ - openssh - ]; + nativeCheckInputs = [ (openssh.override { dsaKeysSupport = true; }) ]; env.USER = "nixbld"; diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index 9989a8971ffd..6267b14c0f4c 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.100.0"; + version = "1.100.1"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-jrKTic80y8r/1wOR8Prqe9PG57yo8qQIGsobu0I4kTY="; + sha256 = "sha256-OheW6sCn/yXgSrtUe1zqDGaH6G8HG4QRQhFznaZGvX0="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; diff --git a/pkgs/servers/urserver/default.nix b/pkgs/servers/urserver/default.nix index c84d40b69c22..c5c57f70f098 100644 --- a/pkgs/servers/urserver/default.nix +++ b/pkgs/servers/urserver/default.nix @@ -7,13 +7,13 @@ , makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "urserver"; - version = "3.10.0.2467"; + version = "3.13.0.2505"; src = fetchurl { - url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion version) 3}/urserver-${version}.tar.gz"; - sha256 = "sha256-IaLRhia6mb4h7x5MbBRtPJxJ3uTlkfOzmoTwYzwfbWA="; + url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion finalAttrs.version) 3}/urserver-${finalAttrs.version}.tar.gz"; + hash = "sha256-rklv6Ppha1HhEPunbL8ELYdQ9Z1FN4FrVsNwny3/gA4="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m755 -D urserver $out/bin/urserver - wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" + wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" cp -r remotes $out/bin/remotes cp -r manager $out/bin/manager ''; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sfrijters ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index a0dac3e33c91..f0098f3700e2 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-q22iK467dCW9y0ephVA+V9L9drO2631l4cLlphhdwnQ="; + hash = "sha256-Bqy9eFUvUgSdyChzh52qqPVvMi+3ad01koxVgnibbLk="; }; - vendorHash = "sha256-5lm3N9F1Pe/lSA63qk8/azo5FZzTvJE/Is2N9WKT+7k="; + vendorHash = "sha256-/NMp64JeCQjCcEYkE6lYzu/E+irTcwkmDCJhB04ALFY="; doCheck = false; diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/tools/misc/edir/default.nix index 41e51a251b38..3ca072e8a245 100644 --- a/pkgs/tools/misc/edir/default.nix +++ b/pkgs/tools/misc/edir/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "edir"; - version = "2.27"; + version = "2.28"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i9c5DDZnCj6Roqw6fpy+rhX2/Sup1hh8vIpsRcWZQFc="; + sha256 = "sha256-tQomMXmqOFHxxWjs1fOzh61JIs7TI6MIXK3Y6Cs/MZA="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index f573ffb2bd1a..86debbf38800 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-yB9VOrfL6eFdENiWsqQcVMEVJjRjp3El/JUp2jX5nM8="; + sha256 = "sha256-Gx/ld651Se2mLlUG/CkHawfVBN2BsxV8w6vrnKFLHuE="; }; vendorHash = "sha256-+mnnvdna1g6JE29weOJZmdO3jFp2a75dV9wK2XcWJ9s="; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 160bb2bab62d..e32304e1f201 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.39.2"; + version = "0.40.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - hash = "sha256-FSLbRfxSWY0a9H9iHT3oQ2SXwB70AwyH0Cm8sDZGaUk="; + hash = "sha256-1z7qIgjElE9gw0lY+A17gsYIcnKRceZTFnRd8fMeBg8="; }; - cargoHash = "sha256-a5dFtK5czOGqE6mKeeI0kkY2da1kS3IRZ1NTluZ9Syc="; + cargoHash = "sha256-KXXldWtcUsdbDsWd66Q1TbaClfr+Uo8f6gCi1exNIRc="; nativeBuildInputs = [ mandown diff --git a/pkgs/tools/security/chainsaw/default.nix b/pkgs/tools/security/chainsaw/default.nix index 2bc06428e781..0ecd5654ceca 100644 --- a/pkgs/tools/security/chainsaw/default.nix +++ b/pkgs/tools/security/chainsaw/default.nix @@ -1,33 +1,37 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { pname = "chainsaw"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; rev = "refs/tags/v${version}"; - hash = "sha256-YEw/rN7X+npc9M8XdPGAZyYXSQOGiR0w9Wb3W63g8VU="; + hash = "sha256-ErDIfLhzCiFm3dZzr6ThjYCplfDKbALAqcu8c0gREH4="; }; - cargoHash = "sha256-cXvXvSipZFfanmn9QFtYZYEudZ6lyvsu2EMGD0lZEtw="; + cargoHash = "sha256-IS2gQ6STrS+Msa36I+eM1RPGntX+DbsrKZPVZ1q9eo4="; - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; + + ldflags = [ + "-w" + "-s" ]; meta = with lib; { description = "Rapidly Search and Hunt through Windows Forensic Artefacts"; - mainProgram = "chainsaw"; homepage = "https://github.com/WithSecureLabs/chainsaw"; changelog = "https://github.com/WithSecureLabs/chainsaw/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "chainsaw"; }; } diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 31c2d4825942..8efface2051a 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-04-14"; + version = "2024-04-16"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-KMvcK9uvXJ474SF+8tLLYyj5jHoqbWOkhRnlAfuKsMU="; + hash = "sha256-ExtWNve7YGkr6JHjzw39FJZwSNFLEJNurEn5uWwSlbY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix index c9a9c8cd1380..08ca48bc097a 100644 --- a/pkgs/tools/security/flare-floss/default.nix +++ b/pkgs/tools/security/flare-floss/default.nix @@ -1,11 +1,12 @@ -{ lib -, python3 -, fetchFromGitHub +{ + lib, + python3, + fetchFromGitHub, }: python3.pkgs.buildPythonPackage rec { pname = "flare-floss"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { @@ -13,33 +14,37 @@ python3.pkgs.buildPythonPackage rec { repo = "flare-floss"; rev = "refs/tags/v${version}"; fetchSubmodules = true; # for tests - hash = "sha256-bmOWOFqyvOvSrNTbwLqo0WMq4IAZxZ0YYaWCdCrpziU="; + hash = "sha256-a20q7kavWwCsfnAW02+IY0jKERMxkJ+2nid/CwQxC9E="; }; postPatch = '' - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace "==" ">=" substituteInPlace floss/main.py \ --replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"' ''; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools + setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ - binary2strings - halo - networkx - pefile - pydantic_1 - rich - tabulate - tqdm - viv-utils - vivisect - ] ++ viv-utils.optional-dependencies.flirt; + dependencies = + with python3.pkgs; + [ + binary2strings + halo + networkx + pefile + pydantic + rich + tabulate + tqdm + viv-utils + vivisect + ] + ++ viv-utils.optional-dependencies.flirt; nativeCheckInputs = with python3.pkgs; [ pytest-sugar diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 2f850eb98b90..927059a248fc 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.75.0"; + version = "0.76.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-FOKSJ9u1+johBRL37I/sYo+BH9Na3vzxRTr6PqiLWrs="; + hash = "sha256-FdxtJVLeH7UQBYjoOuimCoswvIkz/2sBJ4Kn5NGBDWY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-C1xM0OcEsplWOe0SGL6SCAvFq7M5LcekYyQTjP9EZB4="; + vendorHash = "sha256-oJNTvbfVkz4fK+EsF2ZoFfBSlkt0pFT4r2QDyhZhv5Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/semgrep/common.nix b/pkgs/tools/security/semgrep/common.nix index 3436d4267964..cfc4045457be 100644 --- a/pkgs/tools/security/semgrep/common.nix +++ b/pkgs/tools/security/semgrep/common.nix @@ -1,9 +1,9 @@ { lib }: rec { - version = "1.66.2"; + version = "1.67.0"; - srcHash = "sha256-xonZzZsAkAPMVINGEA10CvQ1diYgHBowNsR2pk4tYr8="; + srcHash = "sha256-B+2DgwU+yhU337yZh518Z2Tq0Wbun8WEXX9IpC0Ut/c="; # submodule dependencies # these are fetched so we: @@ -13,8 +13,8 @@ rec { "cli/src/semgrep/semgrep_interfaces" = { owner = "semgrep"; repo = "semgrep-interfaces"; - rev = "215a54782174de84f97188632b4a37e35ba0f827"; - hash = "sha256-Q8E5LkC/NV0wvt9ZwhkoPGjPlDavVHHMnX0sVNK3dAM="; + rev = "3ee41bc436308a7c12b66247cfcb60df0aeff8ea"; + hash = "sha256-rlhArVSNJr4AgZw/TOOMPgpBOfHWsAm77YgrRdCjIzI="; }; }; @@ -25,15 +25,19 @@ rec { core = { x86_64-linux = { platform = "any"; - hash = "sha256-f/RcuJyd8y2bMclMxZ1BdNTVixhjLz0UxSKGZm+H8yI="; + hash = "sha256-iv02L/dvcfI/9XubC+EOeqMaVwdXh0sqLv02j1fn1aM="; + }; + aarch64-linux = { + platform = "musllinux_1_0_aarch64.manylinux2014_aarch64"; + hash = "sha256-wFuEcgCuciAOR8MNCxHW8TCoji97g7dXUf06M0T9MWg="; }; x86_64-darwin = { platform = "macosx_10_14_x86_64"; - hash = "sha256-4H9PT41lPydMFl51O2CgeMQiTE66fZ8RP26CVT7Y7Ok="; + hash = "sha256-wMkOZFvR6HBBTvu8mXRDF2s0Mqp/LkhVH2I+2sIIa94="; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; - hash = "sha256-WxQ0ohojzhWmPo208xN98F5GwbNzQuxCjSwP7h3rBGA="; + hash = "sha256-AKNc9SxXbKb6WdFlE6aqzFDdtMGzl+3LhXTbNvFSHYQ="; }; }; diff --git a/pkgs/tools/security/semgrep/update.sh b/pkgs/tools/security/semgrep/update.sh index 67b720154b0b..914de6c9331f 100755 --- a/pkgs/tools/security/semgrep/update.sh +++ b/pkgs/tools/security/semgrep/update.sh @@ -95,6 +95,7 @@ update_core_platform() { } update_core_platform "x86_64-linux" +update_core_platform "aarch64-linux" update_core_platform "x86_64-darwin" update_core_platform "aarch64-darwin" diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 49bd81c7e01e..5420591e5842 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7AppXnU9VQx1CMyK2evWtRFVb8qvgSzKp+oFKoIGR9w="; + sha256 = "sha256-v+WqiHecps3rCGf6CF0KJDZUWs7zMrFypVPTANR8b6Y="; }; - cargoHash = "sha256-npbvKwxf6OxNw340yZ9vrQkXrZxD4G8yhZZEdDLwLs8="; + cargoHash = "sha256-v5QxJto9acVJnMUvBK3QdkDH+qO2+wtqitGfSCcaJ5w="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix index 782d746398a1..fe8aa63c0cff 100644 --- a/pkgs/tools/text/hck/default.nix +++ b/pkgs/tools/text/hck/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - hash = "sha256-KPpvai7+El2JA97EXDCstZ66FeyVCe7w+ERDDNRZ/h8="; + hash = "sha256-L/jad3T89VFub0JBC/o/xc4RI+/tF0hbhZdSxmSs+lo="; }; - cargoHash = "sha256-TpwUO0BL8kambnxAUE9+l6YYkNL1WzmkTYn1YxjufdY="; + cargoHash = "sha256-9v3yZNKBZ0XQkA7J50GH/Z4JQUQ48HnjNXr90ZBHXgI="; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sstadick/hck"; changelog = "https://github.com/sstadick/hck/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ unlicense ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda gepbird ]; mainProgram = "hck"; }; } diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 64334c3cd121..95203d44a74a 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.36.3"; + version = "0.37.0"; subPackages = [ "govc" ]; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-R/YqP7vrgfTeRVf6VDFdY2GGtHJZmZm1z/QA9tIE9HE="; + sha256 = "sha256-rE19ky/x3pqlz2/6W8ucrctgpJFefEKfzpW4DEDCQ3E="; }; vendorHash = "sha256-1EAQMYaTEtfAiu7+UTkC7QZwSWC1Ihwj9leTd90T0ZU="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd2972f9cc04..21c907aab72a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10230,8 +10230,6 @@ with pkgs; ktailctl = kdePackages.callPackage ../applications/networking/ktailctl {}; - iredis = callPackage ../tools/admin/iredis { }; - ispell = callPackage ../tools/text/ispell { }; iodash = callPackage ../development/libraries/iodash { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7be758b6f61b..2403b1d57300 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1084,6 +1084,8 @@ let minttea = callPackage ../development/ocaml-modules/minttea { }; + miou = callPackage ../development/ocaml-modules/miou { }; + mirage = callPackage ../development/ocaml-modules/mirage { }; mirage-block = callPackage ../development/ocaml-modules/mirage-block { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b12de730281..4731c7459fcd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6079,6 +6079,8 @@ self: super: with self; { jsondiff = callPackage ../development/python-modules/jsondiff { }; + jsonfeed = callPackage ../development/python-modules/jsonfeed { }; + jsonfield = callPackage ../development/python-modules/jsonfield { }; jsonlines = callPackage ../development/python-modules/jsonlines { }; @@ -6991,6 +6993,8 @@ self: super: with self; { inherit (pkgs) libxml2 libxslt zlib; }; + lxml-html-clean = callPackage ../development/python-modules/lxml-html-clean { }; + lxml-stubs = callPackage ../development/python-modules/lxml-stubs { }; lyricwikia = callPackage ../development/python-modules/lyricwikia { }; @@ -7430,30 +7434,49 @@ self: super: with self; { mizani = callPackage ../development/python-modules/mizani { }; mkdocs = callPackage ../development/python-modules/mkdocs { }; + mkdocs-autolinks-plugin = callPackage ../development/python-modules/mkdocs-autolinks-plugin { }; + mkdocs-autorefs = callPackage ../development/python-modules/mkdocs-autorefs { }; + mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { }; + mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; - mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { }; - mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; + mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { }; + mkdocs-git-revision-date-localized-plugin = callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin { }; + + mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; + + mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { }; + mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { }; + mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; + mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; + mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { }; + + mkdocs-mermaid2-plugin = callPackage ../development/python-modules/mkdocs-mermaid2-plugin { }; + mkdocs-minify-plugin = callPackage ../development/python-modules/mkdocs-minify-plugin { }; + mkdocs-redirects = callPackage ../development/python-modules/mkdocs-redirects { }; + mkdocs-redoc-tag = callPackage ../development/python-modules/mkdocs-redoc-tag { }; + + mkdocs-rss-plugin = callPackage ../development/python-modules/mkdocs-rss-plugin { }; + mkdocs-simple-hooks = callPackage ../development/python-modules/mkdocs-simple-hooks { }; + mkdocs-swagger-ui-tag = callPackage ../development/python-modules/mkdocs-swagger-ui-tag { }; mkdocstrings = callPackage ../development/python-modules/mkdocstrings { }; mkdocstrings-python = callPackage ../development/python-modules/mkdocstrings-python { }; - mkdocs-mermaid2-plugin = callPackage ../development/python-modules/mkdocs-mermaid2-plugin { }; - mkl-service = callPackage ../development/python-modules/mkl-service { }; ml-collections = callPackage ../development/python-modules/ml-collections { }; @@ -16418,6 +16441,8 @@ self: super: with self; { validate-email = callPackage ../development/python-modules/validate-email { }; + validator-collection = callPackage ../development/python-modules/validator-collection { }; + validators = callPackage ../development/python-modules/validators { }; validobj = callPackage ../development/python-modules/validobj { };