diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index a1bb5bcef5c4..5f982ff6f64f 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -10,13 +10,13 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-EPORD8jDmTnCm/ON1Vz2R7DpFVyAR8q7r2KZyKTiGr4="; + hash = "sha256-NAAl/XmJqRnJyOYNJqmMlCIiGsCsSH7gGTMbD46gpss="; }; deleteVendor = true; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 9471751844e0..3b147bdcc360 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -11,25 +11,23 @@ python3Packages.buildPythonApplication rec { pname = "dockbarx"; - version = "${ver}-${rev}"; - ver = "1.0-beta"; - rev = "d98020ec49f3e3a5692ab2adbb145bbe5a1e80fe"; + version = "1.0-beta2"; src = fetchFromGitHub { owner = "xuzhen"; repo = "dockbarx"; - rev = rev; - sha256 = "0xwqxh5mr2bi0sk54b848705awp0lfpd91am551811j2bdkbs04m"; + rev = version; + sha256 = "sha256-WMRTtprDHUbOOYVHshx7WpBlYshbiDjI12Rw3tQQuPI="; }; nativeBuildInputs = [ glib.dev + gobject-introspection python3Packages.polib wrapGAppsHook ]; buildInputs = [ - gobject-introspection gtk3 libwnck keybinder3 diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index b6abda6fb713..86ef3ddf693a 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.20.2"; + version = "0.20.5"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-dzrxOZ8gsLm3cw54id7edhqsqZfuOG90P3aAdf/b66M="; + sha256 = "sha256-G7v5hRSUtO7AwotQ/2eftfs31+IbyzGHydT/IR1bhOY="; }; - vendorHash = "sha256-376PGm8VQ9B7/YYYqJyRZoMwAmaHYqEerBW5PV9Z8nY="; + vendorHash = "sha256-fndK1PO4CfTGQV1f9PJ+ju5VUW/RIE5i8IBARJn0g6g="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 43f9e16de63a..dfbeb9d95d21 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -428,13 +428,13 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-bn02BLLSgdo7/Oh95rNOxVUVvwflSvU43DOsii5LM0E=", + "hash": "sha256-im5YyI1x9ys0MowuNm7JcbJvXPCHxcXXWJeRXRrRIr4=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v15.10.0", + "rev": "v15.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-s4FynUO6bT+8uZYkecbQCtFw1jFTAAYUkSzONI6Ba9g=" + "vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ=" }, "google": { "hash": "sha256-rF68NnqyEY4BWl+oLOxfTaQw5zEGs6Ue/L9DwzsJ46M=", diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index 97c564a40c63..2dad2d688eca 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -2,28 +2,25 @@ , stdenv , fetchFromGitHub , bash +, cmake , dockbarx , gobject-introspection , keybinder3 , pkg-config , python3Packages -, vala -, wafHook , wrapGAppsHook , xfce }: stdenv.mkDerivation rec { pname = "xfce4-dockbarx-plugin"; - version = "${ver}-${rev}"; - ver = "0.6"; - rev = "5213876151f1836f044e9902a22d1e682144c1e0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "xuzhen"; repo = "xfce4-dockbarx-plugin"; - rev = rev; - sha256 = "sha256-VqtGcBRjvpCO9prVHOv6Gt1rAZtcAgkQkVCoR6ykC2k="; + rev = "v${version}"; + sha256 = "sha256-ZxaWORqA8LiM4CzakxClg5C6AsyHrzCGydgboCrC45g="; }; pythonPath = [ @@ -32,11 +29,10 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + cmake gobject-introspection pkg-config python3Packages.wrapPython - vala - wafHook wrapGAppsHook ]; @@ -49,14 +45,20 @@ stdenv.mkDerivation rec { ++ pythonPath; postPatch = '' - substituteInPlace wscript --replace /usr/share/ "\''${PREFIX}/share/" - substituteInPlace src/dockbarx.vala --replace /usr/share/ $out/share/ - substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python3' ${bash}/bin/bash + # We execute the wrapped xfce4-panel-plug directly. + # Since argv is used for g_free() we also need to shift the indexes. + substituteInPlace src/xfce_panel_plugin.c \ + --replace '"python3",' "" \ + --replace "g_free(argv[3]);" "g_free(argv[2]);" \ + --replace "g_free(argv[5]);" "g_free(argv[4]);" + + patchShebangs src/xfce4-dockbarx-plug.py ''; postFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath" + chmod +x $out/share/dockbarx/xfce4-panel-plug + wrapPythonProgramsIn "$out/share/dockbarx" "$out $pythonPath" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 1d67d0d7dcbb..9be9a724b1f2 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.20"; + version = "1.4.21"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-PrKosbXZYp7mpQoqJLrm9hRV23XcthgVNu1UtvORfWo="; + hash = "sha256-yidDRKG0Lko+aqoCX7sBKsoOUOTEk3GX/gEx8oTCNSc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index 86320ed693bc..d0fa322791d1 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "itemloaders"; - version = "1.0.6"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scrapy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZzpWIJNDve6SvLDb+QUDVSXUfJabFuRwtyBeCUasUgY="; + hash = "sha256-jwxxKfr/SI1yfjSQbYqggWxBwusBZNYySHwZXHftgFs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix index 593fb90720b2..cbeb05bde98f 100644 --- a/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/pkgs/development/python-modules/jupyter-cache/default.nix @@ -3,6 +3,7 @@ , fetchPypi , attrs , click +, flit-core , importlib-metadata , nbclient , nbformat @@ -10,25 +11,22 @@ , sqlalchemy , tabulate , pythonOlder -, setuptools -, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "jupyter-cache"; - version = "0.5.0"; - format = "pyproject"; + version = "0.6.1"; + format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "87408030a4c8c14fe3f8fe62e6ceeb24c84e544c7ced20bfee45968053d07801"; + sha256 = "sha256-Jvg5ARQ+30ry8/9akeLSrSmORuLO4DyAcdN6I6Y8y/w="; }; nativeBuildInputs = [ - setuptools - pythonRelaxDepsHook + flit-core ]; propagatedBuildInputs = [ @@ -42,11 +40,6 @@ buildPythonPackage rec { tabulate ]; - pythonRelaxDeps = [ - "nbclient" - "sqlalchemy" # See https://github.com/executablebooks/jupyter-cache/pull/93 - ]; - pythonImportsCheck = [ "jupyter_cache" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 3d781098dbed..f3ff10b3c16b 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , python , proj , pythonOlder @@ -18,14 +17,14 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.4.1"; + version = "3.5.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; rev = "refs/tags/${version}"; - hash = "sha256-SbuamcVXvbV5eGm08jhbp1yBno60vkniHrH5xrPej2A="; + hash = "sha256-Vsje8gEJWNt2P1WOFm/IZSpJo04N0CXWxcmfADmP/M4="; }; # force pyproj to use ${proj} @@ -35,23 +34,6 @@ buildPythonPackage rec { proj = proj; projdev = proj.dev; }) - # update tests for PROJ 9.2 - (fetchpatch { - url = "https://github.com/pyproj4/pyproj/commit/59d16f57387bbd09b4d61ab95ac520cfec103af1.patch"; - hash = "sha256-pSDkb+c02KNNlGPwBN/9TQdVJorLr2xvvFB92h84OsQ="; - }) - (fetchpatch { - url = "https://github.com/pyproj4/pyproj/commit/dd06b3fee4eaafe80da3414560107ecdda42f5e0.patch"; - hash = "sha256-6CFVdtovfGqWGXq4auX2DtY7sT4Y0amTJ7phjq5emYM="; - }) - (fetchpatch { - url = "https://github.com/pyproj4/pyproj/commit/9283f962e4792da2a7f05ba3735c1ed7f3479502.patch"; - hash = "sha256-GVYXOAQBHL5WkAF7OczHyGxo7vq8LmT7I/R1jUPCxi4="; - }) - (fetchpatch { - url = "https://github.com/pyproj4/pyproj/commit/9dfbb2465296cc8f0de2ff1d68a9b65f7cef52e1.patch"; - hash = "sha256-F+qS9JZF0JjqyapFhEhIcZ/WHJyfI3jiMC8K7uTpWUA="; - }) ]; nativeBuildInputs = [ cython ]; @@ -102,6 +84,22 @@ buildPythonPackage rec { "test_transformer_group__download_grids" ]; + pythonImportsCheck = [ + "pyproj" + "pyproj.crs" + "pyproj.transformer" + "pyproj.geod" + "pyproj.proj" + "pyproj.database" + "pyproj.list" + "pyproj.datadir" + "pyproj.network" + "pyproj.sync" + "pyproj.enums" + "pyproj.aoi" + "pyproj.exceptions" + ]; + meta = { description = "Python interface to PROJ library"; homepage = "https://github.com/pyproj4/pyproj"; diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index cdbbfeabf887..6b32660ad02d 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyssim"; - version = "0.4"; + version = "0.6"; propagatedBuildInputs = [ numpy scipy pillow ]; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jterrace"; repo = pname; rev = "v${version}"; - sha256 = "0rnj3xdhma1fc0fg0jjsdy74ar0hgr3w8kygbnijqjdms7m3asqm"; + sha256 = "sha256-VvxQTvDTDms6Ccyclbf9P0HEQksl5atPPzHuH8yXTmc="; }; # Tests are copied from .travis.yml diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 4340c9a54957..615eb49ae6c2 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.150"; + version = "2.3.192"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AgYI3V5xJT6LEZYrJV8nO/86MMp5deuTdLhnUHdrge4="; + hash = "sha256-vTn6Fum47wpgpICyiL+s6azhAgqzLj2w7wntypsatiU="; }; patches = [ @@ -116,8 +116,8 @@ buildPythonApplication rec { # Tests are comparing console output "cli" "console" - # Starting to fail after 2.3.96 - "test_runner_verify_secrets_skip" + # Starting to fail after 2.3.192 + "test_non_multiline_pair" ]; disabledTestPaths = [ diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix index ae3e0f163153..5e8d5c504f73 100644 --- a/pkgs/development/tools/rust/cargo-careful/default.nix +++ b/pkgs/development/tools/rust/cargo-careful/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.2.4"; + version = "0.3.2"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-kKF/Fp6RCF9PUdgqeo2e4vLVhl8+5M4oa0Q18ZdXJRc="; + hash = "sha256-+rj9f4uCNDWwX+0Dsr7dwoeQunvsniG61+W9ehs0KDY="; }; - cargoHash = "sha256-rhTi4rHfU+ZgNAMXSX7r5k3NfMUPNjHIUDs6FzeqcWk="; + cargoHash = "sha256-dxb+euJ5PCdDjfne+iUTgsdOSt2HLiItHrVwHx4588c="; meta = with lib; { description = "A tool to execute Rust code carefully, with extra checking along the way"; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 1662e6a198a9..b68634b80bc3 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,30 +2,30 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.77.tar.xz", + "name": "factorio_alpha_x64-1.1.81.tar.xz", "needsAuth": true, - "sha256": "1qcjp51sykq0ygq4j4zih3yp1x517b2j54xfyi8g4minfk57zwk9", + "sha256": "0a8wql8lqlf7jd2bgsgqvkl62jz4gym03iwccif4xc5y1f8sqh32", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.77/alpha/linux64", - "version": "1.1.77" + "url": "https://factorio.com/get-download/1.1.81/alpha/linux64", + "version": "1.1.81" }, "stable": { - "name": "factorio_alpha_x64-1.1.76.tar.xz", + "name": "factorio_alpha_x64-1.1.80.tar.xz", "needsAuth": true, - "sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p", + "sha256": "084j0vb3xp57c0i01jqfxnp8ky6c9rid5yx96l8jqg51071wai6g", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.76/alpha/linux64", - "version": "1.1.76" + "url": "https://factorio.com/get-download/1.1.80/alpha/linux64", + "version": "1.1.80" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.76.tar.xz", + "name": "factorio_demo_x64-1.1.81.tar.xz", "needsAuth": false, - "sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj", + "sha256": "1rj6bcir4jjs23yh07w64rygf67xkpsvgi6byxmrhcv5pi1vavgj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.76/demo/linux64", - "version": "1.1.76" + "url": "https://factorio.com/get-download/1.1.81/demo/linux64", + "version": "1.1.81" }, "stable": { "name": "factorio_demo_x64-1.1.76.tar.xz", @@ -38,20 +38,20 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.77.tar.xz", + "name": "factorio_headless_x64-1.1.81.tar.xz", "needsAuth": false, - "sha256": "1ygzlr26bp7l9znbjyqj7il6yq9faxjfr6cvfqbs8ls66qiv0ls6", + "sha256": "1ibz80bc45lasmy46657awq002gs93nzgirli7zrwcdps50d7vbl", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.77/headless/linux64", - "version": "1.1.77" + "url": "https://factorio.com/get-download/1.1.81/headless/linux64", + "version": "1.1.81" }, "stable": { - "name": "factorio_headless_x64-1.1.76.tar.xz", + "name": "factorio_headless_x64-1.1.80.tar.xz", "needsAuth": false, - "sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94", + "sha256": "0db6g50gwcq2lwlgagc7in12wag6siwcldlq367x2h0d2q0rxj36", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.76/headless/linux64", - "version": "1.1.76" + "url": "https://factorio.com/get-download/1.1.80/headless/linux64", + "version": "1.1.80" } } } diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index ea8ba9d042bc..1ec3b6905a65 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,32 +1,71 @@ -{ lib, stdenv, fetchurl, makeWrapper -, pkg-config, intltool -, perl, perlPackages, gettext, libX11, libXext, libXi, libXt -, libXft, libXinerama, libXrandr, libXxf86vm, libGL, libGLU, gle -, gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam -, systemd, coreutils +{ lib +, stdenv +, fetchurl +, coreutils +, gdk-pixbuf +, gdk-pixbuf-xlib +, gettext +, gle +, gtk3 +, intltool +, libGL +, libGLU +, libX11 +, libXext +, libXft +, libXi +, libXinerama +, libXrandr +, libXt +, libXxf86vm +, libxml2 +, makeWrapper +, pam +, perlPackages +, pkg-config +, systemd , forceInstallAllHacks ? false , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: -stdenv.mkDerivation rec { - version = "6.04"; +stdenv.mkDerivation (finalAttrs: { pname = "xscreensaver"; + version = "6.06"; src = fetchurl { - url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-eHAUsp8MV5Pswtk+EQmgSf9IqwwpuFHas09oPO72sVI="; + url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz"; + hash = "sha256-9TT6uFqDbeW4vo6R/CG4DKfWpO2ThuviB9S+ek50mac="; }; nativeBuildInputs = [ - pkg-config intltool makeWrapper + intltool + makeWrapper + pkg-config ]; buildInputs = [ - perl gettext libX11 libXext libXi libXt - libXft libXinerama libXrandr libXxf86vm libGL libGLU gle - gtk2 gdk-pixbuf gdk-pixbuf-xlib libxml2 pam - perlPackages.LWPProtocolHttps perlPackages.MozillaCA - ] ++ lib.optional withSystemd systemd; + gdk-pixbuf + gdk-pixbuf-xlib + gettext + gle + gtk3 + libGL + libGLU + libX11 + libXext + libXft + libXi + libXinerama + libXrandr + libXt + libXxf86vm + libxml2 + pam + perlPackages.LWPProtocolHttps + perlPackages.MozillaCA + perlPackages.perl + ] + ++ lib.optional withSystemd systemd; preConfigure = '' # Fix installation paths for GTK resources. @@ -45,10 +84,11 @@ stdenv.mkDerivation rec { for bin in $out/bin/*; do wrapProgram "$bin" \ --prefix PATH : "$out/libexec/xscreensaver" \ - --prefix PATH : "${lib.makeBinPath [ coreutils perl ]}" \ + --prefix PATH : "${lib.makeBinPath [ coreutils perlPackages.perl ]}" \ --prefix PERL5LIB ':' $PERL5LIB done - '' + lib.optionalString forceInstallAllHacks '' + '' + + lib.optionalString forceInstallAllHacks '' make -j$NIX_BUILD_CORES -C hacks/glx dnalogo cat hacks/Makefile.in \ | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks @@ -60,9 +100,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.unix; # Once had cygwin problems downloadPage = "https://www.jwz.org/xscreensaver/download.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index a6a4eea245a1..be18edfe46d9 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, help2man , installShellFiles , pkg-config , bzip2 diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/tools/graphics/sic-image-cli/default.nix index e3fbcf438857..c121cf2406c0 100644 --- a/pkgs/tools/graphics/sic-image-cli/default.nix +++ b/pkgs/tools/graphics/sic-image-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sic-image-cli"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "foresterre"; repo = "sic"; rev = "v${version}"; - sha256 = "sha256-JSBvHbqGTwjiKRPuomXtFLgu77ZB4bOlV/JgzIxaWC0="; + sha256 = "sha256-ZKxBanCfPBo5k1EI/cJKpHiWF7M1blZdchWy3DMHrnQ="; }; - cargoSha256 = "sha256-HWnYBLxiz7Kd5rmgTFeIG8XtiRzhRKuo/vunJRPLdWU="; + cargoSha256 = "sha256-cj9UAPwgj4ZT+ReZWi9hOBNicMBOt9qdveYYF5CFapw="; nativeBuildInputs = [ installShellFiles nasm ]; diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 432c59bd02a3..87eb76030e06 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.5.1"; + version = "1.3.5.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-QxRtslteGb45xlLclyg5i5+w2+QGTgieAJeqjjCvaIA="; + hash = "sha256-79N0DX+yQhTuAhspBmeqM/iFQpJ1LabKyFfzHoLLbeg="; }; outputs = [ "out" "lib" ]; @@ -151,6 +151,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Khronos Vulkan Conformance Tests"; homepage = "https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/vulkancts/README.md"; + changelog = "https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/${finalAttrs.pname}-${finalAttrs.version}"; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; }; diff --git a/pkgs/tools/networking/whatip/default.nix b/pkgs/tools/networking/whatip/default.nix index c3e5a29f6049..735936a4da41 100644 --- a/pkgs/tools/networking/whatip/default.nix +++ b/pkgs/tools/networking/whatip/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "whatip"; - version = "1.1"; + version = "1.2"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GabMus"; repo = pname; rev = version; - hash = "sha256-ltimqdFTvvjXtvLC5jAdRaNX15i2Ww5mB3DIr4r9Yzg="; + hash = "sha256-gt/NKgnCpRoVmLvEJJq2geng4miM2g+YhXYEOm5pPTA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index b172fcd7f3cd..6960a7d5806c 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-update"; - version = "0.17.0"; + version = "0.17.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - hash = "sha256-qWVlJJmjrN3inRJ7ukGVT5971CMmB1KWM4XwluqYuzU="; + hash = "sha256-nlA9WmwXkx/2IgRCcmoj/kpRNbNVTEl7uSkISXgo8wo="; }; makeWrapperArgs = [ diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index a86cd449160d..b58190c23b34 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 = "2023-04-21"; + version = "2023-04-22"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zwF6QOm6daQlFP2DJYP9wZ50rb5Z47wIZ9yjHDcIr5M="; + hash = "sha256-HE8L7+/41GMxQeMeei4CEBSbr+CzNkew843dK34D48k="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/text/papeer/default.nix b/pkgs/tools/text/papeer/default.nix new file mode 100644 index 000000000000..a2bd3be97a33 --- /dev/null +++ b/pkgs/tools/text/papeer/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "papeer"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "lapwat"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MhErx/Sjz9DUBZb39pQNVf4V+cRdGxerSOj8alsEaPc="; + }; + + vendorHash = "sha256-3QRSdkx9p0H+zPB//bpWCBKKjKjrx0lHMk5lFm+U7pA="; + + doCheck = false; # uses network + + meta = { + description = "Convert websites into ebooks and markdown"; + homepage = "https://papeer.tech/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e55750cca6b8..c2dea7337ad5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10908,6 +10908,8 @@ with pkgs; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; + papeer = callPackage ../tools/text/papeer { }; + papertrail = callPackage ../tools/text/papertrail { }; pappl = callPackage ../applications/printing/pappl { };