diff options
Diffstat (limited to 'pkgs')
94 files changed, 631 insertions, 492 deletions
diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index b85aa4c0df762..148dd8788634a 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -22,14 +22,14 @@ let keywords = [ "tracker" "music" ]; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { inherit pname; version = if isStereo then "2.77" # stereo else "2.76"; # normal src = fetchurl { - url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${lib.optionalString isStereo "_Stereo"}.zip"; + url = "mirror://sourceforge/goattracker2/GoatTracker_${finalAttrs.version}${lib.optionalString isStereo "_Stereo"}.zip"; sha256 = if isStereo then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal @@ -43,10 +43,14 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)/bin/" ]; # The zip contains some build artifacts. - prePatch = "make clean"; + prePatch = '' + make clean + ''; # The destination does not get created automatically. - preBuild = "mkdir -p $out/bin"; + preBuild = '' + mkdir -p $out/bin + ''; # Other files get installed during the build phase. installPhase = '' @@ -54,6 +58,7 @@ in stdenv.mkDerivation rec { convert goattrk2.bmp goattracker.png install -Dm644 goattracker.png $out/share/icons/hicolor/32x32/apps/goattracker.png + install -Dm644 ../linux/goattracker.1 -t $out/share/man/man1/goattracker.1 runHook postInstall ''; @@ -66,7 +71,8 @@ in stdenv.mkDerivation rec { homepage = "https://cadaver.github.io/tools.html"; downloadPage = "https://sourceforge.net/projects/goattracker2/"; license = lib.licenses.gpl2Plus; + mainProgram = if isStereo then "gt2stereo" else "goattrk2"; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix index b87ad68ceee7d..324d0ca362b4c 100644 --- a/pkgs/applications/audio/hivelytracker/default.nix +++ b/pkgs/applications/audio/hivelytracker/default.nix @@ -6,21 +6,23 @@ , SDL_image , SDL_ttf , gtk3 +, wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hivelytracker"; version = "1.9"; src = fetchFromGitHub { owner = "pete-gordon"; repo = "hivelytracker"; - rev = "V${lib.replaceStrings ["."] ["_"] version}"; + rev = "V${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; sha256 = "148p320sd8phcpmj4m85ns5zly2dawbp8kgx9ryjfdk24pa88xg6"; }; nativeBuildInputs = [ pkg-config + wrapGAppsHook ]; buildInputs = [ @@ -62,7 +64,8 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd3; platforms = platforms.all; + mainProgram = "hivelytracker"; maintainers = with maintainers; [ fgaz ]; broken = stdenv.isDarwin; # TODO: try to use xcbuild }; -} +}) diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index fe9a117434fb5..d3cb9fcfab019 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -6,7 +6,7 @@ , Foundation }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "littlegptracker"; version = "unstable-2020-11-26"; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 7e486f640c93c..0f4bb9957f7a8 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -6,14 +6,14 @@ , SDL2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; version = "1.66.1"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-j7VPC1sj1Q+wL2TBgv06uYLPqym8F57HG1SRvj0Ggeo="; }; @@ -41,5 +41,4 @@ stdenv.mkDerivation rec { platforms = platforms.littleEndian; mainProgram = "pt2-clone"; }; -} - +}) diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index caef7fdd19a05..08efb76903351 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -9,12 +9,12 @@ , wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sfxr"; version = "1.2.1"; src = fetchurl { - url = "http://www.drpetter.se/files/sfxr-sdl-${version}.tar.gz"; + url = "http://www.drpetter.se/files/sfxr-sdl-${finalAttrs.version}.tar.gz"; sha256 = "0dfqgid6wzzyyhc0ha94prxax59wx79hqr25r6if6by9cj4vx4ya"; }; @@ -62,5 +62,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.unix; }; -} - +}) diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index f15ab26b8e098..eb51b2cd6e4bb 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -12,7 +12,7 @@ , libsndfile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "soundtracker"; version = "1.0.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Only the latest release is at the top level. # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. - url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.xz"; + url = "mirror://sourceforge/soundtracker/soundtracker-${finalAttrs.version}.tar.xz"; hash = "sha256-kNt0BSRaEQY+oa1xbuZ1l6nCqXhcktVugxzcC3ZDaX0="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 3db7185bf1982..70ce1fe48052c 100644 --- a/pkgs/applications/editors/libresprite/default.nix +++ b/pkgs/applications/editors/libresprite/default.nix @@ -27,14 +27,14 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libresprite"; version = "1.0"; src = fetchFromGitHub { owner = "LibreSprite"; repo = "LibreSprite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; sha256 = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY="; }; @@ -118,4 +118,4 @@ stdenv.mkDerivation rec { # https://github.com/LibreSprite/LibreSprite/issues/308 broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index 49611f1709b7f..8e6d8328a3cb3 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -12,14 +12,14 @@ , impy }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "evilpixie"; version = "0.3.1"; src = fetchFromGitHub { owner = "bcampbell"; repo = "evilpixie"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+DdAN+xDOYxLgLHUlr75piTEPrWpuOyXvxckhBEl7yU="; }; @@ -51,5 +51,4 @@ stdenv.mkDerivation rec { # https://github.com/bcampbell/evilpixie/issues/28 stdenv.isAarch64; }; -} - +}) diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 3ea22fff3dc1c..49499f7d7322e 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -18,7 +18,7 @@ , Foundation }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-obfuscate"; version = "0.0.9"; @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "Obfuscate"; - rev = version; + rev = finalAttrs.version; hash = "sha256-aUhzact437V/bSsG2Ddu2mC03LbyXFg+hJiuGy5NQfQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + inherit (finalAttrs) src; + name = "${finalAttrs.pname}-${finalAttrs.version}"; hash = "sha256-HUQvdCmzjdmuJGDLtC/86yzbRimLzx+XbW29f+Ua48w="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { mainProgram = "obfuscate"; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 968794ccec666..0b10cda884c7c 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook , glfw3, gtk3, libpng12 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goxel"; version = "0.14.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ueA0YW2n/DXd9AytDzfPtvtXbvuUm4VDwcdvHWObKxc="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ tilpner fgaz ]; }; -} +}) diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 6c15c55d3953b..2613304b17c23 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-New0+pWtKdEx/k69pNisNKYj6p998HoEjAhQEDugP/g="; + hash = "sha256-FzlukSQSKeQY6H53UfWXwL8bXkOXRhaA92/Kgxh4oms="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 23b6f5009ce42..771ae49e220d5 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -27,14 +27,14 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; version = "0.0.28"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-UjSm/J/y7MUg3Exmw0P56+bcjiLxXdGS2brocdzgJ+c="; }; @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/applications/misc/openrgb-plugins/effects/default.nix index 01ff200715166..f84aa13b72199 100644 --- a/pkgs/applications/misc/openrgb-plugins/effects/default.nix +++ b/pkgs/applications/misc/openrgb-plugins/effects/default.nix @@ -10,14 +10,14 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openrgb-plugin-effects"; version = "0.9"; src = fetchFromGitLab { owner = "OpenRGBDevelopers"; repo = "OpenRGBEffectsPlugin"; - rev = "release_${version}"; + rev = "release_${finalAttrs.version}"; hash = "sha256-8BnHifcFf7ESJgJi/q3ca38zuIVa++BoGlkWxj7gpog="; fetchSubmodules = true; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix index 5d0c4e966128f..9080f53481fbc 100644 --- a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix +++ b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix @@ -11,14 +11,14 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openrgb-plugin-hardwaresync"; version = "0.9"; src = fetchFromGitLab { owner = "OpenRGBDevelopers"; repo = "OpenRGBHardwareSyncPlugin"; - rev = "release_${version}"; + rev = "release_${finalAttrs.version}"; hash = "sha256-3sQFiqmXhuavce/6v3XBpp6PAduY7t440nXfbfCX9a0="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 2e9ed7aa78a92..67fa404adb679 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.4.12"; + version = "1.4.13"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-LrFF61D2b9+FWnVkb9MYxBJQxMtejuOmGTEtfSj1No4="; + hash = "sha256-6e3AFfjm/ajC+StldG92FyC2C5usAOUoZSqihQC9fKw="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-Z2vnLr14F/Etuq9yWH7ygQwa54an7v99LbU3gPcEuII="; + hash = "sha256-wyQi1F7TV4TQZFdqRLfo4f90pCaJeRrmNgU8UfY9FjQ="; }; nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ]; diff --git a/pkgs/applications/networking/sync/openrsync/default.nix b/pkgs/applications/networking/sync/openrsync/default.nix index 0398ccd960945..291db3c39951c 100644 --- a/pkgs/applications/networking/sync/openrsync/default.nix +++ b/pkgs/applications/networking/sync/openrsync/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openrsync"; version = "unstable-2022-05-08"; diff --git a/pkgs/applications/networking/upnp-router-control/default.nix b/pkgs/applications/networking/upnp-router-control/default.nix index 928c7a69fd8c6..761975a277bc4 100644 --- a/pkgs/applications/networking/upnp-router-control/default.nix +++ b/pkgs/applications/networking/upnp-router-control/default.nix @@ -12,12 +12,12 @@ , gupnp_1_6 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "upnp-router-control"; version = "0.3.4"; src = fetchzip { - url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.xz"; + url = "https://launchpad.net/upnp-router-control/trunk/${finalAttrs.version}/+download/upnp-router-control-${finalAttrs.version}.tar.xz"; hash = "sha256-28F/OB2fHemn7HLVFEDmefRA5AsEaQKy+Qbcv75z9w0="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "upnp-router-control"; }; -} +}) diff --git a/pkgs/applications/networking/yaup/default.nix b/pkgs/applications/networking/yaup/default.nix index a5c49ece00d1c..cc6ba09076cd0 100644 --- a/pkgs/applications/networking/yaup/default.nix +++ b/pkgs/applications/networking/yaup/default.nix @@ -8,7 +8,7 @@ , miniupnpc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "yaup"; version = "unstable-2019-10-16"; diff --git a/pkgs/by-name/cl/cloudrecon/package.nix b/pkgs/by-name/cl/cloudrecon/package.nix new file mode 100644 index 0000000000000..b7d1f7e730533 --- /dev/null +++ b/pkgs/by-name/cl/cloudrecon/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "cloudrecon"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "g0ldencybersec"; + repo = "CloudRecon"; + rev = "refs/tags/v${version}"; + hash = "sha256-I/pdipBC+DndAGS6L4i3YoMVBTlaXNzXopD+ZxyyRmY="; + }; + + vendorHash = "sha256-hLEmRq7Iw0hHEAla0Ehwk1EfmpBv6ddBuYtq12XdhVc="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to find assets from certificates"; + homepage = "https://github.com/g0ldencybersec/CloudRecon"; + changelog = "https://github.com/g0ldencybersec/CloudRecon/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "cloudrecon"; + }; +} diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index e9a81a90b2349..6b8369c02bff0 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.26.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.27.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version @@ -15,7 +15,7 @@ buildGoModule rec { # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-qvn5VqEPLkehFWamtPGRuDLJ06bd5bn1qZRp05jP2AY="; + hash = "sha256-xWVV2AUpogZaMb3v0w/C+DXvR2rmbOj1Bpyb3on2hfY="; }; # tarball contains multiple files/directories diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 19eab38e3c4e3..5c10e70ea4078 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.4"; + version = "1.6.5"; in buildGoModule { inherit pname version; @@ -15,10 +15,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-j4ejDL0QRpRUoUYYjYAlju0A9mHwtmBTRFQVYrh+xvU="; + hash = "sha256-C76yQ9F4QSywGdihDbNh8KwSL2U+rUjb8VpWRByxzVk="; }; - vendorHash = "sha256-FEicYJUyn+eT7IqoL4XqIsL6JhYJ8+2UOgc/PTMpuI4="; + vendorHash = "sha256-yWT7IX1n8CQSyXAzoncyYHzvYvIr8WzolyvC8/Cuhlo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix index b919fcd3a3438..18145c63a6763 100644 --- a/pkgs/by-name/lu/ludtwig/package.nix +++ b/pkgs/by-name/lu/ludtwig/package.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ludtwig"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "MalteJanz"; repo = pname; rev = "v${version}"; - hash = "sha256-nNr0iis+wBd+xKJYQL7OWlQnU1DhKztsPHCq3+tX79w="; + hash = "sha256-nkyi6X9W92yLaSPCg3zk0z/Pwue6dGK09iCDmWliFeg="; }; checkType = "debug"; - cargoHash = "sha256-Utho/foZOPz5K3WrOZjAkxvw7+J0RtbW0xvw/Txu/xk="; + cargoHash = "sha256-CZOdxrQ/50xznc8cfvi+6QFmMpPOS1st+yVPtAkZ3/A="; meta = with lib; { description = "Linter / Formatter for Twig template files which respects HTML and your time"; diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix new file mode 100644 index 0000000000000..b564622271d31 --- /dev/null +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -0,0 +1,50 @@ +{ lib +, python3 +, fetchFromGitLab +}: + +python3.pkgs.buildPythonApplication rec { + pname = "marge-bot"; + version = "0.10.1"; + pyproject = true; + + src = fetchFromGitLab { + owner = "marge-org"; + repo = "marge-bot"; + rev = version; + hash = "sha256-2L7c/NEKyjscwpyf/5GtWXr7Ig14IQlRR5IbDYxp8jA="; + }; + + postPatch = '' + substituteInPlace setup.cfg --replace "--flake8 --pylint --cov=marge" "" + ''; + + nativeBuildInputs = [ + python3.pkgs.setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + configargparse + maya + pyyaml + requests + ]; + + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + disabledTests = [ + # test broken when run under Nix: + # "unittest.mock.InvalidSpecError: Cannot spec a Mock object." + "test_get_mr_ci_status" + ]; + + pythonImportsCheck = [ "marge" ]; + + meta = with lib; { + description = "A merge bot for GitLab"; + homepage = "https://gitlab.com/marge-org/marge-bot"; + changelog = "https://gitlab.com/marge-org/marge-bot/-/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "marge.app"; + }; +} diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index c24678f831256..b37fb95b5f14b 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.1.44"; + version = "1.1.45"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-cNpnXEcG7XGQO17HtgRYA0nn1LV8BWEbbzoeeHfh50Q="; + hash = "sha256-qHlgAc1ddSVevH/82QCVXjIlht/RMcypTUcY+A/gRRg="; }; - npmDepsHash = "sha256-oflaxF4npCqS3k90G3kJkBkPy1xGL/orG5d4VMqMjlo="; + npmDepsHash = "sha256-yEeATMpSEr20MJdzq8HWSSjRBd+rHEq2oMVOnKymWhY="; dontNpmInstall = true; diff --git a/pkgs/by-name/pe/pest/composer.lock b/pkgs/by-name/pe/pest/composer.lock index 17d5d633b099b..78fe5a55d1bd9 100644 --- a/pkgs/by-name/pe/pest/composer.lock +++ b/pkgs/by-name/pe/pest/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "044366114136964b771d15be0e1a89ee", + "content-hash": "393fa917247bc6e80a22f6f93d4871ea", "packages": [ { "name": "brianium/paratest", - "version": "v7.4.1", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "b2830e330011d59a799c0002e118f5b4bbdb9604" + "reference": "64fcfd0e28a6b8078a19dbf9127be2ee645b92ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/b2830e330011d59a799c0002e118f5b4bbdb9604", - "reference": "b2830e330011d59a799c0002e118f5b4bbdb9604", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/64fcfd0e28a6b8078a19dbf9127be2ee645b92ec", + "reference": "64fcfd0e28a6b8078a19dbf9127be2ee645b92ec", "shasum": "" }, "require": { @@ -25,13 +25,13 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-simplexml": "*", - "fidry/cpu-core-counter": "^1.0.0", + "fidry/cpu-core-counter": "^1.1.0", "jean85/pretty-package-versions": "^2.0.5", "php": "~8.2.0 || ~8.3.0", "phpunit/php-code-coverage": "^10.1.11 || ^11.0.0", "phpunit/php-file-iterator": "^4.1.0 || ^5.0.0", "phpunit/php-timer": "^6.0.0 || ^7.0.0", - "phpunit/phpunit": "^10.5.9 || ^11.0.2", + "phpunit/phpunit": "^10.5.9 || ^11.0.3", "sebastian/environment": "^6.0.1 || ^7.0.0", "symfony/console": "^6.4.3 || ^7.0.3", "symfony/process": "^6.4.3 || ^7.0.3" @@ -40,11 +40,11 @@ "doctrine/coding-standard": "^12.0.0", "ext-pcov": "*", "ext-posix": "*", - "phpstan/phpstan": "^1.10.57", + "phpstan/phpstan": "^1.10.58", "phpstan/phpstan-deprecation-rules": "^1.1.4", "phpstan/phpstan-phpunit": "^1.3.15", "phpstan/phpstan-strict-rules": "^1.5.2", - "squizlabs/php_codesniffer": "^3.8.1", + "squizlabs/php_codesniffer": "^3.9.0", "symfony/filesystem": "^6.4.3 || ^7.0.3" }, "bin": [ @@ -86,7 +86,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v7.4.1" + "source": "https://github.com/paratestphp/paratest/tree/v7.4.3" }, "funding": [ { @@ -98,7 +98,7 @@ "type": "paypal" } ], - "time": "2024-02-06T13:50:28+00:00" + "time": "2024-02-20T07:24:02+00:00" }, { "name": "doctrine/deprecations", @@ -149,16 +149,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077" + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", "shasum": "" }, "require": { @@ -198,7 +198,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" }, "funding": [ { @@ -206,7 +206,7 @@ "type": "github" } ], - "time": "2023-09-17T21:38:23+00:00" + "time": "2024-02-07T09:43:46+00:00" }, { "name": "filp/whoops", @@ -781,20 +781,21 @@ }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -835,9 +836,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -1002,21 +1009,21 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.0", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" + "reference": "153ae662783729388a584b4361f2545e4d841e3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", "phpstan/phpdoc-parser": "^1.13" }, @@ -1054,22 +1061,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" }, - "time": "2024-01-11T11:49:22+00:00" + "time": "2024-02-23T11:10:43+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.25.0", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240" + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", "shasum": "" }, "require": { @@ -1101,22 +1108,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" }, - "time": "2024-01-04T17:06:16+00:00" + "time": "2024-02-23T16:05:55+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "10.1.11", + "version": "10.1.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "78c3b7625965c2513ee96569a4dbb62601784145" + "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", - "reference": "78c3b7625965c2513ee96569a4dbb62601784145", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/842f72662d6b9edda84c4b6f13885fd9cd53dc63", + "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63", "shasum": "" }, "require": { @@ -1173,7 +1180,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.12" }, "funding": [ { @@ -1181,7 +1188,7 @@ "type": "github" } ], - "time": "2023-12-21T15:38:30+00:00" + "time": "2024-03-02T07:22:05+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1428,16 +1435,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.9", + "version": "10.5.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe" + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe", - "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", "shasum": "" }, "require": { @@ -1509,7 +1516,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.9" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.11" }, "funding": [ { @@ -1525,7 +1532,7 @@ "type": "tidelift" } ], - "time": "2024-01-22T14:35:40+00:00" + "time": "2024-02-25T14:05:00+00:00" }, { "name": "psr/container", @@ -1632,16 +1639,16 @@ }, { "name": "sebastian/cli-parser", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae" + "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae", - "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084", + "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084", "shasum": "" }, "require": { @@ -1676,7 +1683,8 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0" + "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1" }, "funding": [ { @@ -1684,7 +1692,7 @@ "type": "github" } ], - "time": "2023-02-03T06:58:15+00:00" + "time": "2024-03-02T07:12:49+00:00" }, { "name": "sebastian/code-unit", @@ -1934,16 +1942,16 @@ }, { "name": "sebastian/diff", - "version": "5.1.0", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", - "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e", + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e", "shasum": "" }, "require": { @@ -1951,7 +1959,7 @@ }, "require-dev": { "phpunit/phpunit": "^10.0", - "symfony/process": "^4.2 || ^5" + "symfony/process": "^6.4" }, "type": "library", "extra": { @@ -1989,7 +1997,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1" }, "funding": [ { @@ -1997,7 +2005,7 @@ "type": "github" } ], - "time": "2023-12-22T10:55:06+00:00" + "time": "2024-03-02T07:15:17+00:00" }, { "name": "sebastian/environment", @@ -2065,16 +2073,16 @@ }, { "name": "sebastian/exporter", - "version": "5.1.1", + "version": "5.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc" + "reference": "955288482d97c19a372d3f31006ab3f37da47adf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64f51654862e0f5e318db7e9dcc2292c63cdbddc", - "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf", + "reference": "955288482d97c19a372d3f31006ab3f37da47adf", "shasum": "" }, "require": { @@ -2131,7 +2139,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.1" + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2" }, "funding": [ { @@ -2139,20 +2147,20 @@ "type": "github" } ], - "time": "2023-09-24T13:22:09+00:00" + "time": "2024-03-02T07:17:12+00:00" }, { "name": "sebastian/global-state", - "version": "6.0.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4" + "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4", - "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", + "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", "shasum": "" }, "require": { @@ -2186,14 +2194,14 @@ } ], "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", + "homepage": "https://www.github.com/sebastianbergmann/global-state", "keywords": [ "global state" ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", "security": "https://github.com/sebastianbergmann/global-state/security/policy", - "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1" + "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2" }, "funding": [ { @@ -2201,7 +2209,7 @@ "type": "github" } ], - "time": "2023-07-19T07:19:23+00:00" + "time": "2024-03-02T07:19:19+00:00" }, { "name": "sebastian/lines-of-code", @@ -2547,16 +2555,16 @@ }, { "name": "symfony/console", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456" + "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c5010d50f1ee4b25cfa0201d9915cf1b14071456", - "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456", + "url": "https://api.github.com/repos/symfony/console/zipball/6b099f3306f7c9c2d2786ed736d0026b2903205f", + "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f", "shasum": "" }, "require": { @@ -2620,7 +2628,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.0.3" + "source": "https://github.com/symfony/console/tree/v7.0.4" }, "funding": [ { @@ -2636,7 +2644,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-02-22T20:27:20+00:00" }, { "name": "symfony/finder", @@ -3022,16 +3030,16 @@ }, { "name": "symfony/process", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "937a195147e0c27b2759ade834169ed006d0bc74" + "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/937a195147e0c27b2759ade834169ed006d0bc74", - "reference": "937a195147e0c27b2759ade834169ed006d0bc74", + "url": "https://api.github.com/repos/symfony/process/zipball/0e7727191c3b71ebec6d529fa0e50a01ca5679e9", + "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9", "shasum": "" }, "require": { @@ -3063,7 +3071,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.0.3" + "source": "https://github.com/symfony/process/tree/v7.0.4" }, "funding": [ { @@ -3079,7 +3087,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-02-22T20:27:20+00:00" }, { "name": "symfony/service-contracts", @@ -3165,16 +3173,16 @@ }, { "name": "symfony/string", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "524aac4a280b90a4420d8d6a040718d0586505ac" + "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/524aac4a280b90a4420d8d6a040718d0586505ac", - "reference": "524aac4a280b90a4420d8d6a040718d0586505ac", + "url": "https://api.github.com/repos/symfony/string/zipball/f5832521b998b0bec40bee688ad5de98d4cf111b", + "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b", "shasum": "" }, "require": { @@ -3231,7 +3239,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.0.3" + "source": "https://github.com/symfony/string/tree/v7.0.4" }, "funding": [ { @@ -3247,7 +3255,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:41:16+00:00" + "time": "2024-02-01T13:17:36+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", @@ -3310,16 +3318,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -3348,7 +3356,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -3356,7 +3364,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "webmozart/assert", @@ -3420,39 +3428,38 @@ "packages-dev": [ { "name": "ergebnis/phpstan-rules", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/ergebnis/phpstan-rules.git", - "reference": "119e229c48688946450ccca9f1c57c9ca4fb6f02" + "reference": "2e9946491d39ea1eb043738309895e08f025a7a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/119e229c48688946450ccca9f1c57c9ca4fb6f02", - "reference": "119e229c48688946450ccca9f1c57c9ca4fb6f02", + "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/2e9946491d39ea1eb043738309895e08f025a7a0", + "reference": "2e9946491d39ea1eb043738309895e08f025a7a0", "shasum": "" }, "require": { "ext-mbstring": "*", - "nikic/php-parser": "^4.2.3", + "nikic/php-parser": "^4.2.3 || ^5.0.0", "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "phpstan/phpstan": "^1.10.21" }, "require-dev": { - "doctrine/orm": "^2.16.1", - "ergebnis/composer-normalize": "^2.35.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.13.0", - "ergebnis/phpunit-slow-test-detector": "^2.3.0", - "infection/infection": "~0.27.0", - "nette/di": "^3.1.3", + "doctrine/orm": "^3.0.0", + "ergebnis/composer-normalize": "^2.42.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.22.0", + "ergebnis/phpunit-slow-test-detector": "^2.10.0", + "nette/di": "^3.2.0", "phpstan/phpstan-deprecation-rules": "^1.1.4", - "phpstan/phpstan-strict-rules": "^1.1.0", - "phpunit/phpunit": "^10.3.2", + "phpstan/phpstan-strict-rules": "^1.5.2", + "phpunit/phpunit": "^10.5.10", "psalm/plugin-phpunit": "~0.18.4", - "psr/container": "^1.1.2", - "rector/rector": "~0.17.13", - "vimeo/psalm": "^5.14.1" + "psr/container": "^2.0.2", + "rector/rector": "^1.0.0", + "vimeo/psalm": "^5.21.1" }, "type": "phpstan-extension", "extra": { @@ -3474,34 +3481,35 @@ "authors": [ { "name": "Andreas Möller", - "email": "am@localheinz.com" + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], - "description": "Provides additional rules for phpstan/phpstan.", + "description": "Provides rules for phpstan/phpstan.", "homepage": "https://github.com/ergebnis/phpstan-rules", "keywords": [ "PHPStan", - "phpstan-extreme-rules", "phpstan-rules" ], "support": { "issues": "https://github.com/ergebnis/phpstan-rules/issues", + "security": "https://github.com/ergebnis/phpstan-rules/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/phpstan-rules" }, - "time": "2023-08-17T10:28:37+00:00" + "time": "2024-02-07T17:49:28+00:00" }, { "name": "laravel/pint", - "version": "v1.13.10", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "e2b5060885694ca30ac008c05dc9d47f10ed1abf" + "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/e2b5060885694ca30ac008c05dc9d47f10ed1abf", - "reference": "e2b5060885694ca30ac008c05dc9d47f10ed1abf", + "url": "https://api.github.com/repos/laravel/pint/zipball/6b127276e3f263f7bb17d5077e9e0269e61b2a0e", + "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e", "shasum": "" }, "require": { @@ -3512,13 +3520,13 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.47.1", - "illuminate/view": "^10.41.0", + "friendsofphp/php-cs-fixer": "^3.49.0", + "illuminate/view": "^10.43.0", "larastan/larastan": "^2.8.1", "laravel-zero/framework": "^10.3.0", "mockery/mockery": "^1.6.7", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.31.0" + "pestphp/pest": "^2.33.6" }, "bin": [ "builds/pint" @@ -3554,7 +3562,7 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-01-22T09:04:15+00:00" + "time": "2024-02-20T17:38:05+00:00" }, { "name": "nette/utils", @@ -3777,16 +3785,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.57", + "version": "1.10.59", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" + "reference": "e607609388d3a6d418a50a49f7940e8086798281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281", + "reference": "e607609388d3a6d418a50a49f7940e8086798281", "shasum": "" }, "require": { @@ -3835,7 +3843,7 @@ "type": "tidelift" } ], - "time": "2024-01-24T11:51:34+00:00" + "time": "2024-02-20T13:59:13+00:00" }, { "name": "phpstan/phpstan-strict-rules", @@ -4016,16 +4024,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0435a08f69125535336177c29d56af3abc1f69da" + "reference": "b439823f04c98b84d4366c79507e9da6230944b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0435a08f69125535336177c29d56af3abc1f69da", - "reference": "0435a08f69125535336177c29d56af3abc1f69da", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1", + "reference": "b439823f04c98b84d4366c79507e9da6230944b1", "shasum": "" }, "require": { @@ -4081,7 +4089,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.3" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.4" }, "funding": [ { @@ -4097,20 +4105,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:53:30+00:00" + "time": "2024-02-15T11:23:52+00:00" }, { "name": "symplify/phpstan-rules", - "version": "12.4.7", + "version": "12.4.8", "source": { "type": "git", "url": "https://github.com/symplify/phpstan-rules.git", - "reference": "7ebbcf2883c5e5ee3807c6580f7a9865970e83b7" + "reference": "393656aaf9fd09d9dc40d658c57ef222dd1f082d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/7ebbcf2883c5e5ee3807c6580f7a9865970e83b7", - "reference": "7ebbcf2883c5e5ee3807c6580f7a9865970e83b7", + "url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/393656aaf9fd09d9dc40d658c57ef222dd1f082d", + "reference": "393656aaf9fd09d9dc40d658c57ef222dd1f082d", "shasum": "" }, "require": { @@ -4140,7 +4148,7 @@ "description": "Set of Symplify rules for PHPStan", "support": { "issues": "https://github.com/symplify/phpstan-rules/issues", - "source": "https://github.com/symplify/phpstan-rules/tree/12.4.7" + "source": "https://github.com/symplify/phpstan-rules/tree/12.4.8" }, "funding": [ { @@ -4152,7 +4160,7 @@ "type": "github" } ], - "time": "2024-01-17T11:30:56+00:00" + "time": "2024-02-09T21:23:31+00:00" }, { "name": "thecodingmachine/phpstan-strict-rules", diff --git a/pkgs/by-name/pe/pest/package.nix b/pkgs/by-name/pe/pest/package.nix index 4d5fc7defe56a..6f01bb3587d15 100644 --- a/pkgs/by-name/pe/pest/package.nix +++ b/pkgs/by-name/pe/pest/package.nix @@ -2,17 +2,17 @@ php.buildComposerProject (finalAttrs: { pname = "pest"; - version = "2.33.4"; + version = "2.34.1"; src = fetchFromGitHub { owner = "pestphp"; repo = "pest"; rev = "v${finalAttrs.version}"; - hash = "sha256-9AJww0mynlacBsQvqb++vWn0vsapxFeXsA/tJJEQGFI="; + hash = "sha256-499DHFrPcWl6TwycZidGzLqLztmVkgC3jzHZV69p7kE="; }; composerLock = ./composer.lock; - vendorHash = "sha256-Z3vmHqySLU0zRqnDoVTt6FURxtJjVOyUXlURSsO6XE8="; + vendorHash = "sha256-Ofz8v3gUuZryN5z6CBfxm+UQ8z0aTkkum1am5x1LicA="; meta = { changelog = "https://github.com/pestphp/pest/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/by-name/vi/victoriametrics/package.nix index f694aeef565df..f441e03d83712 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -2,17 +2,35 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.97.1"; + version = "1.99.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-zaRXvktHqsM/pZd7DsCAXCSI2jaPZ3iKHLQqDILZ9pc="; + hash = "sha256-IHUmxdCOzvA2JL06k/ei6/OTVWHTL1TiKKYZB1hgqyA="; }; vendorHash = null; + subPackages = [ + "app/victoria-logs" + "app/victoria-metrics" + "app/vlinsert" + "app/vlselect" + "app/vlstorage" + "app/vmagent" + "app/vmalert-tool" + "app/vmauth" + "app/vmctl" + "app/vminsert" + "app/vmselect" + "app/vmstorage" + "app/vmbackup" + "app/vmrestore" + "app/vmui" + ]; + postPatch = '' # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 13c4a492c621d..09a77b54dda2a 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-8z6WgKahb01A9RAJsmavgGAeXkh6Hcr6qnzLhcfuHbw="; + hash = "sha256-rSPxvEZf4bnQfLNCmyZV7oOuhG/hRAcDs1zPmfovJ8o="; }; - cargoHash = "sha256-v14p4b2nUFtXs15b3zmYKAG1am+KDRfw2MfrjNQFjvw="; + cargoHash = "sha256-oHSsbGLz8OcAfLeNA1yqVVRHa0ZkE8UoJn795t8xxGs="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 2641fc1bc9407..a6e65ce689555 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -3,14 +3,14 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "twemoji-color-font"; version = "14.0.2"; # We fetch the prebuilt font because building it takes 1.5 hours on hydra. # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 src = fetchurl { - url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"; + url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz"; sha256 = "sha256-aCbiHqCNxd8myIeuTlYEaYfg9JCd+MAsc94FcUoDU8E="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = with licenses; [ cc-by-40 mit ]; maintainers = [ maintainers.fgaz ]; }; -} +}) diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index e380cf735fb90..02748546d5aa2 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -16,14 +16,14 @@ , ForceFeedback }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lobster"; version = "2023.13"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-7lMIIJ3iduyxZKwK65tle3c+az2G2Mpi4JwAeCCsTxw="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index c296d013e3d14..8477aef9ca43c 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, validatePkgConfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "duktape"; version = "2.7.0"; src = fetchurl { - url = "http://duktape.org/duktape-${version}.tar.xz"; + url = "http://duktape.org/duktape-${finalAttrs.version}.tar.xz"; sha256 = "sha256-kPjS+otVZ8aJmDDd7ywD88J5YLEayiIvoXqnrGE8KJA="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { mainProgram = "duk"; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index e478ff945472f..c5ea2f3ec026f 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -16,14 +16,14 @@ , SDLSupport ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jimtcl"; version = "0.82"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ dbohdan fgaz vrthra ]; }; -} +}) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 412052c2e3df4..e0c9f5b035e37 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.8.0"; + version = "12.8.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-qJu2/s5c6f3R0BpLwUXPfMC5OcV3fMpG3mnC9eNBLPA="; + hash = "sha256-J4HdOmzF+aSckaRRnd4rHCQzWlv+DMHJiBtjYxQkUrQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/development/libraries/audiality2/default.nix index e0ab0accdfde6..11625bc64f79f 100644 --- a/pkgs/development/libraries/audiality2/default.nix +++ b/pkgs/development/libraries/audiality2/default.nix @@ -7,14 +7,14 @@ , jack2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "audiality2"; version = "1.9.4"; src = fetchFromGitHub { owner = "olofson"; repo = "audiality2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20"; }; @@ -35,5 +35,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; }; -} - +}) diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix index 6d148dd146391..8682e95a57586 100644 --- a/pkgs/development/libraries/impy/default.nix +++ b/pkgs/development/libraries/impy/default.nix @@ -9,14 +9,14 @@ , libjpeg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "impy"; version = "0.2"; src = fetchFromGitHub { owner = "bcampbell"; repo = "impy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-0bHm3jawYgcIeF2COALWlypX7kvPw1hifB/W+TKcC4M="; }; @@ -40,5 +40,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} - +}) diff --git a/pkgs/development/libraries/litehtml/default.nix b/pkgs/development/libraries/litehtml/default.nix index 3927f7cce4a53..b1864f6497a9f 100644 --- a/pkgs/development/libraries/litehtml/default.nix +++ b/pkgs/development/libraries/litehtml/default.nix @@ -5,14 +5,14 @@ , gumbo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "litehtml"; version = "0.6"; src = fetchFromGitHub { owner = "litehtml"; repo = "litehtml"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9571d3k8RkzEpMWPuIejZ7njLmYstSwFUaSqT3sk6uQ="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index 4fc1573eea1a1..c8b4dec313be7 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -2,14 +2,14 @@ , fetchFromGitHub , lmdb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lmdbxx"; version = "1.0.0"; src = fetchFromGitHub { owner = "hoytech"; repo = "lmdbxx"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-7CxQZdgHVvmof6wVR9Mzic6tg89XJT3Z1ICGRs7PZYo="; }; @@ -22,5 +22,4 @@ stdenv.mkDerivation rec { license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ fgaz ]; }; -} - +}) diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix index 51c2ca1c8084f..22657cd663a2e 100644 --- a/pkgs/development/libraries/termbox/default.nix +++ b/pkgs/development/libraries/termbox/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "termbox"; version = "1.1.4"; src = fetchFromGitHub { owner = "termbox"; repo = "termbox"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "075swv6ajx8m424dbmgbf6fs6nd5q004gjpvx48gkxmnf9spvykl"; }; @@ -19,4 +19,4 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/termbox/termbox/releases"; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index dd5e90ef2e410..bee4d68d5d738 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.61.0"; + version = "3.62.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-hA10t/ZtMH2MjyHJJdJeOZLOF5NNTCOgGqxU6CCkZlQ="; + hash = "sha256-L2CbqWqyOo4mq+KsO8FYAyHClRKFXMLWWtfYEg0SD34="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index 404a9c2c3a77d..9ba8dae31c8a8 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.13"; + version = "0.3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiomysensors"; rev = "refs/tags/v${version}"; - hash = "sha256-2i2QodEWOZ/nih6ap5ovWuKxILB5arusnqOiOlb4xWM="; + hash = "sha256-7Y7JE/GAX5gQrIGcErZTGQXyaf3QwsTFgviiHLWgGeI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index e08df2ca1db9f..d39d59325d17a 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , marshmallow , mock , openapi-spec-validator @@ -9,20 +10,25 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools }: buildPythonPackage rec { pname = "apispec"; - version = "6.4.0"; - format = "setuptools"; + version = "6.5.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QrimgzzxVMnb0i0Aa1a/nEnJctMtJP5xb9c04Pa3Obg="; + hash = "sha256-wDpNhIrnDpuyJp3U5NMNjsfsBp0k756bQi48vRqf55Q="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 44442b29d77da..bdc53581027fb 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.54"; + version = "1.34.55"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-x7LouZ9Ils8SJt9H1Lraqo33QmAIyWpCi/ACBWlWaek="; + hash = "sha256-y7rhuBG5fk4fHQDrojf/mHZ45lJQIia4fmJ295Y5NbQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 045954456c2b8..9d2ba7735b96c 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.54"; + version = "1.34.55"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-lY8AhDItyeVJ9zFRtob6UbFYWPsrOlc7n0Nn8HP/9GM="; + hash = "sha256-hYAQjqR3KksDv4gogKL2O7p2Z0d9FwjwbMZSSViZNHE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index c2e8eb3a48d56..7b04f68692529 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "6.4.2"; + version = "6.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-uDppmYJiQt2Yix5vaWYqMDbPcHOEPz2pBK11lUZ54fI="; + hash = "sha256-9enilHkZ07loBisKObUmVLhJeXgY/HUiVrf2scPFB60="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index ff532ffd12d90..3aab9046cdc8e 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -13,13 +13,14 @@ , pythonOlder , redis , rich +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "flask-limiter"; - version = "3.5.0"; - format = "setuptools"; + version = "3.5.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-ZaHw8+l1sBCeNj0tYdUw1f4BUvEj6plOSoH0GUzNg+0="; + hash = "sha256-U7qgl8yg0ddKDPXqYE2Vqyc2ofxSP+6liWs5j4qD6fM="; }; postPatch = '' @@ -37,6 +38,10 @@ buildPythonPackage rec { sed -i "/import flask_restful/d" tests/test_views.py ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask limits diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 1daf600f4d842..a2fac2691b9d6 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -23,16 +23,16 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.8.1"; - format = "pyproject"; + version = "0.9.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "romis2012"; - repo = pname; + repo = "httpx-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-L2nyVADDjPrHwhZRm+RAvfBdpP9sIvc9cakDiLVA7xw="; + hash = "sha256-x+4J+uxICYdjpwr/chHIr/BeFGITCR8F9W1kqAliv38="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index 5fee7d5c9f0d5..e6950edaa1278 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.11.1"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-nduag5ubgwhOcprdZppLIPQPDE06dk9OzniIIJpM12s="; + hash = "sha256-TQ+DBFpG+IeZ4/dN+YKMw3AM4Dl1rpqA1kRcb3Tb3jA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 4e3b4294991cd..69eb79ddbcaae 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pytestCheckHook , pkg-config +, setuptools , libjpeg , libpng , libtiff @@ -13,18 +14,48 @@ buildPythonPackage rec { pname = "python-imread"; version = "0.7.5"; + pyproject = true; src = fetchPypi { inherit version; pname = "imread"; - sha256 = "sha256-GiWpA128GuLlbBW1CQQHHVVeoZfu9Yyh2RFzSdtHDbc="; + hash = "sha256-GiWpA128GuLlbBW1CQQHHVVeoZfu9Yyh2RFzSdtHDbc="; }; + nativeBuildInputs = [ + pkg-config + setuptools + ]; + + buildInputs = [ + libjpeg + libpng + libtiff + libwebp + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ nose libjpeg libpng libtiff libwebp ]; propagatedBuildInputs = [ numpy ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + # verbose build outputs needed to debug hard-to-reproduce hydra failures + "-v" + "--pyargs" "imread" + ]; + + pythonImportsCheck = [ + "imread" + ]; + + preCheck = '' + cd $TMPDIR + export HOME=$TMPDIR + export OMP_NUM_THREADS=1 + ''; + meta = with lib; { description = "Python package to load images as numpy arrays"; homepage = "https://imread.readthedocs.io/en/latest/"; diff --git a/pkgs/development/python-modules/nikola/default.nix b/pkgs/development/python-modules/nikola/default.nix index e4990ff4af319..461d65a00f8fc 100644 --- a/pkgs/development/python-modules/nikola/default.nix +++ b/pkgs/development/python-modules/nikola/default.nix @@ -1,11 +1,12 @@ { lib +, stdenv , aiohttp , babel , blinker , buildPythonPackage -, python-dateutil , docutils , doit +, feedparser , fetchPypi , freezegun , ghp-import @@ -28,10 +29,11 @@ , pyphen , pyrss2gen , pytestCheckHook +, python-dateutil , pythonOlder , requests , ruamel-yaml -, stdenv +, setuptools , toml , typogrify , unidecode @@ -41,24 +43,33 @@ buildPythonPackage rec { pname = "nikola"; - version = "8.2.4"; - format = "setuptools"; + version = "8.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "Nikola"; inherit version; - hash = "sha256-LNVk2zfNwY4CC4qulqfNXwi3mWyFxzWIeMykh6gFOL8="; + hash = "sha256-VYuhiGLMTHcOZM8/bGZT7Xx5BOHo9gsMPjufYglrBL0="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--cov nikola --cov-report term-missing" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp babel blinker - python-dateutil docutils doit + feedparser ghp-import hsluv html5lib @@ -77,6 +88,7 @@ buildPythonPackage rec { pygments pyphen pyrss2gen + python-dateutil requests ruamel-yaml toml @@ -92,11 +104,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov nikola --cov-report term-missing" "" - ''; - disabledTests = [ # AssertionError "test_compiling_markdown" @@ -107,7 +114,9 @@ buildPythonPackage rec { "test_format_date_locale_variants" ]; - pythonImportsCheck = [ "nikola" ]; + pythonImportsCheck = [ + "nikola" + ]; meta = with lib; { description = "Static website and blog generator"; diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 6fa2978ceb4ba..c0a753f5c02a1 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.1.4.231227"; + version = "2.2.0.240218"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-AkgMesDesKkVkwxNnGYG71IuIgF3G+BecpfWNWVucC8="; + hash = "sha256-416vyaHcSfTfkSNKZ05edozfsMmNKcpOZAoPenCLFzQ="; }; nativeBuildInputs = [ @@ -70,55 +70,11 @@ buildPythonPackage rec { disabledTests = [ # AttributeErrors, missing dependencies, error and warning checks - "test_aggregate_frame_combinations" - "test_aggregate_series_combinations" - "test_all_read_without_lxml_dtype_backend" - "test_arrow_dtype" - "test_attribute_conflict_warning" - "test_categorical_conversion_warning" - "test_clipboard_iterator" - "test_clipboard" - "test_closed_file_error" - "test_compare_150_changes" - "test_crosstab_args" - "test_css_warning" - "test_data_error" - "test_database_error" - "test_dummies" - "test_from_dummies_args" - "test_hdf_context_manager" - "test_hdfstore" - "test_incompatibility_warning" - "test_index_astype" - "test_indexing_error" - "test_invalid_column_name" - "test_isetframe" - "test_join" - "test_numexpr_clobbering_error" - "test_orc_buffer" - "test_orc_bytes" - "test_orc_columns" - "test_orc_path" + "test_types_groupby" + "test_frame_groupby_resample" "test_orc" - "test_possible_data_loss_error" - "test_possible_precision_loss" - "test_pyperclip_exception" - "test_quantile_150_changes" - "test_read_hdf_iterator" - "test_read_sql_via_sqlalchemy_connection" - "test_read_sql_via_sqlalchemy_engine" - "test_resample_150_changes" - "test_reset_index_150_changes" - "test_reset_index" - "test_rolling_step_method" - "test_setting_with_copy_error" - "test_setting_with_copy_warning" + "test_all_read_without_lxml_dtype_backend" "test_show_version" - "test_specification_error" - "test_types_assert_series_equal" - "test_types_rank" - "test_undefined_variable_error" - "test_value_label_type_mismatch" ] ++ lib.optionals stdenv.isDarwin [ "test_plotting" # Fatal Python error: Illegal instruction ]; diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 6795ebf1f691d..03372065aedd9 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.4.2"; + version = "3.5.0"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-PhZBpcMwU7fjmE0g+l83zHm+95N60Sbd9pNNc4Roa2A="; + hash = "sha256-+nYMQxqI9RZ5vVL6KgiRLcx0JHWJTs/rZ6U6jIuaz+w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index ffcaacd62476f..2e197ba9300d6 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240303"; + version = "0.10.0.20240305"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nzDc1cKz29OILImnuh5fBDTJ5IsRjlhcdGWfM5IIqzo="; + hash = "sha256-bnnqc7AnjOGxAvOtaBXypbaDhk2plIugsOqzGAxBn38="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sectools/default.nix b/pkgs/development/python-modules/sectools/default.nix index 2fdc27283f08c..f65c80aabdc13 100644 --- a/pkgs/development/python-modules/sectools/default.nix +++ b/pkgs/development/python-modules/sectools/default.nix @@ -3,22 +3,27 @@ , fetchFromGitHub , ldap3 , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "sectools"; - version = "1.3.9"; - format = "setuptools"; + version = "1.4.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "p0dalirius"; - repo = pname; + repo = "sectools"; rev = "refs/tags/${version}"; - hash = "sha256-F9mmPSlfSSS7UDNuX9OPrqDsEpqq0bD3eROG8D9CC78="; + hash = "sha256-k3k1/DFmv0resnsNht/C+2Xh6qbSQmk83eN/3vtDU00="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ldap3 ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 2dc2ebbf92385..c7d2fdc8a70b0 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1098"; + version = "3.0.1100"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-5BG5WizkBP/KYHS00v949uQgiCChR3DWW0MnMXRBDAs="; + hash = "sha256-TaEsYIRYKOSPrUVE1tMy8GjewG7KYoQLXbwJGA//Z9c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index faed23aa2d140..a9f70fdf92d90 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -1,14 +1,15 @@ { lib +, aiohttp +, aiolimiter , buildPythonPackage , fetchFromGitHub -, setuptools , pythonOlder -, aiohttp +, setuptools }: buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.4.6"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-4IXLtQyEi4R7aakaLCl9jpm3D/Es3wLIwigSTYK12kg="; + hash = "sha256-GiDhVN6aBj0yeIg596ox2ES28Dca81pVnsYWvc1SZ+A="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + aiolimiter ]; # Module has no tests diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 35ed3e78fafff..e6141601cbdd8 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.2"; + version = "2.6.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-d9tgKjZMVdaMrxQT6sJsVb812NuFYkA1hLlo/6XgwAo="; + hash = "sha256-KtIcmAPOcxC9wTq6mKRZWcohH0skYMHlq4mehpn6raY="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index b673a1fd4411d..effd832f84ce8 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.29"; + version = "3.2.31"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-Y3lT2udrVzQZlZY/R27wFkIiI52PyJac6STnAz6Zvsk="; + hash = "sha256-GJh58fTBtjhOsSlwu9687qVdceGF9iMkZ2VViH2Wmp4="; }; patches = [ diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 4b6db0adb731f..7476e57bedffa 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.9.0"; + version = "1.10.0"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-nVHm0JJsFXGnYlBBlcR5zBS46PZuALle3ik3GMTPYTQ="; + hash = "sha256-LFAeZ1UsnOKaXlnSd/cMfJQk0ZfaNAzSbvSuoKmmOoI="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index c1f31c07c6cc9..6aa8e5558dcc1 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.25"; + version = "1.19.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-prmMj8tVOm9P5EKkenero4YM9ccVU3JskTiHjup0oeQ="; + hash = "sha256-2beVIS6vzaX9k+M6545F/QDq6mxPTpmDDD2B9+eLxTk="; }; - cargoHash = "sha256-OBbLWsG22Rs4veQRDUgoFKcMnOKNOxK6rqBah8y3CnY="; + cargoHash = "sha256-GpooXnJc3ADQRhvVSnDjj6OOuQW+emVo5TGoshPI+WY="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 39b232b267c34..2aff5c86151e6 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,19 +1,42 @@ -{ lib, stdenv, fetchsvn, pkg-config, libjpeg, libX11, libXxf86vm, curl, libogg -, libvorbis, freetype, openal, libGL }: +{ curl +, fetchFromGitHub +, freetype +, lib +, libGL +, libjpeg +, libogg +, libvorbis +, libX11 +, libXxf86vm +, openal +, pkg-config +, stdenv +}: stdenv.mkDerivation rec { pname = "alienarena"; - version = "7.71.2"; + version = "7.71.6"; - src = fetchsvn { - url = "svn://svn.icculus.org/alienarena/trunk"; - rev = "5673"; - sha256 = "1qfrgrp7nznk5n1jqvjba6l1w8y2ixzyx9swkpvd02rdwlwrp9kw"; + src = fetchFromGitHub { + owner = "alienarena"; + repo = "alienarena"; + rev = version; + hash = "sha256-Dml0VY5VQiWLq8LjItBSzNwJB9L4biJ/nJWmEGtG2ZY="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libjpeg libX11 curl libogg libvorbis - freetype openal libGL libXxf86vm ]; + + buildInputs = [ + curl + freetype + libGL + libjpeg + libogg + libvorbis + libX11 + libXxf86vm + openal + ]; patchPhase = '' substituteInPlace ./configure \ @@ -22,6 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/alienarena/alienarena/releases/tag/${version}"; description = "A free, stand-alone first-person shooter computer game"; longDescription = '' Do you like old school deathmatch with modern features? How @@ -32,7 +56,7 @@ stdenv.mkDerivation rec { with a retro alien theme, while adding tons of original ideas to make the game quite unique. ''; - homepage = "http://red.planetarena.org"; + homepage = "https://alienarena.org"; # Engine is under GPLv2, everything else is under license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; diff --git a/pkgs/games/brogue-ce/default.nix b/pkgs/games/brogue-ce/default.nix index 77e58ed5a1a6a..32ca328492bcd 100644 --- a/pkgs/games/brogue-ce/default.nix +++ b/pkgs/games/brogue-ce/default.nix @@ -7,14 +7,14 @@ , SDL2_image }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brogue-ce"; version = "1.13"; src = fetchFromGitHub { owner = "tmewett"; repo = "BrogueCE"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-FUIdi1Ytn+INeD9550MW41qXtLb6in0QS3Snt8QaXUA="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 0cd3e779c5631..770ff36229231 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, SDL, ncurses, libtcod, makeDesktopItem }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brogue"; version = "1.7.5"; src = fetchurl { - url = "https://sites.google.com/site/broguegame/brogue-${version}-linux-amd64.tbz2"; + url = "https://sites.google.com/site/broguegame/brogue-${finalAttrs.version}-linux-amd64.tbz2"; sha256 = "0i042zb3axjf0cpgpdh8hvfn66dbfizidyvw0iymjk2n760z2kx7"; }; patches = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m 555 -D bin/brogue $out/bin/brogue - install -m 444 -D ${desktopItem}/share/applications/brogue.desktop $out/share/applications/brogue.desktop + install -m 444 -D ${finalAttrs.desktopItem}/share/applications/brogue.desktop $out/share/applications/brogue.desktop install -m 444 -D bin/brogue-icon.png $out/share/icons/hicolor/256x256/apps/brogue.png mkdir -p $out/share/brogue cp -r bin/fonts $out/share/brogue/ @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/games/curseofwar/default.nix index fef456816ff22..c0accf1e7b649 100644 --- a/pkgs/games/curseofwar/default.nix +++ b/pkgs/games/curseofwar/default.nix @@ -4,14 +4,14 @@ , SDL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "curseofwar"; version = "1.3.0"; src = fetchFromGitHub { owner = "a-nikolaev"; - repo = pname; - rev = "v${version}"; + repo = "curseofwar"; + rev = "v${finalAttrs.version}"; sha256 = "1wd71wdnj9izg5d95m81yx3684g4zdi7fsy0j5wwnbd9j34ilz1i"; }; @@ -33,5 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} - +}) diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/games/gnonograms/default.nix index 2446384ff719a..c021ca46f57a5 100644 --- a/pkgs/games/gnonograms/default.nix +++ b/pkgs/games/gnonograms/default.nix @@ -16,14 +16,14 @@ , libhandy }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnonograms"; version = "2.1.2"; src = fetchFromGitHub { owner = "jeremypw"; repo = "gnonograms"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-TkEVjrwlr4Q5FsfcdY+9fxwaMq+DFs0RwGI2E+GT5Mk="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jeremypw/gnonograms"; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 1c918395d40be..0fdffcf6fadb5 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, makeDesktopItem, copyDesktopItems, fetchurl, SDL, SDL_image, SDL_mixer }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnujump"; version = "1.0.8"; src = fetchurl { - url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz"; + url = "mirror://gnu/gnujump/gnujump-${finalAttrs.version}.tar.gz"; sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/games/hikounomizu/default.nix index bca6c8ecf8b96..6e05a17b082e0 100644 --- a/pkgs/games/hikounomizu/default.nix +++ b/pkgs/games/hikounomizu/default.nix @@ -22,12 +22,12 @@ , bc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hikounomizu"; version = "1.0.1"; src = fetchurl { - url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2"; + url = "http://download.tuxfamily.org/hnm/${finalAttrs.version}/hikounomizu-${finalAttrs.version}-src.tar.bz2"; hash = "sha256-3wRhe6CDq1dD0SObAygfqslYJx+EM3LM3rj6HI0whYU="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { license = [ licenses.gpl3Plus licenses.lal13 ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/powermanga/default.nix b/pkgs/games/powermanga/default.nix index 25a1df5211a31..5f82eaebb8eb2 100644 --- a/pkgs/games/powermanga/default.nix +++ b/pkgs/games/powermanga/default.nix @@ -8,12 +8,12 @@ , libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "powermanga"; version = "0.93.1"; src = fetchurl { - url = "https://linux.tlk.fr/games/Powermanga/download/powermanga-${version}.tgz"; + url = "https://linux.tlk.fr/games/Powermanga/download/powermanga-${finalAttrs.version}.tgz"; sha256 = "sha256-2nU/zoOQWm2z/Y6mXHDFfWYjYshsQp1saVRBcUT5Q+g="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/games/tecnoballz/default.nix b/pkgs/games/tecnoballz/default.nix index 6366e0ab06a59..f65383a37a897 100644 --- a/pkgs/games/tecnoballz/default.nix +++ b/pkgs/games/tecnoballz/default.nix @@ -10,12 +10,12 @@ , tinyxml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tecnoballz"; version = "0.93.1"; src = fetchurl { - url = "https://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-${version}.tgz"; + url = "https://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-${finalAttrs.version}.tgz"; sha256 = "sha256-WRW76e+/eXE/KwuyOjzTPFQnKwNznbIrUrz14fnvgug="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/games/titanion/default.nix b/pkgs/games/titanion/default.nix index 47db68aa483ed..94e04a053c4e1 100644 --- a/pkgs/games/titanion/default.nix +++ b/pkgs/games/titanion/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "titanion"; version = "0.3"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/ttn${lib.replaceStrings ["."] ["_"] version}.zip"; + url = "http://abagames.sakura.ne.jp/windows/ttn${lib.replaceStrings ["."] ["_"] finalAttrs.version}.zip"; sha256 = "sha256-fR0cufi6dU898wP8KGl/vxbfQJzMmMxlYZ3QNGLajfM="; }; @@ -88,4 +88,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/toppler/default.nix b/pkgs/games/toppler/default.nix index 890e13498747e..fe36229363ceb 100644 --- a/pkgs/games/toppler/default.nix +++ b/pkgs/games/toppler/default.nix @@ -15,14 +15,14 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "toppler"; version = "1.3"; src = fetchFromGitLab { owner = "roever"; repo = "toppler"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/torus-trooper/default.nix b/pkgs/games/torus-trooper/default.nix index 645abc76c8075..6e39aac63ff62 100644 --- a/pkgs/games/torus-trooper/default.nix +++ b/pkgs/games/torus-trooper/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "torus-trooper"; version = "0.22"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/tt${lib.replaceStrings ["."] ["_"] version}.zip"; + url = "http://abagames.sakura.ne.jp/windows/tt${lib.replaceStrings ["."] ["_"] finalAttrs.version}.zip"; sha256 = "1yhki1fdp3fi4y2iq12vca69f6k38dqjaw9z4lwcxky5kbgb7jvg"; }; @@ -101,4 +101,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/tumiki-fighters/default.nix b/pkgs/games/tumiki-fighters/default.nix index b4becea657560..344d062e08c3b 100644 --- a/pkgs/games/tumiki-fighters/default.nix +++ b/pkgs/games/tumiki-fighters/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "tumiki-fighters"; version = "0.21"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/tf${lib.replaceStrings ["."] ["_"] version}.zip"; + url = "http://abagames.sakura.ne.jp/windows/tf${lib.replaceStrings ["."] ["_"] finalAttrs.version}.zip"; sha256 = "0djykfc1r8ysapklm621h89ana1c4qzc1m5nr9bqw4iccnmvwk3p"; }; @@ -94,4 +94,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index be2525c987165..7e6b8986109ea 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -44,12 +44,12 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit pname; version = "4.4.2"; src = fetchurl { - url = "mirror://sourceforge/project/warzone2100/releases/${version}/warzone2100_src.tar.xz"; + url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; hash = "sha256-O5Yqxqp1vKYr8uvAZ1SdsI/kocOzg0KRCirCqqvLrN4="; }; @@ -142,4 +142,4 @@ stdenv.mkDerivation rec { # https://github.com/Warzone2100/warzone2100/blob/master/macosx/README.md broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index 3b6c7244507cb..9cfbad23c278a 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -11,12 +11,12 @@ , freetype }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zaz"; version = "1.0.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/zaz/zaz-${finalAttrs.version}.tar.gz"; sha256 = "1r3bmwny05zzmdalxm5ah2rray0nnsg1w00r30p47q6x2lpwj8ml"; }; @@ -56,5 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "zaz"; }; -} - +}) diff --git a/pkgs/kde/gear/filelight/default.nix b/pkgs/kde/gear/filelight/default.nix index 938cedda3af16..1136a3b688445 100644 --- a/pkgs/kde/gear/filelight/default.nix +++ b/pkgs/kde/gear/filelight/default.nix @@ -1,4 +1,15 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + kirigami, + kquickcharts, + qqc2-desktop-style, +}: mkKdeDerivation { pname = "filelight"; + + extraBuildInputs = [ + kirigami + kquickcharts + qqc2-desktop-style + ]; } diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 7117859f2fb82..baf1c81c98544 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -21,16 +21,16 @@ in buildGoModule rec { pname = "evcc"; - version = "0.124.4"; + version = "0.124.6"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-sSR0aRSIUPph1YGfY6ihUffKiyauSbO7eUSVa3jaY6s="; + hash = "sha256-mZSJ8RKO2olPsbxuVyAFCyvgxkth4XatRXwaQQ0z/Do="; }; - vendorHash = "sha256-1ZSMI6mz8CkibP3KwWJ3I05BMoBu9r+Fn8vLLDTpVfA="; + vendorHash = "sha256-tu1rV5TWAOHidnDvjsyqFady8TrnPOoAoEEDugYYwLM="; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/servers/http/merecat/default.nix b/pkgs/servers/http/merecat/default.nix index b655381a08195..6231fb9e2ad2c 100644 --- a/pkgs/servers/http/merecat/default.nix +++ b/pkgs/servers/http/merecat/default.nix @@ -10,15 +10,15 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "merecat"; version = "2.31"; - # Or, already reconf'd: ftp://ftp.troglobit.com/merecat/merecat-${version}.tar.xz + # Or, already reconf'd: ftp://ftp.troglobit.com/merecat/merecat-${finalAttrs.version}.tar.xz src = fetchFromGitHub { owner = "troglobit"; repo = "merecat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-oIzOXUnCFqd3HPyKp58r+enRRpaE7f9hqNITtxCCB7I="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { # Strange header and/or linker errors broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index 07094886b43b2..31d66070d42fa 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -7,7 +7,7 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qremotecontrol-server"; version = "unstable-2014-11-05"; # basically 2.4.2 + qt5 diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index d7d1c94d9de2a..83cd3e45d9b23 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -5,12 +5,12 @@ , libtirpc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xinetd"; version = "2.3.15.4"; src = fetchurl { - url = "https://github.com/openSUSE/xinetd/releases/download/${version}/xinetd-${version}.tar.xz"; + url = "https://github.com/openSUSE/xinetd/releases/download/${finalAttrs.version}/xinetd-${finalAttrs.version}.tar.xz"; hash = "sha256-K6pYEBC8cDYavfo38SHpKuucXOZ/mnGRPOvWk1nMllQ="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.free; maintainers = with lib.maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/tools/X11/xprintidle/default.nix index 4a0d371a7fd61..33782f6ed6c63 100644 --- a/pkgs/tools/X11/xprintidle/default.nix +++ b/pkgs/tools/X11/xprintidle/default.nix @@ -7,14 +7,14 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xprintidle"; version = "0.2.5"; src = fetchFromGitHub { owner = "g0hl1n"; repo = "xprintidle"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-bafDUZoSFsJ3g6mtLCRechGizfrWg2qW2vnlfIzj7mQ="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "xprintidle"; }; -} +}) diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index 88703b28b5824..43aaa534c0419 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dvd-vr"; version = "0.9.7"; src = fetchurl { - url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz"; + url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${finalAttrs.version}.tar.gz"; sha256 = "13wkdia3c0ryda40b2nzpb9vddimasgc4w95hvl0k555k9k8bl0r"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { mainProgram = "dvd-vr"; }; } - +) diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/tools/compression/heatshrink/default.nix index b5cfb92247afa..d18f82ef21fad 100644 --- a/pkgs/tools/compression/heatshrink/default.nix +++ b/pkgs/tools/compression/heatshrink/default.nix @@ -5,14 +5,14 @@ , fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "heatshrink"; version = "0.4.1"; src = fetchFromGitHub { owner = "atomicobject"; repo = "heatshrink"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Nm9/+JFMDXY1N90hmNFGh755V2sXSRQ4VBN9f8TcsGk="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "heatshrink"; }; -} +}) diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index a64812e96b9c7..529d963af3041 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -8,12 +8,12 @@ , wrapperDir ? "/run/wrappers/bin" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "davfs2"; version = "1.7.0"; src = fetchurl { - url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; + url = "mirror://savannah/davfs2/davfs2-${finalAttrs.version}.tar.gz"; sha256 = "sha256-JR23Wic4DMoTMLG5cXAMXl3MDJDlpHYiKF8BQO3+Oi8="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index b374618037bd2..520a6951941ad 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -94,23 +94,23 @@ rec { # we have to keep all the numbers in the version to handle major/minor/patch level. # for <1.0. - garage_0_8_6 = generic { - version = "0.8.6"; - sha256 = "sha256-N0AOcwpuBHwTZtHcz6a2d9GOimHevhohEOzVkIt0RDE="; - cargoSha256 = "sha256-e72FQKL77CZOi/pa+hE7PCyc1+HSJgEsKGgWlfVw51k="; + garage_0_8_7 = generic { + version = "0.8.7"; + sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; + cargoSha256 = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo="; broken = stdenv.isDarwin; }; - garage_0_8 = garage_0_8_6; + garage_0_8 = garage_0_8_7; - garage_0_9_2 = generic { - version = "0.9.2"; - sha256 = "sha256-6a400/wOZunVH+LAByd6BEA0gs56Rxyh+gvM4hUO4Y8="; - cargoSha256 = "sha256-1p6bB2gMOCHDdILEwgoJ1EqvgGhLPcThNkwaz6NMZhQ="; + garage_0_9_3 = generic { + version = "0.9.3"; + sha256 = "sha256-NN2HoheSW2+SAFX71K12KTe0wpaBEwkwxvZDi0Bdx+8="; + cargoSha256 = "sha256-OabgWVMkccFFAtBHEf3z+MRVcWaO+NCk/pumEqdNNRs="; broken = stdenv.isDarwin; }; - garage_0_9 = garage_0_9_2; + garage_0_9 = garage_0_9_3; garage = garage_0_9; } diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 5f3b5e534ca36..ae96def578f6e 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nilfs-utils"; - version = "2.2.9"; + version = "2.2.10"; src = fetchFromGitHub { owner = "nilfs-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XqViUvPj2BHO3bGs9xBO3VpRq9XqnwBptHvMwBOntqo="; + sha256 = "sha256-xTnd3sfBaVU4Ovcsk4oufylNpGS+5n3ZLa2GXzUbeCE="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix index 3216790590e1f..8c3e603cae846 100644 --- a/pkgs/tools/graphics/pikchr/default.nix +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "unstable-2023-08-30"; + version = "0-unstable-2024-02-12"; src = fetchfossil { url = "https://pikchr.org/home"; - rev = "d6f80b1ab30654d5"; - sha256 = "sha256-GEH1qFiMYmNFJnZzLG5rxpl+F7OSRMoVcdo94+mvrlY="; + rev = "ae3317b0ec2e635c"; + hash = "sha256-kCbd6XAaUCwFVYOPPLIux7wW62KRfVnfaxT8Z1RGFfc="; }; # can't open generated html files diff --git a/pkgs/tools/misc/tkman/default.nix b/pkgs/tools/misc/tkman/default.nix index e178e173108a8..4df680fb6b8cf 100644 --- a/pkgs/tools/misc/tkman/default.nix +++ b/pkgs/tools/misc/tkman/default.nix @@ -10,12 +10,12 @@ , rman }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tkman"; version = "2.2"; src = fetchzip { - url = "mirror://sourceforge/tkman/tkman-${version}.tar.gz"; + url = "mirror://sourceforge/tkman/tkman-${finalAttrs.version}.tar.gz"; hash = "sha256-S4ffz+7zmVy9+isz/8q+FV4wF5Rw2iL1ftY8RsJjRLs="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/tools/networking/termscp/Cargo.lock.patch b/pkgs/tools/networking/termscp/Cargo.lock.patch deleted file mode 100644 index 76b2d996e25e0..0000000000000 --- a/pkgs/tools/networking/termscp/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/Cargo.lock w/Cargo.lock -index 5cbb602..47046b8 100644 ---- i/Cargo.lock -+++ w/Cargo.lock -@@ -2949,7 +2949,7 @@ dependencies = [ - - [[package]] - name = "termscp" --version = "0.12.2" -+version = "0.12.3" - dependencies = [ - "argh", - "bitflags 2.3.3", diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index 101a38e4f5dd3..924de6cf1e2e3 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -14,20 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "veeso"; - repo = pname; + repo = "termscp"; rev = "refs/tags/v${version}"; - hash = "sha256-+5s5PskSHZKv1deti5r986qXg8J9APuVXY+Lvq3ki0w="; + hash = "sha256-/Mnoljgp87ML6+3vV1vZTFO0TSY5hr8E8U1fXJq31pE="; }; - cargoPatches = [ - ./Cargo.lock.patch - ]; - - cargoHash = "sha256-2RmYxtjJm70qbiGl8YHXgebtvNsQvBdgkNDm8td9oNk="; + cargoHash = "sha256-xq21cncEYNSwDiKvVSM1J2Jz3TqOkYMK3gckKpM5+6E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 0145fcbb3a122..51fa61067425c 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -12,14 +12,14 @@ let }; in python.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.15.5"; + version = "1.15.6"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; rev = "refs/tags/v${version}"; - hash = "sha256-kT6cWVeP2mKKef/fBfzZWnkJsWqJp2X9uIkndR+gwoY="; + hash = "sha256-h/NNTE5u1coyD4owiGjsK6SIuvDq1SQOPW4RM4yJtno="; }; pythonRelaxDeps = [ diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index a1556ed7d687f..1f25de07c174e 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "refs/tags/v${version}"; - hash = "sha256-gfznhNW9EmUuKrgxhQD4jKO4raQedTsg/ZcpscymQTs="; + hash = "sha256-scp0CDIO8F2TqpSCgXXfb8I83stvO/GZqSA5/BkN8pE="; }; - vendorHash = "sha256-/fZaUJHP5HwwLBdeNq6iMhfdJ1DYt6YVeHP4ZGmYffg="; + vendorHash = "sha256-WbFkBTPy4N+mAVSkq1q9XcNs1jk6YuBcYxiEmQV/TsM="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 96d6408f4a463..c0a596550eb58 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-03-01"; + version = "2024-03-04"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6kBirGsaDfUgp/NiUa17SE+Cq8dmH9v3uuBooFMnMM0="; + hash = "sha256-3i4Hzz5rcGNWpIJeMPEQMRy6Dxk8lafusEk9Plhfx8U="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 41887131d9ecc..fe72e598306f2 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.13"; + version = "0.4.14"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-juqxturQzGOlRTw7EEuRoEmwLtBdJJpbBzCKFxmL5m8="; + hash = "sha256-c8eFndK84ckwKcvu5BbIuH6SXNVyBiwEjHsHTkgwaPU="; }; vendorHash = null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b52f9cb0a80..71074fef411fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8405,7 +8405,7 @@ with pkgs; }) garage garage_0_8 garage_0_9 - garage_0_8_6 garage_0_9_2; + garage_0_8_7 garage_0_9_3; garmintools = callPackage ../development/libraries/garmintools { }; @@ -27179,8 +27179,6 @@ with pkgs; vouch-proxy = callPackage ../servers/vouch-proxy { }; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; - virtiofsd = callPackage ../servers/misc/virtiofsd { }; virtualenv = with python3Packages; toPythonApplication virtualenv; |