diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f5ec01fab6bb..0955354fa910 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4661,6 +4661,12 @@ githubId = 37017396; name = "gbtb"; }; + gdinh = { + email = "nix@contact.dinh.ai"; + github = "gdinh"; + githubId = 34658064; + name = "Grace Dinh"; + }; gebner = { email = "gebner@gebner.org"; github = "gebner"; @@ -8160,6 +8166,15 @@ githubId = 427866; name = "Matthias Beyer"; }; + MatthieuBarthel = { + email = "matthieu@imatt.ch"; + name = "Matthieu Barthel"; + github = "MatthieuBarthel"; + githubId = 435534; + keys = [{ + fingerprint = "80EB 0F2B 484A BB80 7BEF 4145 BA23 F10E AADC 2E26"; + }]; + }; matthuszagh = { email = "huszaghmatt@gmail.com"; github = "matthuszagh"; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e3d7866cabb5..38ab338aa56c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -354,6 +354,7 @@ in webdav = 322; pipewire = 323; rstudio-server = 324; + localtimed = 325; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -662,6 +663,7 @@ in webdav = 322; pipewire = 323; rstudio-server = 324; + localtimed = 325; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6e979561fa03..837bc7635a06 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1023,7 +1023,7 @@ ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/earlyoom.nix - ./services/system/localtime.nix + ./services/system/localtimed.nix ./services/system/kerberos/default.nix ./services/system/nscd.nix ./services/system/saslauthd.nix diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix deleted file mode 100644 index c80fe366453e..000000000000 --- a/nixos/modules/services/system/localtime.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.localtimed; -in { - imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ]; - - options = { - services.localtimed = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable `localtimed`, a simple daemon for keeping the - system timezone up-to-date based on the current location. It uses - geoclue2 to determine the current location. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - services.geoclue2.appConfig.localtimed = { - isAllowed = true; - isSystem = true; - }; - - # Install the polkit rules. - environment.systemPackages = [ pkgs.localtime ]; - # Install the systemd unit. - systemd.packages = [ pkgs.localtime ]; - - systemd.services.localtime.wantedBy = [ "multi-user.target" ]; - }; -} diff --git a/nixos/modules/services/system/localtimed.nix b/nixos/modules/services/system/localtimed.nix new file mode 100644 index 000000000000..345bdbd8dda0 --- /dev/null +++ b/nixos/modules/services/system/localtimed.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.localtimed; +in { + imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ]; + + options = { + services.localtimed = { + enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable `localtimed`, a simple daemon for keeping the + system timezone up-to-date based on the current location. It uses + geoclue2 to determine the current location. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.geoclue2.appConfig.localtimed = { + isAllowed = true; + isSystem = true; + users = [ (toString config.ids.uids.localtimed) ]; + }; + + # Install the polkit rules. + environment.systemPackages = [ pkgs.localtime ]; + + systemd.services.localtimed = { + wantedBy = [ "multi-user.target" ]; + partOf = [ "localtimed-geoclue-agent.service" ]; + after = [ "localtimed-geoclue-agent.service" ]; + serviceConfig = { + ExecStart = "${pkgs.localtime}/bin/localtimed"; + Restart = "on-failure"; + Type = "exec"; + User = "localtimed"; + }; + }; + + systemd.services.localtimed-geoclue-agent = { + wantedBy = [ "multi-user.target" ]; + partOf = [ "geoclue.service" ]; + after = [ "geoclue.service" ]; + serviceConfig = { + ExecStart = "${pkgs.geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"; + Restart = "on-failure"; + Type = "exec"; + User = "localtimed"; + }; + }; + + users = { + users.localtimed = { + uid = config.ids.uids.localtimed; + group = "localtimed"; + }; + groups.localtimed.gid = config.ids.gids.localtimed; + }; + }; +} diff --git a/nixos/tests/isso.nix b/nixos/tests/isso.nix index f4560ba3e635..575e1c52eccf 100644 --- a/nixos/tests/isso.nix +++ b/nixos/tests/isso.nix @@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { '' machine.wait_for_unit("isso.service") - machine.wait_for_open_port(port) + machine.wait_for_open_port(${toString port}) machine.succeed("curl --fail http://localhost:${toString port}/?uri") machine.succeed("curl --fail http://localhost:${toString port}/js/embed.min.js") diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 8772171c8ce2..5917739f2442 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "librespot"; - version = "0.3.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "librespot-org"; repo = "librespot"; rev = "v${version}"; - sha256 = "1fv2sk89rf1vraq823bxddlxj6b4gqhfpc36xr7ibz2405zickfv"; + sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA="; }; - cargoSha256 = "1sal85gsbnrabxi39298w9njdc08csnwl40akd6k9fsc0fmpn1b0"; + cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix index c2b84fd6ed78..207fbc3717f7 100644 --- a/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -18,13 +18,13 @@ let in mkDerivation rec { pname = "mt32emu-qt"; - version = "1.10.2"; + version = "1.11.1"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "${char2underscore "-" pname}_${char2underscore "." version}"; - sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9"; + sha256 = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0="; }; postPatch = '' diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix index eee9f01ebb55..86b5dcee4a65 100644 --- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix +++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "mt32emu-smf2wav"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "${char2underscore "-" pname}_${char2underscore "." version}"; - sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9"; + sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs="; }; postPatch = '' diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 01e8f5d23611..bcb254ad87cc 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "22.2"; + version = "22.5"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-MZ8Vm/d+0r7YsXdySKcH5rqXBh4iFLyUe44LBOD58E0="; + sha256 = "sha256-a/nYq6Cfbx93jfA6I8it+U0U36dOAFSpRis32spPks4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index 7dab868b941a..e995f8cfa1b9 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/xou816/spot"; license = licenses.mit; maintainers = with maintainers; [ jtojnar tomfitzhenry ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 5fc0d6f4200f..e13a791ccbbc 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.9.1401"; + version = "1.9.9.1403"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "894df3ea80f66a27a9ae5fab918acf62a6798b8b"; - hash = "sha256-LIi+9vb0+56AGvVrLx4gQaUkUNjIi6PmqrLViLT1DSU="; + rev = "bc72c0de3fff771540a2a45aaafafed539387b3c"; + hash = "sha256-205i61mbeQG2MzSE9NtPHSuNeyMbjZzbZVCFFzjqKqQ="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index 64ad86825e00..8734d7d1f654 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.7.1"; + version = "0.7.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-n5Z6LnZ0x+V46Exa9vSMrndZHperJlcXl1unfeTuo9M="; + sha256 = "sha256-4o36h/x4+h2H4xpgPfOgIza6zNANyhmSM3Cm1XwWb7w="; }; - cargoHash = "sha256-eIM0/SWLZVyVsHyQ4GzKSjVTvK7oActAiBEv56+JqK4="; + cargoHash = "sha256-WHxrMD6W7UyJg8HhjxWlm9KQ5SKsM6fLdvhDzBb16pI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 18909852ac8f..1fc4170ffed0 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.45.0"; + version = "2.45.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-jw4ocBtyxhPhI2GnhL9tbduY4iIQK53vUHB64qSGXKI="; + hash = "sha256-KUp7ZQZ+THjioOSe3A40Zj+5OteWxEv+dnSbTUM8qME="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 9155a9fe279a..f6b52a4fede7 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0vwnx7fs46fkas75pnhjc81wy3hr24k2gs82i30ailaxw5r63j81"; - x86_64-darwin = "0bxc74vfkw9zhxfahzhcghlnybvj8k15jbni489lf636a45xrlcc"; - aarch64-linux = "10z6nv67yjd15ilxgfpjf07qbdp0cbd5761a5gcymiam4r22l6hq"; - aarch64-darwin = "133nccm0hcgcd2503psxwaaq4v4l16q7w7kbcz1y5lynlvwazjrx"; - armv7l-linux = "1sx3l42ls62v3apjap25ccg4mcbi71spfj5xh7y6rffzi65xwdrv"; + x86_64-linux = "1jvi34ym7d6j5zl9d7wg3rcy34f4ji907mixfmvs7g0z1vlra2sv"; + x86_64-darwin = "19nnkx2l4rvm23r8ii2a0jn8lvanmshwsjrsgmi7dcnf68143601"; + aarch64-linux = "17rx5v3kzwzkzhckly8s413370mrh7rcyhpnppmn39gkvy68ydhs"; + aarch64-darwin = "0ff0yn3kcb35s775w0k2l3szs137ph593qa7y3p2h4sbfsrgljxz"; + armv7l-linux = "0qhik2qhbwpjrbkpdc8cblvrh1hqld69il78zmayq1bbkqzhhmp5"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.70.0"; + version = "1.70.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 954f97bf9b4a..bc9d1a82a0f3 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "493"; + version = "495"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sROmWFH3sDBDh1VSVLTM71Y9qD8CndvwW7PKzkavIuc="; + sha256 = "sha256-MuSK19oSrRJZebATRpDW1CmUq4NKcpuoPmOuLyvL8A8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 17a811aa87f8..eaab55678aa8 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -52,6 +52,11 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config ]; + postFixup = '' + substituteInPlace $dev/lib/cmake/OpenImageIO/OpenImageIOTargets-*.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$out/lib/lib" + ''; + meta = with lib; { homepage = "http://www.openimageio.org"; description = "A library and tools for reading and writing images"; diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 8c45f3a62ff3..02f5025a563f 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -82,9 +82,9 @@ stdenv.mkDerivation { ''; in '' - mkdir -p $out/etc/udev/rules.d/ - ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules || \ - cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules + mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d + ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules + ./tools/sane-desc -m udev+hwdb -s doc/descriptions -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb # the created 49-libsane references /bin/sh substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ --replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}" diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 97df954ed2a1..de28815e9d02 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -14,10 +14,10 @@ let pname = "1password-cli"; version = "2.6.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-2V3/F7/HEOvk2T1dv4rnS0xu6Z5EqGSV/9erED7ZS1w=" "zip"; - i686-linux = fetch "linux_386" "sha256-z4pKZY5DQ2oDHHuet1S/p7GM+rXS8/8xmTrN+rqCUBo=" "zip"; + aarch64-linux = fetch "linux_arm64" "sha256-udKcojp7CUz5mXIFeLiXKJ7X1A/fejoeLUc+2zlnlKo=" "zip"; + i686-linux = fetch "linux_386" "sha256-gJpwZrtgzC+fD8dqc2hgfsAiYmVkAY3xSmIQnsC5naw=" "zip"; x86_64-linux = fetch "linux_amd64" "sha256-X+VyoXg7HRq70b9qRhk2N/UvBlhIkvCWM6kadaGDhsU=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-YPidRXNzNNuDoM2Gd5dEsCDxwosBJFKSzjoP0SPkQZs=" "pkg"; + aarch64-darwin = fetch "apple_universal" "sha256-Z8MKp9fQBsvg1nQ0QSrnMV0Bxy6LmnwHb5WIrhGjxv8=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 6e28c58798e7..6cb1e67f30bf 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.26.1"; + version = "0.27.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI="; + sha256 = "sha256-AcnXhilnr5ay45S30eNSDuN+Ed1TDv/Rh523LsUf3iM="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix new file mode 100644 index 000000000000..7a83da6222a2 --- /dev/null +++ b/pkgs/applications/misc/clipqr/default.nix @@ -0,0 +1,70 @@ +{ buildGoModule +, copyDesktopItems +, fetchFromGitLab +, lib +, libGL +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libXrandr +, makeDesktopItem +, mesa +, pkg-config +}: + +buildGoModule rec { + pname = "clipqr"; + version = "1.0.0"; + + src = fetchFromGitLab { + owner = "imatt-foss"; + repo = "clipqr"; + rev = "v${version}"; + sha256 = "sha256-E90nTJtx4GOacu8M7oQBznnSQVDIZatibgKMZEpTUaQ="; + }; + + vendorSha256 = "5kAOSyVbvot4TX/XfRNe1/zZk6fa7pS1Dvn9nz11u3U="; + + ldflags = [ "-s" "-w" ]; + + buildInputs = [ + libGL + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + mesa + ]; + + nativeBuildInputs = [ + copyDesktopItems + pkg-config + ]; + + postInstall = '' + install -Dm644 icon.svg $out/share/icons/hicolor/scalable/apps/clipqr.svg + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ClipQR"; + desktopName = "ClipQR"; + exec = "clipqr"; + categories = [ "Utility" ]; + icon = "clipqr"; + comment = "Scan QR codes on screen and from camera"; + genericName = "ClipQR"; + }) + ]; + + meta = with lib; { + description = "Scan QR codes on screen and from camera, the result is in your clipboard"; + license = licenses.mit; + maintainers = with maintainers; [ MatthieuBarthel ]; + homepage = "https://gitlab.com/imatt-foss/clipqr"; + }; +} diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index cafa83f06ed8..37ad59eb0207 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.9.10"; + version = "2.9.12"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-FIQuvayhk2XrkpbVxwfXRMyFnOxKv8bs1ayeboQHliY="; + hash = "sha256-JkAykc5j5HMkK48qAm876A2zBD095CG/yR4TyXAdevM="; }; patches = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 1eaa6177a925..8bf473d2cfc8 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.1.3"; # When updating also update mvnSha256 + version = "22.1.4"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-QrocrH/orgXvg0vNelm1hK4dHeDsxe3ZaVb3Q2FgYSo="; + sha256 = "sha256-5s2SFquB0i5X2deBO0FStudReB4wGhQkhR39PHPBEAM="; }; - mvnSha256 = "U+RqrXtwFrku4b5d47WrFLmrlfqBs8YVif/qGf5CXqQ="; + mvnSha256 = "YIeKSL5scU8NxEIf+jK1g9cdFDOBVh14ruKMqUuz1Ts="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 7ce85dc6f767..0fbfbcba3139 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.1"; + version = "11.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-0n1XPrJ+gssIP/7k9CI8AWXs9ddKOg3Lo3DfrXGUl84="; + sha256 = "sha256-n8busir6IYyWyGOv9AzYjm8erR0fjMAduIzITH+EvVI="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index af50644f1f71..1dba44531e59 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec { desktop-file-utils glib gtk3 + gobject-introspection meson ninja pkg-config @@ -41,7 +42,6 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - gobject-introspection gtk3 libhandy librsvg diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 250d4087e703..1afb5117a4bf 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-CVCXNPmc/0T8vkxfU+i1nSbfusZGFVkLEveSoCePK0M="; + sha256 = "sha256-N7faWyM2KExnKr6foO6KIxkFD/pGzw9RJDnADwK/fYU="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoSha256 = "sha256-/p2cVxOvWKkcVOYIR0N8tQSCniw+QhXhC+pus4NsQ8k="; + cargoSha256 = "sha256-h5kqm3ZyqzJhTjBcuOvaHkwPvF1xerN2eEDFwZAah6g="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 44f09e3d2cb9..1b149daa8ba2 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "103.0-3", + "packageVersion": "103.0.2-1", "source": { - "rev": "103.0-3", - "sha256": "1d8qh0s5zjh10cyyawpvr7ywygg1ibh1r0rx0vnqv1qakj3y4jcq" + "rev": "103.0.2-1", + "sha256": "0cfhrxnvxlidipg0cpz0gapya8pvfqcmjkyqns4xz1jq5lkm1xg3" }, "firefox": { - "version": "103.0", - "sha512": "016c2f276fb94e5174626f7d8b1a821b2de0f5a07f8a10f00a7ea4d4285591b0c23dd3ef45306579de79b3dfa99ccc527224c33f3319f61cf088b1f4bd097f9e" + "version": "103.0.2", + "sha512": "f13984bb551039c80ef731931f08a284f070142ecb479b31a4caad026a6b535e3fc7ae506b629e933ba5f5a1676f14b6b36d031d22584170492676f8727c822a" } } diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index c3a44a6dbbe3..8f6d2712caaf 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -6,7 +6,7 @@ offpunk, python3, stdenv, - testVersion, + testers, timg, xdg-utils, xsel, @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests.version = testVersion { package = offpunk; }; + passthru.tests.version = testers.testVersion { package = offpunk; }; meta = with lib; { description = "An Offline-First browser for the smolnet "; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 92070fe2a393..cde1c27769b3 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.30"; + version = "0.8.32"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-KTZ8UJ0aQmjreio7ancJnZ0KGANAQIPYNSQGXHHSqX4="; + sha256 = "sha256-Yat9RIsbMCGVwu7xqC2xNUPZACpMG+ATsQN7d2n0eFU="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index d458e7ce40aa..89772f9aa7be 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.31.5"; - sha256 = "0dv34y79229n63i5as0qxf3lmlsfyk8p277i09hrq1vn86wnjdm7"; - manifestsSha256 = "1p5f05lgbv2hhl5dbank2mmhmhlkxn1rfnh09x02j22ldrvk3zzl"; + version = "0.32.0"; + sha256 = "1gxfnf47i26kzgsaxbl2pf02hn5dwb290qs894hz196jc2021a7n"; + manifestsSha256 = "19jdmdipbshqv06xzkx5p4ym0x2jgrvnvsq38dg6b4y0iwzd9nmm"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-bTvVf6fsrWLayOwwxBo2iOz5Di4dHEiV45uGkAyWrMU="; + vendorSha256 = "sha256-pVK+VFfAk0jFp6u5mVB2p8CamPkD3/KRhYNy3zHUVCE="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests @@ -46,7 +46,7 @@ in buildGoModule rec { $out/bin/flux --version | grep ${version} > /dev/null ''; - postInstall = '' + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' for shell in bash fish zsh; do $out/bin/flux completion $shell > flux.$shell installShellCompletion flux.$shell diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 07ddd07e7a46..efae706c4063 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.0"; + version = "1.12.3"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-LRCdKz7vaxxQTFveHbF2WrSinPtjWP96GhqtSMLIiDs="; + hash = "sha256-0neq2EjlHddjLHyNlnqFjXCZpv8r7DGMeYNCzJUEFFg="; }; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 730201ee2122..61dbfef0a697 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-QyxluxAwhEZrgfMWlxB7sUZi6XGCFNGhhWRw3RmnhKM="; + sha256 = "sha256-AfJf+o73iR0aHNFfB7f0S+cc5VeEOAjD0Ou44WHTTAg="; }; - vendorSha256 = "sha256-gkzDecVvHZPFWDSi8nLw2mkR4HK0+pClpaHcdFFOnF8="; + vendorSha256 = "sha256-Ijy9UxT746Bi6x+aXxKNRxzAo5yRTV/6nbVjk9i4ffk="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 9f289c27b9ee..dd451a803392 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1SlVGQLU/7UmcvyKD/BaJSBCdOWACteQtR2Os4THPaU="; + sha256 = "sha256-uKN+vH7BGz8lUDrmPeLp941KPkkTfOkK4Ib9GZR9D0M="; }; - vendorSha256 = "sha256-vTcFJ7L8FW0IZBNarje/Oc3+jSRMga8+/nPLvqus2vY="; + vendorSha256 = "sha256-CZ8DmgYXQcpd43qm6YsVHFePuUochHgJG7/ffEK8LL8="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index ccd933e4ad51..6986af1d3d5b 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -16,15 +16,15 @@ buildGoModule rec { inherit pname ; - version = "1.5.0"; + version = "1.7.1"; tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "sha256-ND1OTa37bxUNLDHceKdgiGE4LkEgBu9NmwuXtE4pZWk="; + vendorSha256 = "sha256-0YmWmGuzyES7BoHKWxzF2K1rDW7PO2DRdNmY3eJkUAM="; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "sha256-CnL+OQfM1lamdCRHTLRmgpwfEfC7C9TX6UEF75bsOsQ="; + sha256 = "sha256-U8fWDXJ0ztod6r0qz63jbgYA06ItxA76BjSliniYnIQ="; }; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index b97b20d6be6a..ade1b6ebfd9a 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.5"; + version = "0.30.6"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K7vQ2Pz35/ye5AhUez/fN7PhW3KRv5/4duG4JpvO5vY="; + sha256 = "sha256-i4i406Ys3MY77t4oN+kIeWopdjtfysm4xDFkTpuo+X0="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index f5672820601d..a25d8d504bcf 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "velero"; @@ -31,7 +31,7 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' $out/bin/velero completion bash > velero.bash $out/bin/velero completion zsh > velero.zsh installShellCompletion velero.{bash,zsh} diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 140487868230..61a89f959040 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.151"; + version = "1.2.153"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-YgyR3BVkfQcluTamXlsCHHfqxbM1wqdmGsHPYDyMk8I="; + sha256 = "sha256-BdGeafZvMgH6qRyYrFPQp0r2470me755J6gUK9XkIJQ="; }; vendorSha256 = "sha256-XpSAFiweD2oUKleD6ztDp1+3PpfUWXfGaaE/9mzRrUQ="; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 88fe43884f87..c50b05b05116 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.17.0"; + version = "3.18.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eXm2oOHtNnDK4mikge8Ubjkg4b4mG7HMT17nL/CdU88="; + sha256 = "sha256-G4FfKTlMuJ0YKsNQnMFjXq6ZBuLJjlCg7GqFPHcsHFM="; }; - vendorSha256 = "sha256-14SnK5CeMTmt0ZQ+CI14FACcMaNNbBWvAYfbQoJ2K/A="; + vendorSha256 = "sha256-g2T3TmwkF1ft5XRimZLrTmm0Km5HcX/0aQtUjA5TZzw="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index cc62a7f7070e..033a7ba836f0 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.22"; + version = "3.3.24"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-VDMcOiuEOTzyogkdpVogikrme2Q6drpb40PqDgDtr7Q="; + hash = "sha256-AjYX9f7v6lxMO6vTjAanDMluvGDAvTwcvcq/fwMzSfk="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 263d3a17fa54..6048fb079edb 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.86.0.407"; + version = "8.87.0.403"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-46M0JYP5QBCTCRqLtNyrQsEc6PsK6WRssb55IkG6pu0="; + sha256 = "sha256-ibugr15eRQ2gbvX8wmk2lFioLPST9ljAuWcJHCoi9l8="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5b7416555ff5..3f1468126fd8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -73,7 +73,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.0.2"; + version = "4.1.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -82,7 +82,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "07fhm36394171w0rvay1x9x1br3z36z4dlpi57bkq23dvi331pxj"; + sha256 = "06va1b5dac7a2av6vc0xin27y1hfnf4xbafy10myv33am8l5222m"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 9d50168323d5..590e8f337fe6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-05-08"; + version = "unstable-2022-08-11"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "10d5f4bf77333ef6b43516f90d2ce13273255f41"; - sha256 = "02sky7sx73rj8xm1f70vy94zxaab6qiif742fv0vi4y6pfqrngn7"; + rev = "a5fbc9123e056e611e69acf0ceb4252ddd838adb"; + sha256 = "1hzck63spjjkqzkj0mlrxygrix4lw0n3i5cmc0vkxaphfzawz74n"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index b9321f0797fa..cbd099c33bc7 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,4 +1,11 @@ -{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }: +{ stdenv +, lib +, fetchFromGitHub +, libcommuni +, qmake +, qtbase +, wrapQtAppsHook +}: stdenv.mkDerivation rec { pname = "communi"; @@ -15,12 +22,20 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ qmake ] - ++ lib.optional stdenv.isDarwin wrapQtAppsHook; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; - buildInputs = [ libcommuni qtbase ]; + buildInputs = [ + libcommuni + qtbase + ]; - dontWrapQtApps = true; + # libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin + # Wrapper hook thinks it's a binary because it's in $out/Applications, wraps it with a shell script + # So we manually call the wrapper script on just the binary + dontWrapQtApps = stdenv.isDarwin; preConfigure = '' export QMAKEFEATURES=${libcommuni}/features @@ -32,20 +47,22 @@ stdenv.mkDerivation rec { "COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor" "COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications" "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes" - (if stdenv.isDarwin - then [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/Applications" ] - else [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin" ]) + "COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.isDarwin then "Applications" else "bin"}" ]; - postInstall = if stdenv.isDarwin then '' - # Nix qmake does not add the bundle rpath by default. - install_name_tool \ - -add_rpath @executable_path/../Frameworks \ - $out/Applications/Communi.app/Contents/MacOS/Communi - '' else '' - substituteInPlace "$out/share/applications/communi.desktop" \ - --replace "/usr/bin" "$out/bin" - ''; + postInstall = + if stdenv.isDarwin then '' + # Nix qmake does not add the bundle rpath by default. + install_name_tool \ + -add_rpath @executable_path/../Frameworks \ + $out/Applications/Communi.app/Contents/MacOS/Communi + + # Do not remove until wrapQtAppsHook doesn't wrap dylibs in app bundles anymore + wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi + '' else '' + substituteInPlace "$out/share/applications/communi.desktop" \ + --replace "/usr/bin" "$out/bin" + ''; preFixup = '' rm -rf lib @@ -56,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/communi/communi-desktop"; license = licenses.bsd3; maintainers = with maintainers; [ hrdinka ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index 951e42475e18..f04a3e07a052 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -6,19 +6,20 @@ python3Packages.buildPythonApplication rec { pname = "zeronet-conservancy"; - version = "0.7.6"; + version = "0.7.7"; format = "other"; src = fetchFromGitHub { owner = "zeronet-conservancy"; repo = "zeronet-conservancy"; rev = "v${version}"; - sha256 = "sha256-tWNU7UJVWB+aRLam6WKV/HaRRTIQvlEgxe4xJYKpXJY="; + sha256 = "sha256-6qBdq6DoIKZUUGflz7kWu3S3pMJB4vkGUytpU5EatP0="; }; propagatedBuildInputs = with python3Packages; [ gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client - gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich + gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich defusedxml + pyaes ]; buildPhase = '' diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 74dc8564b0b1..7a1dd8be40d5 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "02q8l1qaahmd41h6v3r46akh7xlqz7fpwwsy15qww4jdvypg6vg4"; + sha256 = "sha256-f1XEcDMy4skddtbZFFhCF4xg6zQahOLiGcYiJPy2SHs="; }; strictDeps = true; diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index 454f23ce88ee..ee4a8f299444 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "delly"; - version = "1.0.3"; + version = "1.1.3"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-37AEaTOFmJ2yYXLwjNa7UXBoH/NxOK8+vlXhUhj6CM4="; + sha256 = "sha256-fGwSRYpvGYyYvRvP1ljs3mhXRpONzO5/QVegjqMsOdk="; }; buildInputs = [ zlib htslib bzip2 xz ncurses boost ]; diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix index d7882bd4854e..29ab02ee3139 100644 --- a/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -1,26 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, perlPackages, libminc }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc }: stdenv.mkDerivation rec { pname = "mni_autoreg"; - version = "unstable-2017-09-22"; + version = "unstable-2022-05-20"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "ab99e29987dc029737785baebf24896ec37a2d76"; - sha256 = "0axl069nv57vmb2wvqq7s9v3bfxwspzmk37bxm4973ai1irgppjq"; + rev = "be7bd25bf7776974e0f2c1d90b6e7f8ccc0c8874"; + sha256 = "sGMZbCrdV6yAOgGiqvBFOUr6pGlTCqwy8yNrPxMoKco="; }; - patches = [ - # Pull upstream workaround for -fno-common toolchains: - # https://github.com/BIC-MNI/mni_autoreg/pull/28 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/BIC-MNI/mni_autoreg/commit/06adfacbd84369ea3bcc4376596ac1c0f2e49af9.patch"; - sha256 = "004sdrbx9kcj1qqwjly6p03svakl0x2sbv83salyg63fv67jynx8"; - }) - ]; - nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libminc ]; propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 3def53dbd2e4..236f7df5d76b 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "nickg"; repo = pname; rev = "r${version}"; - sha256 = "sha256-BtUMpT1MKRFGRlIbCEGo4OBZ/r9es1VRmJdgmk1oZFQ="; + sha256 = "sha256-U9VxpHzrAQPMqnSs0YcEnc9dlQUutTuZCJP5F1v7eaA="; }; nativeBuildInputs = [ @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then elfutils else libelf) ]; - # TODO: remove me on 1.7.0 - postPatch = '' - sed -i "/vests22/d;/vhpi4/d" test/regress/testlist.txt + # TODO: recheck me on next release + postPatch = lib.optionalString stdenv.isLinux '' + sed -i "/vhpi4/d" test/regress/testlist.txt ''; preConfigure = '' diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 3777f6e24896..89a967678aa5 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.12.0"; + version = "7.12.1"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-URywo88EcQBYorwnKqgGOzunf2JunEWa36adhA1wha0="; + hash = "sha256-QfSk6K/Vpj3+k+5w0thiP9O4CTvL8JDRwj4lDSt2NnU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 01f69c9c9808..a595a78b9806 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-rnlSwqZ3Kigfmkt2ws5bmX/ipqxFUPZYDpdnkZZE59Y="; + sha256 = "sha256-O5+OKY0o9vIO0uQGDlA0PMugfLAf45B/iHrrC2p0G+4="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix b/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix index 45b7851133ef..8d180f5176a2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-credential-1password"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "develerik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F3XhBVTV8TgVNrOePm3F+uWspkllBlZ/yRyUxrCG0xw="; + sha256 = "sha256-Bz/EW+K4XtDap3cu3/+9nJePcdxMXakj8HDPsbCx1FU="; }; - vendorSha256 = "sha256-2CNGAuvO8IeNUhFnMEj8NjZ2Qm0y+i/0ktNCd3A8Ans="; + vendorSha256 = "sha256-cPHA6rVUQg41sS79UBFf85OfLn53C8/OZVGT5xVdBdw="; meta = with lib; { description = "A git credential helper for 1Password"; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index ffe5aeb7ee34..9577d1c41fd0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.11.4"; + version = "3.11.6"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nP7TOxTvf2twfS3rLYjiR6iRTS+lA6iJttqzlj4rGm0="; + sha256 = "sha256-W2OYJO3UnBcZRoIyTRj3Wz7J91zDWrrYPH5OnYvXi24="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index a697093e1f80..18668b532a89 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-/y9UUVwJ/u1F9+hMxWqGENscTuf8GP4VZl7hTk3zyrM="; + sha256 = "sha256-SIXenrdIprAFOvz68Kn9qwmxLtDNkMUHxkXYFIyKo0Y="; }; - vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI="; + vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix new file mode 100644 index 000000000000..0febc33a3cdd --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, cmake +, installShellFiles +, asciidoctor +, DarwinTools +, openssl +, libusb1 +, AppKit +, openssh +}: + +rustPlatform.buildRustPackage rec { + pname = "radicle-cli"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "radicle-dev"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LS6zYpMg0LanRL2M8ioGG8Ys07TPT/3hP7geEGehwxg="; + }; + + cargoSha256 = "sha256-o7ahnV7NnvzKxXb7HdNqKcxekshOtKanYKb0Sy15mhs="; + + nativeBuildInputs = [ + pkg-config + cmake + installShellFiles + asciidoctor + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + DarwinTools + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libusb1 + AppKit + ]; + + postInstall = '' + for f in $(find . -name '*.adoc'); do + mf=''${f%.*} + asciidoctor --doctype manpage --backend manpage $f -o $mf + installManPage $mf + done + ''; + + checkInputs = [ openssh ]; + preCheck = '' + eval $(ssh-agent) + ''; + + meta = { + description = "Command-line tooling for Radicle, a decentralized code collaboration network"; + homepage = "https://radicle.xyz"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ amesgen ]; + platforms = lib.platforms.unix; + mainProgram = "rad"; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 54dbc195f07f..0ec06aeaaa68 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.13"; + version = "3.3.15"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/subgit-${version}.zip"; - sha256 = "sha256-+sG7yD2aVLV9i7iPZTMMsY1CQ1VuJ8w+jPguuTulR8c="; + sha256 = "sha256-2/J/d4GrlLXR/7QBxgIMepzP+xxkeLvrCBwLl7Ke8wI="; }; } diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 3ceda283d3d8..b507c0d31947 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.17.0"; + version = "0.17.1"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-OlWNln62VouUJzzk0CtED+OdSM+aBc4NOu1TSaKVWnk="; + sha256 = "1n5r1h2khjwdsckiviv8f2pflxibk8rs68fs08jak0kbm0kkyj18"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 9ddd6e308c3b..071f762ff4a7 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -18,10 +18,7 @@ stdenvNoCC.mkDerivation rec { }; postPatch = '' - # 'require' replaced with 'dofile' to work around - # https://github.com/mpv-player/mpv/issues/7399 until fixed in mpvacious substituteInPlace subs2srs.lua \ - --replace "require('osd_styler')" "dofile('"$out/share/mpv/scripts/mpvacious/osd_styler.lua"')" \ --replace "'curl'" "'${curl}/bin/curl'" \ --replace "'wl-copy'" "'${wl-clipboard}/bin/wl-copy'" \ --replace "xclip" "${xclip}/bin/xclip" @@ -36,7 +33,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.scriptName = "mpvacious/subs2srs.lua"; + passthru.scriptName = "mpvacious"; meta = with lib; { description = "Adds mpv keybindings to create Anki cards from movies and TV shows"; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 9d35e87f1614..877bcc2f8b04 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "1.0.0"; + version = "1.1.1"; suffix = { x86_64-linux = "x86_64"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0="; - aarch64-linux = "sha256-9ggRmijwXE9adVFv5XommgvdpeeWnWUFES+Ep2GrBVo="; + x86_64-linux = "sha256-KRlOE4iDWMYzKZUZnuKIwIGooj5o8ARpROS7f2VIr1c="; + aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index 458e2ffc7e5e..64c933a5d325 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "firectl"; # The latest upstream 0.1.0 is incompatible with firecracker # v0.1.0. See issue: https://github.com/firecracker-microvm/firectl/issues/82 - version = "unstable-2022-03-01"; + version = "unstable-2022-07-12"; src = fetchFromGitHub { owner = "firecracker-microvm"; repo = pname; - rev = "9f1b639a446e8d75f31787a00b9f273c1e68f12c"; - sha256 = "TjzzHY9VYPpWoPt6nHYUerKX94O03sm524wGM9lGzno="; + rev = "ec72798240c0561dea8341d828e8c72bb0cc36c5"; + sha256 = "sha256-RAl1DaeMR7eYYwqVAvm6nib5gEGaM/t7TR8u1IpqOIM="; }; - vendorSha256 = "3SVEvvGNx6ienyJZg0EOofHNHCPSpJUGXwHxokdRG1c="; + vendorSha256 = "sha256-dXAJOifRtzcTyGzUTFu9+daGAlL/5dQSwcjerkZDuKA="; doCheck = false; diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix new file mode 100644 index 000000000000..cd2ff0e706f4 --- /dev/null +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, asciidoctor +, libkrun +}: + +stdenv.mkDerivation rec { + pname = "krunvm"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-rR762L8P+7ebE0u4MVCJoXc5mmqXlDFfSas+lFBMVFQ="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-3WiXm90XiQHpCbhlkigg/ZATQeDdUKTstN7hwcsKm4o="; + }; + + nativeBuildInputs = with rustPlatform;[ + cargoSetupHook + rust.cargo + rust.rustc + asciidoctor + ]; + + buildInputs = [ libkrun ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "A CLI-based utility for creating microVMs from OCI images"; + homepage = "https://github.com/containers/krunvm"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix index a99a9f64d861..29579a70cde4 100644 --- a/pkgs/applications/virtualization/kvmtool/default.nix +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "kvmtool"; - version = "unstable-2022-04-04"; + version = "unstable-2022-06-09"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git"; - rev = "5657dd3e48b41bc6db38fa657994bc0e030fd31f"; - sha256 = "1y1j44lk9957f2dmyrscbxl4zncp4ibvvcdj6bwylb8jsvmd5fs2"; + rev = "f44af23e3a62e46158341807b0d2d132249b96a8"; + sha256 = "sha256-M83dCCXU/fkh21x10vx6BLg9Wja1714qW7yxl5zY6z0="; }; enableParallelBuilding = true; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5da3838596c0..2385d413d3c4 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "22.07.11"; + version = "22.08.07"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-0wDSK1sBYEQ+3wr5BkZvvtFdG66uMzHYAtyvpaZZlTI="; + sha256 = "sha256-nYRiAp8cHDyWGlb/s6ysiI2w2Oo7yj1HnKPo0EOqvhY="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 6cb002e7d501..35f9f72591db 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "22.07.11"; + version = "22.08.07"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-ZLQYS9KQETgjSSdwWiA2tiQGS5hiEt4Gl0hUw5RI/S0="; + sha256 = "sha256-AWDahl9DUAEYY7OW9E323LOdM37INcAbEXA19FYRObE="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index 5690355a0ce2..8716b6858cd3 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -16,15 +16,16 @@ , gtk4 , libadwaita , librsvg +, pango }: stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Eq9Uk6YiBaxrt0VA8KhYQT2okolmo0boVDMLQdc7w5M="; + sha256 = "ZikL9yhky8bufM6Mn0DegSTo5gl712hi8teqsMS9sCw="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { gtk4 libadwaita librsvg + pango ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index aa3d9981998c..4ec5518da21e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "6.0.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "terminal"; rev = version; - sha256 = "sha256-glcY47E9bGVI6k9gakItN6srzMtmA4hCEz/JVD5UUmI="; + sha256 = "sha256-qxjHrlpdJcfXEUan/JgU7HqBRdB36gxAb5xmd/ySsj0="; }; nativeBuildInputs = [ @@ -49,9 +49,6 @@ stdenv.mkDerivation rec { vte ]; - # See https://github.com/elementary/terminal/commit/914d4b0e2d0a137f12276d748ae07072b95eff80 - mesonFlags = [ "-Dubuntu-bionic-patched-vte=false" ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index ef1468ac1ed9..472788bcc701 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "22.01.1"; + version = "22.01.3"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "sha256-Cg0ixQtpmus6Q3fuc45OLheKCCTiTW3z1XJzxQ1OL6c="; + sha256 = "sha256-1bS0t7OkpjoYcx2XA0tE8TG/WJttGxDo68S+zvAA0Eg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix index 81d321c04620..daf7ea497693 100644 --- a/pkgs/development/compilers/open-watcom/bin.nix +++ b/pkgs/development/compilers/open-watcom/bin.nix @@ -85,9 +85,8 @@ let in stdenvNoCC.mkDerivation rec { - pname = "open-watcom-bin"; + pname = "${passthru.prettyName}-unwrapped"; version = "1.9"; - name = "${pname}-unwrapped-${version}"; src = fetchurl { url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}"; @@ -113,8 +112,11 @@ stdenvNoCC.mkDerivation rec { done ''; + passthru.prettyName = "open-watcom-bin"; + meta = with lib; { - description = "A C/C++ Compiler (binary distribution)"; + description = "A project to maintain and enhance the Watcom C, C++, and Fortran cross compilers and tools"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; homepage = "http://www.openwatcom.org/"; license = licenses.watcom; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 751afe8556c5..bdef71006bd8 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -11,15 +11,14 @@ }: stdenv.mkDerivation rec { - pname = "open-watcom-v2"; - version = "unstable-2022-05-04"; - name = "${pname}-unwrapped-${version}"; + pname = "${passthru.prettyName}-unwrapped"; + version = "unstable-2022-08-02"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "01662ab4eb50c0757969fa53bd4270dbbba45dc5"; - sha256 = "Nl5mcPDCr08XkVMWqkbbgTP/YjpfwMOo2GVu43FQQ3Y="; + rev = "4bdb73995b871982dd106838296903701ded29c2"; + sha256 = "sha256-Ay/f+gnj8EklN8T/uP0a+Zji6HEHAoPLdkrSTQaC9Rs="; }; postPatch = '' @@ -82,8 +81,11 @@ stdenv.mkDerivation rec { # Stripping breaks many tools dontStrip = true; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/open-watcom/open-watcom-v2.git"; + passthru = { + prettyName = "open-watcom-v2"; + updateScript = unstableGitUpdater { + url = "https://github.com/open-watcom/open-watcom-v2.git"; + }; }; meta = with lib; { diff --git a/pkgs/development/compilers/open-watcom/wrapper.nix b/pkgs/development/compilers/open-watcom/wrapper.nix index 94cca7ab34ce..113df520b4fc 100644 --- a/pkgs/development/compilers/open-watcom/wrapper.nix +++ b/pkgs/development/compilers/open-watcom/wrapper.nix @@ -29,7 +29,7 @@ let ++ lib.optional isWindows "h/nt" ++ lib.optional isLinux "lh"; listToDirs = list: lib.strings.concatMapStringsSep ":" (dir: "${placeholder "out"}/${dir}") list; - name = "${open-watcom.pname}-${open-watcom.version}"; + name = "${open-watcom.passthru.prettyName}-${open-watcom.version}"; in symlinkJoin { inherit name; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index b7c78e5870c9..3accbf63abe3 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -1,46 +1,76 @@ -{ stdenv, clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr, -openimageio, llvm, boost165, flex, bison, partio, pugixml, -util-linux, python3 +{ stdenv +, lib +, fetchFromGitHub +, cmake +, clang +, libclang +, zlib +, openexr +, openimageio2 +, llvm +, boost +, flex +, bison +, partio +, pugixml +, util-linux +, python3 }: -let boost_static = boost165.override { enableStatic = true; }; -in clangStdenv.mkDerivation rec { - # In theory this could use GCC + Clang rather than just Clang, - # but https://github.com/NixOS/nixpkgs/issues/29877 stops this +let + + boost_static = boost.override { enableStatic = true; }; + +in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.10.9"; + version = "1.11.17.0"; src = fetchFromGitHub { - owner = "imageworks"; + owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.9"; - sha256 = "1dwf10f2fpxc55pymwkapql20nc462mq61hv21c527994c2qp1ll"; + rev = "v${version}"; + sha256 = "sha256-2OOkLnHLz+vmSeEDQl12SrJBTuWwbnvoTatnvm8lpbA="; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" - "-DENABLERTTI=ON" + "-DENABLE_RTTI=ON" # Build system implies llvm-config and llvm-as are in the same directory. # Override defaults. "-DLLVM_DIRECTORY=${llvm}" "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config" + + # Set C++11 to C++14 required for LLVM10+ + "-DCMAKE_CXX_STANDARD=14" ]; preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash "; - nativeBuildInputs = [ cmake boost_static flex bison]; - buildInputs = [ - zlib openexr openimageio llvm - partio pugixml - util-linux # needed just for hexdump - python3 # CMake doesn't check this? + nativeBuildInputs = [ + bison + clang + cmake + flex ]; - # TODO: How important is partio? CMake doesn't seem to find it + + buildInputs = [ + boost_static + libclang + llvm + openexr + openimageio2 + partio + pugixml + python3.pkgs.pybind11 + util-linux # needed just for hexdump + zlib + ]; + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Advanced shading language for production GI renderers"; - homepage = "http://opensource.imageworks.com/?p=osl"; + homepage = "https://opensource.imageworks.com/osl.html"; maintainers = with maintainers; [ hodapp ]; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 2031935e6189..9306796beb03 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -27,14 +27,14 @@ let in buildPythonPackage rec { pname = "vyper"; - version = "0.3.5"; + version = "0.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ldNuADfWy1OWTPD7pTcpU5dX/mX2pV/QqSjJxkc5S28="; + sha256 = "sha256-8jw92ttKhXubzDr0tt9/OoCsPEyB9yPRsueK+j4PO6Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index a432058f083b..45f03f309a04 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -4,18 +4,18 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.21.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - sha256 = "sha256-IXzN6CnZCzrkcLVNmKc1WB0V+TTa56CBzASzK0FQO8c="; + sha256 = "sha256-NuYPqJ/Fvt1P6KFXTIQaAvXYJgTwWrMspPags0Q06cE="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-VWoKHIRQfs4dbsOzV3AQpqWsCPDm/rVKGMsc4xZvbhU="; + vendorSha256 = "sha256-u5YCwnciXlWgqQd9CXfXNipLLlNE3p8+bL6WaTvOkVA="; doCheck = false; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 9efdcd0c4f07..d6a82d3c66d7 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "double-conversion"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "sha256-Vvzjg+UOgegkH8x2vtNU1TS01k5O4ilRJjD7F+BmVmU="; + sha256 = "sha256-vrh/dCuleE3fikryXX86XC/fdVV+j8HvIe4s/SRpNJw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 1b1eb036ef9a..59559051e65e 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.14"; + version = "3.0.15"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "v${version}"; - sha256 = "sha256-gXREvxgGpIBo5oVxxal+Xdwk0WFZufuJKGzABzhB7zM="; + sha256 = "sha256-kyazfsm0lGgz26PWJUyFRmFxQFxmotDPXrwx3N/EVl0="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix index e7537404f09c..5865b876207a 100644 --- a/pkgs/development/libraries/irrlichtmt/default.nix +++ b/pkgs/development/libraries/irrlichtmt/default.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { pname = "irrlichtmt"; - version = "1.9.0mt5"; + version = "1.9.0mt7"; src = fetchFromGitHub { owner = "minetest"; repo = "irrlicht"; rev = version; - sha256 = "sha256-ocsO4nKab2YxHY1qqZbF4OErpBKmG4V+psgC40APs8s="; + sha256 = "sha256-Eu7zW3mXl7GPRmLnKjt/dPoZ64HPYulI7MO1dJfj+10="; }; nativeBuildInputs = [ @@ -30,9 +30,11 @@ stdenv.mkDerivation rec { ]; # https://github.com/minetest/minetest/pull/10729 - postPatch = lib.optionalString withTouchSupport '' - substituteInPlace include/IrrCompileConfig.h \ - --replace '//#define _IRR_LINUX_X11_XINPUT2_' '#define _IRR_LINUX_X11_XINPUT2_' + postPatch = lib.optionalString (!withTouchSupport) '' + sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h + + # HACK: Fix mistake in build script + sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt ''; buildInputs = [ diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 75ec20545cae..c9a5197a6b96 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -9,6 +9,21 @@ , enableJpeg8 ? false # whether to build libjpeg with v8 compatibility , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic + +# for passthru.tests +, dvgrab +, epeg +, freeimage +, gd +, graphicsmagick +, imagemagick +, imlib2 +, jhead +, libjxl +, mjpegtools +, opencv +, python3 +, vips }: assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both @@ -61,6 +76,23 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "test"; + passthru.tests = { + inherit + dvgrab + epeg + freeimage + gd + graphicsmagick + imagemagick + imlib2 + jhead + libjxl + mjpegtools + opencv + vips; + inherit (python3.pkgs) pillow imread pyturbojpeg; + }; + meta = with lib; { homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix new file mode 100644 index 000000000000..21be0c8437ae --- /dev/null +++ b/pkgs/development/libraries/libkrun/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, glibc +, openssl +, libkrunfw +, sevVariant ? false +}: + +stdenv.mkDerivation rec { + pname = "libkrun"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + hash = "sha256-qVyEqiqaQ8wfZhL5u+Bsaa1yXlgHUitSj5bo7FJ5Y8c="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-jxSzhj1iU8qY+sZEVCYTaUqpaA4egjJi9qxrapASQF0="; + }; + + nativeBuildInputs = with rustPlatform;[ + cargoSetupHook + rust.cargo + rust.rustc + ] ++ lib.optional sevVariant pkg-config; + + buildInputs = [ + glibc + glibc.static + (libkrunfw.override { inherit sevVariant; }) + ] ++ lib.optional sevVariant openssl; + + makeFlags = [ "PREFIX=${placeholder "out"}" ] + ++ lib.optional sevVariant "SEV=1"; + + meta = with lib; { + description = "A dynamic library providing Virtualization-based process isolation capabilities"; + homepage = "https://github.com/containers/libkrun"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix new file mode 100644 index 000000000000..10ff37460496 --- /dev/null +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, flex +, bison +, bc +, elfutils +, python3 +, sevVariant ? false +}: + +assert sevVariant -> stdenv.isx86_64; +stdenv.mkDerivation rec { + pname = "libkrunfw"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ay+E5AgJeA0i3T4JDosDawwtezDGquzAvYEWHGbPidg="; + }; + + kernelSrc = fetchurl { + url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.59.tar.xz"; + hash = "sha256-5t3GQgVzQNsGs7khwrMb/tLGETWejxRMPlz5w6wzvMs="; + }; + + preBuild = '' + substituteInPlace Makefile --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' + ''; + + nativeBuildInputs = [ flex bison bc python3 python3.pkgs.pyelftools ]; + buildInputs = [ elfutils ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ] + ++ lib.optional sevVariant "SEV=1"; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A dynamic library bundling the guest payload consumed by libkrun"; + homepage = "https://github.com/containers/libkrunfw"; + license = with licenses; [ lgpl2Only lgpl21Only ]; + maintainers = with maintainers; [ nickcao ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index f1f6dc1b374f..00db5fc83377 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "libminc"; - version = "unstable-2020-07-17"; + version = "2.4.05"; owner = "BIC-MNI"; src = fetchFromGitHub { inherit owner; repo = pname; - rev = "ffb5fb234a852ea7e8da8bb2b3b49f67acbe56ca"; - sha256 = "0yr4ksghpvxh9zg0a4p7hvln3qirsi08plvjp5kxx2qiyj96zsdm"; + rev = "aa08255f0856e70fb001c5f9ee1f4e5a8c12d47d"; # new release, but no git tag + sha256 = "XMTO6/HkyrrQ0s5DzJLCmmWheye2DGMnpDbcGdP6J+A="; }; postPatch = '' @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLIBMINC_MINC1_SUPPORT=ON" "-DLIBMINC_BUILD_SHARED_LIBS=ON" + "-DLIBMINC_USE_NIFTI=ON" "-DLIBMINC_USE_SYSTEM_NIFTI=ON" ]; doCheck = !stdenv.isDarwin; - checkPhase = '' - ctest -j1 -E 'ezminc_rw_test' --output-on-failure # -j1: see https://github.com/BIC-MNI/libminc/issues/110 - # ezminc_rw_test: can't find libminc_io.so.5.2.0 + checkPhase = '' + ctest -j1 --output-on-failure ''; meta = with lib; { diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix index 3f290d4ffa3c..abb570730f66 100644 --- a/pkgs/development/libraries/libzim/default.nix +++ b/pkgs/development/libraries/libzim/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "7.2.2"; + version = "8.0.0"; src = fetchFromGitHub { owner = "openzim"; repo = pname; rev = version; - sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs="; + sha256 = "sha256-FSotc2hkWvkYEdZ3HI3JLzjtKFaWOc1Bx6r0WyeS/Kg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix index c70298c4ff82..748b02a2ecab 100644 --- a/pkgs/development/libraries/nanopb/default.nix +++ b/pkgs/development/libraries/nanopb/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nanopb"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0cjfkwwzi018kc0b7lia7z2jdfgibqc99mf8rvj2xq2pfapp9kf1"; + sha256 = "sha256-B9J+GkgOBR4iZaP6/2ykcjbkifoyhkuukkjK/CLBZj0="; }; nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ]; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index ada36487135f..e896717644aa 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "5.1.12"; + version = "5.1.55"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-CD9xn1m6zpUEC+shmNeWfGAJxNto87UbznD+TLdeuEg="; + sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 86606df5e41b..b3c76fba5dfb 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.12"; + version = "1.14.13"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pupnp"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "sha256-ZJ74x5+4dDb5sJ1cPtlin6iunGyu8boNSpfLFB1mCME="; + sha256 = "sha256-3pvJDReyZilJ8pAHYw6d+6ammv4EliLgA+VOSBsvF20="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index da327ae13fac..eeb73472253a 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pyotherside"; - version = "1.5.9"; + version = "1.6.0"; src = fetchFromGitHub { owner = "thp"; repo = "pyotherside"; rev = version; - sha256 = "1k1fdsinysgx5gp6q62jiwcyiklakmjv6wbi1s2659am96vz3zj8"; + sha256 = "sha256-IIvL704snJIJbigAgJZ3WWg5a/mX/8qzgFN+dBEClG8="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 1a289393ef1e..2a00d9676100 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-r5H02HLqiixbShgXDEaYEe4OrQK2En5zuLtMOajEIBM="; + sha256 = "sha256-G6rTvb2Z2O1Df5/6upEB9Eh049sx+LWhhDKvsZdDqsc="; }; nativeBuildInputs = [ pkg-config python3 which ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 0de5fdf1b7af..efb4c22326d5 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.4.4"; + version = "7.4.5"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-34pAAqUhHQiH0YuRl6a0zdn8p6hSAIJnZXIErm3SYFE="; + sha256 = "sha256-m1ZHyHYFDGTYpP4uAg4T75sLKoLwhEDJstWg7EXHNc8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/science/biology/ciftilib/default.nix b/pkgs/development/libraries/science/biology/ciftilib/default.nix new file mode 100644 index 000000000000..797607ed8f54 --- /dev/null +++ b/pkgs/development/libraries/science/biology/ciftilib/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, libxmlxx +, pkg-config +, zlib +}: + +stdenv.mkDerivation rec { + pname = "ciftilib"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "Washington-University"; + repo = "CiftiLib"; + rev = "v${version}"; + hash = "sha256-xc2dpMse4SozYEV/w3rXCrh1LKpTThq5nHB2y5uAD0A="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost libxmlxx zlib ]; + + cmakeFlags = [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'big|datatype-md5'" ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/Washington-University/CiftiLib"; + description = "Library for reading and writing CIFTI files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.linux; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index ebf167de8d9d..c0abcf6da659 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -38,8 +38,11 @@ stdenv.mkDerivation rec { checkInputs = [ openssh ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - doCheck = true; + # xslu and xsllt tests seem to time out on x86_64-darwin. + # this line is left so those who force installation on x86_64-darwin can still build + doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); preConfigure = '' cmakeFlagsArray+=( @@ -73,7 +76,9 @@ stdenv.mkDerivation rec { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ costrouc markuskowa ]; + platforms = platforms.unix; + maintainers = with maintainers; [ costrouc markuskowa gdinh ]; + # xslu and xsllt tests fail on x86 darwin + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 3baa53458d42..0d5409c6817d 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "7.1.2"; + version = "7.2.0"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-fz8e2//bJB9SANEw29VrUeaqvmh/aSu6+ZnkMb6C40k="; + sha256 = "sha256-N3TBuKWQRisXE5DQ0c+N2cv0darQ8mz4g2oe7pKst9E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/development/libraries/sqlitecpp/default.nix index 60724aaa8046..ff2556d12479 100644 --- a/pkgs/development/libraries/sqlitecpp/default.nix +++ b/pkgs/development/libraries/sqlitecpp/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - checkInputs = [ cppcheck gtest ]; - buildInputs = [ sqlite ]; + checkInputs = [ cppcheck ]; + buildInputs = [ sqlite gtest ]; doCheck = true; cmakeFlags = [ diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index d6d2b3bbe6df..3093c5330a88 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.2.0"; + version = "6.3.0"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-GV1Vk3cvxIP2Pwh5TXnkurMMLsWObOSw+2vMDgxI8x0="; + hash = "sha256-iaIr6oIP8lCqcjn2NKsH+jTv4dLc/eKcyNOvEUVboqc="; }; nativeBuildInputs = [ @@ -66,10 +66,10 @@ stdenv.mkDerivation rec { # # build error: # - # /private/tmp/nix-build-sundials-6.2.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255]. + # /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255]. # ldr x0, [x0, ___stack_chk_guard];momd # ^ - # /private/tmp/nix-build-sundials-6.2.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255]. + # /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255]. # ldr x0, [x0, ___stack_chk_guard];momd # # See also a proposed solution: https://github.com/NixOS/nixpkgs/pull/151983 diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 090b445a3a5c..559ef8d20700 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Vc"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "sha256-rh2vcn58xDsbxxABrxneCq6TKIyT51KxGB7sOtHpvYE="; + sha256 = "sha256-fv0FHAl0xvAFybR/jwhX2LkozwEDy1TNcbVAmRRnLVU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix index 5e918e8122fd..dea68ca153db 100644 --- a/pkgs/development/libraries/vtk/9.x.nix +++ b/pkgs/development/libraries/vtk/9.x.nix @@ -1,14 +1,5 @@ import ./generic.nix { - majorVersion = "9.0"; - minorVersion = "3"; - sourceSha256 = "vD65Ylsrjb/stgUqKrCR/JFAXeQzOw7GjzMjgVFU7Yo="; - - patchesToFetch = [ - # Add missing header includes. - # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611 - { - url = "https://gitlab.kitware.com/vtk/vtk/-/commit/e066c3f4fbbfe7470c6207db0fc3f3952db633cb.patch"; - sha256 = "ggmDisS3qoMquOqrmIYlCIT7TLxP/DUtW29ktjaEnlM="; - } - ]; + majorVersion = "9.1"; + minorVersion = "0"; + sourceSha256 = "sha256-j+1C9Pjx64CDEHto6qmtcdoHEQFhoxFq2Af0PlylzpY="; } diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 43c6ded8a5d0..467abeead3e3 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -1,7 +1,7 @@ { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch -, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools +, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv , enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given." # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpng libtiff ] - ++ optionals enableQt [ qtbase qtx11extras qttools ] + ++ optionals enableQt (if lib.versionOlder majorVersion "9" + then [ qtbase qtx11extras qttools ] + else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ]) ++ optionals stdenv.isLinux [ libGLU libGL diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 6991d3c8843a..c325ade26e5c 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "websocket++"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "zaphoyd"; repo = "websocketpp"; rev = version; - sha256 = "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy"; + sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM="; }; nativeBuildInputs = [ cmake ]; @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ revol-xut ]; }; } diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/development/libraries/wlroots/protocols.nix index 7fd0e40d0754..d2ff39d7d574 100644 --- a/pkgs/development/libraries/wlroots/protocols.nix +++ b/pkgs/development/libraries/wlroots/protocols.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - checkInputs = [ wayland-scanner ]; + nativeBuildInputs = [ wayland-scanner ]; patchPhase = '' substituteInPlace wlr-protocols.pc.in \ @@ -25,9 +25,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkPhase = '' - make check - ''; + checkTarget = "check"; installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index 692fdac22684..c07e71702ff3 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "protobuf"; - version = "3.21.4"; - sha256 = "sha256-vhfoUu63KhndfQTiITtTnaqFVF9OWMCaLf/9PUioKkQ="; + version = "3.21.5"; + sha256 = "sha256-B8ytFyUJ8fLBwHmaKXxfOy0h6tRELjqc5IxUUl/YU5w="; buildInputs = [ pcre2 ]; diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index f864dd35f1a8..cb560d88c7c1 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "0.5.4"; + version = "0.5.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pcGUl8mq1O1QY5EPkNhWRLCKDn2FWAF9XymXkUXWEUk="; + sha256 = "sha256-VCwIAeSAN4tMwB8TXN/ukrws0qYv/jHHeEu++m56AHA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix index d2964accc144..ee3413415232 100644 --- a/pkgs/development/python-modules/audioread/default.nix +++ b/pkgs/development/python-modules/audioread/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "audioread"; - version = "2.1.9"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089"; + sha256 = "sha256-EhmVvSB+sf2j1Wa+uFHTU0J1klvDWk+22gyxHeD3JRo="; }; # No tests, need to disable or py3k breaks diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index ef179d27f0bd..33d3dcf49918 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.14"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-K2x0Up3H6kIWcYeWvVegd1CkTjq8RoM0AOm0SX5u6wQ="; + hash = "sha256-MGLTFcsWVC/gTdgjny6LwyOO6QRc1QcLkVzy677Lqqw="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index 838572d064ee..1f5b2d9cbb48 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-administration"; - version = "4.1.0"; + version = "4.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-V8tppRExyvSt41nN+j2QoxGSund6RKvE4g5p6AWZ3qI="; + sha256 = "sha256-m5dkKUZoPkpUzSW1K39+wpIfWHc2oRyxMetOf/Ybzuc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index d9e37f1b8826..01d823ca8fd7 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.5.1"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-2ojnH+ySoU+1jOyIaKv366BAGI3Nzjac4QUK3RllhvY="; + hash = "sha256-D37DHSpOszn/nZavfysPW6O9KLXu4GGjjxt4hybJSa4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index a20d0c696cd6..4fda2f331f6d 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "batchgenerators"; - version = "0.21"; + version = "0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MIC-DKFZ"; repo = pname; rev = "v${version}"; - hash = "sha256-q8mBWcy+PkJcfiKtq8P2bnTw56FE1suVS0zUgUEmc5k="; + hash = "sha256-47jAeHMJPBk7GpUvXtQuJchgiSy6M50anftsuXWk2ag="; }; propagatedBuildInputs = [ @@ -37,26 +37,26 @@ buildPythonPackage rec { threadpoolctl ]; - checkInputs = [ - pytestCheckHook - ]; - - patches = [ - # Remove deprecated unittest2, https://github.com/MIC-DKFZ/batchgenerators/pull/78 - (fetchpatch { - name = "remove-unittest2.patch"; - url = "https://github.com/MIC-DKFZ/batchgenerators/commit/87a9437057df8a7550aa3b3eaf840871cc0d5cef.patch"; - sha256 = "sha256-vozBK7g2dLxx9din/R2vU28Mm+LoGAO/BmQlt/ShmEo="; - }) - ]; - + # see https://github.com/MIC-DKFZ/batchgenerators/pull/78 postPatch = '' substituteInPlace setup.py \ --replace '"unittest2",' "" ''; + checkInputs = [ + pytestCheckHook + ]; + + # see https://github.com/MIC-DKFZ/batchgenerators/pull/78 + disabledTestPaths = [ "tests/test_axis_mirroring.py" ]; + pythonImportsCheck = [ "batchgenerators" + "batchgenerators.augmentations" + "batchgenerators.dataloading" + "batchgenerators.datasets" + "batchgenerators.transforms" + "batchgenerators.utilities" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 88a0a4adea42..e59c8baa511f 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.9.5"; + version = "1.9.7"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "sha256-izjda65OYnwaPX30JqdCL5fFh5IW5eJeAIrP4l9I3kE="; + sha256 = "sha256-q8dnOSoN9Gu9yl/UJNRXeTBBKTnfJhHwqN6+QVTlexI="; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index f5352c5d2f6d..540bdd3aa4ec 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "1.7.1"; + version = "1.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-ql7j+m8g7ZgkgqJGUVE903n1b73kqWDExgSbnDpKQwc="; + hash = "sha256-qRUS+JJWd2MPXa5Bs2WzZIHk6VcPe75yBoArFGk2yHQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/configclass/default.nix b/pkgs/development/python-modules/configclass/default.nix new file mode 100644 index 000000000000..9856be48ac3d --- /dev/null +++ b/pkgs/development/python-modules/configclass/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchPypi +, buildPythonPackage +, mergedict +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "configclass"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-aoDKBuDxJCeXbVwCXhse6FCbDDM30/Xa8p9qRvDkWBk="; + }; + + propagatedBuildInputs = [ mergedict ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "configclass" ]; + + meta = with lib; { + description = "A Python to class to hold configuration values"; + homepage = "https://github.com/schettino72/configclass/"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/doit-py/default.nix b/pkgs/development/python-modules/doit-py/default.nix new file mode 100644 index 000000000000..33d128c3d765 --- /dev/null +++ b/pkgs/development/python-modules/doit-py/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, doit +, configclass +, mergedict +, pytestCheckHook +, hunspell +, hunspellDicts +}: + +buildPythonPackage rec { + pname = "doit-py"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "pydoit"; + repo = pname; + rev = version; + sha256 = "sha256-DBl6/no04ZGRHHmN9gkEtBmAMgmyZWcfPCcFz0uxAv4="; + }; + + propagatedBuildInputs = [ + configclass + doit + mergedict + ]; + + checkInputs = [ + hunspell + hunspellDicts.en_US + pytestCheckHook + ]; + + disabledTestPaths = [ + # Disable linting checks + "tests/test_pyflakes.py" + ]; + + pythonImportsCheck = [ "doitpy" ]; + + meta = with lib; { + description = "doit tasks for python stuff"; + homepage = "http://pythonhosted.org/doit-py"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index 2ade1982ec27..cfb36b7daf4a 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -10,9 +10,13 @@ , pyinotify , macfsevents , toml +, doit-py +, pyflakes +, configclass +, mergedict }: -buildPythonPackage rec { +let doit = buildPythonPackage rec { pname = "doit"; version = "0.36.0"; @@ -30,16 +34,25 @@ buildPythonPackage rec { ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; - # hangs on darwin - doCheck = !stdenv.isDarwin; - - checkInputs = [ mock pytestCheckHook ]; - - disabledTests = [ - # depends on doit-py, which has a circular dependency on doit - "test___main__.py" + checkInputs = [ + configclass + doit-py + mergedict + mock + pyflakes + pytestCheckHook ]; + # escape infinite recursion with doit-py + doCheck = false; + + passthru.tests = { + # hangs on darwin + check = doit.overridePythonAttrs (_: { doCheck = !stdenv.isDarwin; }); + }; + + pythonImportsCheck = [ "doit" ]; + meta = with lib; { homepage = "https://pydoit.org/"; description = "A task management & automation tool"; @@ -53,4 +66,5 @@ buildPythonPackage rec { ''; maintainers = with maintainers; [ pSub ]; }; -} + +}; in doit diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 275d9aa6ef2c..896b50416db1 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.8.1"; + version = "2.8.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1a283fe8a3569c3feab4605e8279929d75c85c1151b2fd627f95b1863b5fc6c2"; + sha256 = "sha256-ij7GG7jHL6x/degRqW4815QqyJyrVasWVJ1tLOnN6qU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 137f034d51a0..1ca0c2046568 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.7.3"; + version = "4.7.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-79113cUVl07oeXjlDaqfdfwNZvD7EWJK8JKHsPnBRG8="; + hash = "sha256-Oarmdc2PuE4kQ/qUqQhuzdTpIrrMFCK72CrVmoSH1DI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index f4551b65bd3b..cbb12c054e4b 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.15.3"; + version = "2.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-WKnjSlKtMGpWKPbPr7hpS6Dg0+9i/nWVYmar0N3Q9Pc="; + sha256 = "sha256-Gojayel/xQ5gRI0nbwsroeSMdRndjb+8EniX1Qs4nbg="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 6a7f51e81fe6..a75e1b4a435c 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "Flask-Caching"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MwDvzNo1nWnODmgkuQy1cf+JWjkHwxJmwDQsykvEA0A="; + sha256 = "sha256-EN8gCgPwMq9gB3vv5Bd53ZSJi2fIIEDTTochC3G6Jjg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 35216c6c03aa..7af6ea692cae 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -44,12 +44,12 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "4.1.4"; + version = "4.1.5"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "sha256-j6My1CD+GY2InHlN0IXPcNqfq+ytdoDD3y+5s2o3WRI="; + sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 32b5dd747dda..1d4326f74ee3 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -2,6 +2,7 @@ , glibcLocales , buildPythonPackage , fetchPypi +, setuptools , six , appdirs , scandir ? null @@ -32,7 +33,7 @@ buildPythonPackage rec { # strong cycle with paramaterized doCheck = false; checkInputs = [ pyftpdlib mock psutil pytestCheckHook ]; - propagatedBuildInputs = [ six appdirs pytz ] + propagatedBuildInputs = [ six appdirs pytz setuptools ] ++ lib.optionals (!isPy3k) [ backports_os ] ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ] diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index da01f970df32..c939217ccd09 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,23 +17,21 @@ , psutil , pyarrow , pytest-xdist +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.2.0"; + version = "3.3.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-l/tDBuMky4aQnOMqmUToHSH7yyingMXN8BtuTUfUwyI="; + hash = "sha256-S2gYVMAaQnK4AmHd8biofYAvxVmM7UTc/HuDPLAsDhg="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'pyarrow >= 3.0.0, < 9.0dev' 'pyarrow >= 3.0.0, < 10.0dev' - ''; - propagatedBuildInputs = [ google-cloud-core google-cloud-bigquery-storage diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 1a3a31d7d717..99964db9806e 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.14.0"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-iJ3fvbQBIk2fpCfz9/uvxk6WcGaL8OVDsNQux+pTBhM="; + hash = "sha256-gAhrhHTPwNipAFS22GXKjeVXqx0AGorvsqqEWKwRLzA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hpccm/default.nix b/pkgs/development/python-modules/hpccm/default.nix index b0c26bae9734..74372f57641e 100644 --- a/pkgs/development/python-modules/hpccm/default.nix +++ b/pkgs/development/python-modules/hpccm/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "hpccm"; - version = "22.5.0"; + version = "22.8.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "hpc-container-maker"; rev = "v${version}"; - sha256 = "sha256-zR5+X9BKaUvLPQ05FnfU817esgxVqP8n+wfdWy20BN4="; + sha256 = "sha256-nq1zixIu/Kv2CtkQX1Sw7Q3BsOZKcCJjV0+uroXPEBs="; }; propagatedBuildInputs = [ six archspec ]; diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 856ee981e380..da52d12ef08e 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.41.6"; + version = "0.41.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "v${version}"; - hash = "sha256-t5t+tZwhzOHpI2nc69baWtZamEOeouseMuVBnCQyjzQ="; + hash = "sha256-lz08+T8ITsCI0qjcd/JcgXG4o87UjoP1NQa01FJ7fO0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 74515e1c1396..199f467fbbca 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , poetry-core @@ -9,14 +10,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.11.0"; + version = "0.13.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; - rev = "v${version}"; - hash = "sha256-QbKqS40la6UGZENyGEw5kXigzexp3q7ff43fKlQ9GqE="; + rev = "refs/tags/v${version}"; + hash = "sha256-u08lxVMuyO5CwFbmxn69QqdSWcvGaSMZgizRJlsHa0k="; }; nativeBuildInputs = [ @@ -30,10 +31,15 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_test.py" ]; + + pythonImportsCheck = [ "libtmux" ]; + meta = with lib; { - description = "Scripting library for tmux"; - homepage = "https://libtmux.readthedocs.io/"; - license = licenses.bsd3; + description = "Typed scripting library / ORM / API wrapper for tmux"; + homepage = "https://libtmux.git-pull.com/"; + changelog = "https://github.com/tmux-python/libtmux/raw/v${version}/CHANGES"; + license = licenses.mit; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mergedict/default.nix b/pkgs/development/python-modules/mergedict/default.nix new file mode 100644 index 000000000000..b1ed82f5348f --- /dev/null +++ b/pkgs/development/python-modules/mergedict/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mergedict"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-4ZkrNqVCKQFPvLx6nIwo0fSuEx6h2NNFyTlz+fDcb9w="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "mergedict" ]; + + meta = with lib; { + description = "A Python dict with a merge() method"; + homepage = "https://github.com/schettino72/mergedict"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix new file mode 100644 index 000000000000..74ccf0b1868e --- /dev/null +++ b/pkgs/development/python-modules/monai/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, ninja +, ignite +, numpy +, pybind11 +, pytorch +, which +}: + +buildPythonPackage rec { + pname = "monai"; + version = "0.9.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Project-MONAI"; + repo = "MONAI"; + rev = version; + sha256 = "sha256-HxW9WYxt2a7fS9/1E9DtiH+SCTTJoxYBfgZqskYdcvI="; + }; + + # Ninja is not detected by setuptools for some reason even though it's present: + postPatch = '' + substituteInPlace "setup.cfg" --replace "ninja" "" + ''; + + preBuild = '' + export MAX_JOBS=$NIX_BUILD_CORES; + ''; + + nativeBuildInputs = [ ninja which ]; + buildInputs = [ pybind11 ]; + propagatedBuildInputs = [ numpy pytorch ignite ]; + + BUILD_MONAI = 1; + + doCheck = false; # takes too long; numerous dependencies, some not in Nixpkgs + + pythonImportsCheck = [ + "monai" + "monai.apps" + "monai.data" + "monai.engines" + "monai.handlers" + "monai.inferers" + "monai.losses" + "monai.metrics" + "monai.optimizers" + "monai.networks" + "monai.transforms" + "monai.utils" + "monai.visualize" + ]; + + meta = with lib; { + description = "Pytorch framework (based on Ignite) for deep learning in medical imaging"; + homepage = "https://github.com/Project-MONAI/MONAI"; + license = licenses.asl20; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 23e0f0bc0f9a..6c80ab10f745 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , fetchurl @@ -59,7 +60,7 @@ buildPythonPackage { patches = [ (substituteAll { src = ./libpq.patch; - libpq = "${postgresql.lib}/lib/libpq.so"; + libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index f839dc4df312..d32a4a1ca3a1 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome }: +{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome, python }: buildPythonPackage rec { pname = "pyatspi"; @@ -17,6 +17,16 @@ buildPythonPackage rec { pygobject3 ]; + configureFlags = [ + "PYTHON=${python.pythonForBuild.interpreter}" + ]; + + postPatch = '' + # useless python existence check for us + substituteInPlace configure \ + --replace '&& ! which' '&& false' + ''; + disabled = !isPy3k; passthru = { diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index 2ae89bf43f07..b87e5d568fa2 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "PyPDF2"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bPGMp9D3fhMG1I/NClc5BhbsZUV5a16zJaIJQ6VQHRg="; + sha256 = "sha256-smB4IGIhxkEeyXpaXAiXWuebp+xGdXXRFHepnM5gHrk="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index ed37b4dde36e..0258e3c8b517 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.18.6"; + version = "0.18.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-4mVKs3Lycb9DVdFcG1gzM4FjJiQTcV7aT/OLpBacZjU="; + hash = "sha256-TAFrrCwlcbKoQk6puoSx2sk1WeucThf7614RNQ1NFbM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 70c3422a3d97..3f18bd09aa45 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -44,7 +43,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Module with file-system utilities"; homepage = "https://github.com/fabiocaccamo/python-fsutil"; license = licenses.mit; diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 1c1ea480cd40..9519a2c61a94 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "readme-renderer"; - version = "35.0"; + version = "36.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "readme_renderer"; inherit version; - sha256 = "sha256-pyeZms/CIvwh2CoS7UjJV8SYl4XlhlgHxlpIfSFndJc="; + sha256 = "sha256-9xru+aWI/L7R9MwAG6YRNw6UoM0nx1sRQFN2GOx48KI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 168915a4caf1..36e7ca24fbdb 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -9,6 +9,12 @@ , pygments , typing-extensions , pytestCheckHook + +# for passthru.tests +, enrich +, httpie +, rich-rst +, textual }: buildPythonPackage rec { @@ -46,6 +52,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "rich" ]; + passthru.tests = { + inherit enrich httpie rich-rst textual; + }; + meta = with lib; { description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"; homepage = "https://github.com/Textualize/rich"; diff --git a/pkgs/development/python-modules/rnginline/default.nix b/pkgs/development/python-modules/rnginline/default.nix index 9c4b6ad358e8..a64c035dbc95 100644 --- a/pkgs/development/python-modules/rnginline/default.nix +++ b/pkgs/development/python-modules/rnginline/default.nix @@ -1,4 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage, lxml, docopt, six, pytestCheckHook, mock }: +{ lib +, fetchPypi +, buildPythonPackage +, lxml +, docopt +, six +, pytestCheckHook +, mock +, fetchpatch +}: buildPythonPackage rec { pname = "rnginline"; @@ -9,20 +18,33 @@ buildPythonPackage rec { sha256 = "sha256-j4W4zwHA4yA6iAFVa/LDKp00eeCX3PbmWkjd2LSUGfk="; }; - propagatedBuildInputs = [ lxml docopt six ]; - - checkInputs = [ pytestCheckHook mock ]; - - # Those tests does not succeed, a test dependency is likely missing but nothing is specified upstream - disabledTestPaths = [ - "rnginline/test/test_cmdline.py" - "rnginline/test/test_rnginline.py" + patches = [ + # Fix failing tests. Should be included in releases after 0.0.2 + # https://github.com/h4l/rnginline/issues/3 + (fetchpatch { + url = "https://github.com/h4l/rnginline/commit/b1d1c8cda2a17d46627309950f2442021749c07e.patch"; + sha256 = "sha256-XbisEwun2wPOp7eqW2YDVdayJ4sjAMG/ezFwgoCKe9o="; + name = "fix_tests_failing_collect.patch"; + }) ]; - meta = { + propagatedBuildInputs = [ + docopt + lxml + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "rnginline" ]; + + meta = with lib; { description = "A Python library and command-line tool for loading multi-file RELAX NG schemas from arbitary URLs, and flattening them into a single RELAX NG schema"; homepage = "https://github.com/h4l/rnginline"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.lesuisse ]; + license = licenses.asl20; + maintainers = with maintainers; [ lesuisse ]; }; } diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index 2c85c15ebdd3..3a0b523784a3 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "threadpoolctl"; - version = "3.0.0"; + version = "3.1.0"; disabled = pythonOlder "3.6"; format = "flit"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joblib"; repo = pname; rev = version; - sha256 = "02zccsiq4gvawy7q2fh3m3hvr40hl2ylmwwny6dv0lqsr2iwgnmn"; + sha256 = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; }; checkInputs = [ pytestCheckHook numpy scipy ]; diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix new file mode 100644 index 000000000000..8e4b378244f5 --- /dev/null +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, cheroot +, colorama +, fetchFromGitHub +, fsspec +, httpx +, pytestCheckHook +, python-dateutil +, pythonOlder +, setuptools-scm +, wsgidav +}: + +buildPythonPackage rec { + pname = "webdav4"; + version = "0.9.7"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "skshetry"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7v4dcwbTCGiEMkAQHtH9+zQj745dI0QqoEqdxRYRuO4="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + httpx + python-dateutil + ]; + + checkInputs = [ + cheroot + colorama + pytestCheckHook + wsgidav + ] ++ passthru.optional-dependencies.fsspec; + + passthru.optional-dependencies = { + fsspec = [ + fsspec + ]; + http2 = [ + httpx.optional-dependencies.http2 + ]; + all = [ + fsspec + httpx.optional-dependencies.http2 + ]; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov" "" + ''; + + pythonImportsCheck = [ + "webdav4" + ]; + + disabledTests = [ + # ValueError: Invalid dir_browser htdocs_path + "test_retry_reconnect_on_failure" + "test_open" + "test_open_binary" + "test_close_connection_if_nothing_is_read" + ]; + + disabledTestPaths = [ + # Tests requires network access + "tests/test_client.py" + "tests/test_fsspec.py" + ]; + + meta = with lib; { + description = "Library for interacting with WebDAV"; + homepage = "https://skshetry.github.io/webdav4/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix new file mode 100644 index 000000000000..882f4091040f --- /dev/null +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, cheroot +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, defusedxml +, jinja2 +, json5 +, python-pam +, pyyaml +, requests +, webtest +}: + +buildPythonPackage rec { + pname = "wsgidav"; + version = "4.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mar10"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LQdS9d2DB4PXqRSzmtZCSyCQI47ncLCG+RSB+goZYoA="; + }; + + propagatedBuildInputs = [ + defusedxml + jinja2 + json5 + python-pam + pyyaml + ]; + + checkInputs = [ + cheroot + pytestCheckHook + requests + webtest + ]; + + pythonImportsCheck = [ + "wsgidav" + ]; + + meta = with lib; { + description = "Generic and extendable WebDAV server based on WSGI"; + homepage = "https://wsgidav.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 43cf5d59f81f..ebcb22aa338a 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.49.0"; + version = "0.49.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - sha256 = "sha256-mCqRqi7AUsrvfSOHyfK+WVj/4D7/4RDOYFWveS+tS/A="; + sha256 = "sha256-ai0qWKgsh8kIS4juvzpE+amsnIbEOJbhGutV75yRGog="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index a85de41c2493..2c2f0f6053eb 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.18.1"; + version = "2.19.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-6psHHmU9TN0iugmPErdeLHevm+T2/3IJIp7kMdUSFd8="; + sha256 = "sha256-WjyCU9z+szSeGbnsTTZGq8UFUpmrMPW+pTZPMk1ZC+s="; }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock index 7fb375b76721..9a4aa06c1e55 100644 --- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - brakeman (5.2.3) + brakeman (5.3.1) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.3.9 + 2.3.20 diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix index f401d4ad1599..523721979860 100644 --- a/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m188ypcl2lb1hin21fmyk9d4fbjw4w7cr2k6l37jasw3rmgnvjv"; + sha256 = "0zr2p0w4ckv65cv3vdwnk9f3yydmjdmw75x7dskx1gqr9j9q3306"; type = "gem"; }; - version = "5.2.3"; + version = "5.3.1"; }; } diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index b3cbf9329b86..59ea3f5b15e6 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "avro-tools"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "sha256-XnfvND5WPojzIS8t0ntwn+3+Zjz9ABEUK2FO6aD4ulw="; + sha256 = "sha256-uVTnWXbCS3JQkHWxopixhNue/ihzvukJ0CNDL5gm24g="; }; dontUnpack = true; diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 7c96448dd920..230dd7b47b3d 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.16.2"; + version = "0.16.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dikjYEY6jrK9dUXM+z378SIWgI4jYd9vLsf1nQ5rUwg="; + sha256 = "sha256-TiXP7ftzQ3yWWfTDqfO33Fuk0XlgVwgt1+tZqSr6mJQ="; }; - vendorSha256 = "sha256-DhFwTh7Bm2mPwXFBiYFylYKqWWcSm5/Cv2tXOJsPqm4="; + vendorSha256 = "sha256-YsnqasRywNtJLq0noUpil9k2AILXJz//+aYoy/tlRIo="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index de0e154b51f0..59af3340bad7 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.83.0"; + version = "0.84.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ud4kdnKesn98CYIsB6S5FjJ3yOT3axTcVlrGroMNDPE="; + sha256 = "sha256-14S0Y1ax0bg7nD4iCEujwLIZSjpWYaLWidpYVwQB0dw="; }; vendorSha256 = "sha256-XVGFJv9TYjuwVubTcFVI2b+M2ZDE1Jv4u/dxowcLL2s="; diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm/default.nix index 3fc916f9082d..37dc222707b0 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "cpm"; - version = "0.35.4"; + version = "0.35.5"; src = fetchurl { url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; - sha256 = "sha256-Ve+NhDAiAzH4x3ZUZjQkuZ69n65ljGc2h6cR62xnf+0="; + sha256 = "sha256-JWfIptbRExSQQvcxx2bS1k5cudPpQPdyj90aZdbcROk="; }; dontUnpack = true; diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index 12fc1aa0a965..6b5924f85027 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ytn7fG84Wu4+fcgkV5B9djCw8KgAJWgffoNbV7wveK4="; + sha256 = "sha256-NzHg/pn0Gek3JhcdOBFilmmw0xaKtjTote11LLr4oj8="; }; vendorSha256 = "sha256-ZsuDaFcBPZuyt5rmjeBkzkrphCCcraLZCrMiQ2FtAUc="; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index a52fdcbd5f34..0f0ece235c7a 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "1.4.9"; + version = "1.5.0"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I/4o9hynmB9Bj3WDgrNesy9noUgtV8pMOcSaA2EsX2o="; + sha256 = "sha256-j4z9Ldufrc1LiO1OgcBrAW17n9sXzJ2930uawdw07Pk="; }; vendorSha256 = "sha256-N4zAdylb7etNknR0/VjIVkuI6kTWlk137HNT03Y2gWs="; diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 42c2a55fd3eb..5449e646546d 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timescaledb-parallel-copy"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "0r8c78l8vg7l24c3vzs2qr2prfjpagvdkp95fh9gyz76nvik29ba"; + sha256 = "sha256-HxaGKJnLZjPPJXoccAx0XUsCrZiG09c40zeSbHYXm04="; }; - vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b"; + vendorSha256 = "sha256-muxtr80EjnRoHG/TCEQwrBwlnARsfqWoYlR0HavMe6U="; meta = with lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 28b0506ff180..195a5b8b18e2 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YZMjgEnZKxmGIO9gK00JXBpBRvNgZoXNA/cNieovT+g="; + sha256 = "sha256-sCwMLVp4MCTJ5ZgALDs+of+upYMQeHz3xRk4YD2g23M="; }; vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; diff --git a/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff b/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff deleted file mode 100644 index 3a0110476cce..000000000000 --- a/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pkg/pgtune/misc.go b/pkg/pgtune/misc.go -index 1fceb6e..3e76be5 100644 ---- a/pkg/pgtune/misc.go -+++ b/pkg/pgtune/misc.go -@@ -35,7 +35,7 @@ const ( - // If you want to lower this value, consider that Patroni will not accept anything less than 25 as - // a valid max_connections and will replace it with 100, per - // https://github.com/zalando/patroni/blob/00cc62726d6df25d31f9b0baa082c83cd3f7bef9/patroni/postgresql/config.py#L280 -- minMaxConns = 25 -+ minMaxConns = 20 - ) - - // MaxConnectionsDefault is the recommended default value for max_connections. diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index b95a58470fce..e815e2157ec1 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.15.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-ZQRU3UlUkvTgbRMGg+BVNy+0BSUYGYUysgZ69YTeqiA="; + sha256 = "sha256-VYW3XQvwxeUnfNMXFcqB6xhh45YgTv4Iu6ce6MEclpw="; }; vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 48ed8b337760..8f076fe40c04 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-bxGJvvm9gGkjUA+JCpX2V0Bj35a5WJ1M/JPxa1/2gbk="; + sha256 = "sha256-ouL3qxBzhsQYXTHTeNM3Ezxo72XY9KwTXNYPlLUr4nU="; }; - vendorSha256 = "sha256-DVVAbtfwndwc37iqxCB9Tsscinr8A8Kl//s9X+EFPcw="; + vendorSha256 = "sha256-1db3Ar3UtHS/MkhiaLt7wHuCCg8qGGL7jOHZXh1TywI="; meta = with lib; { description = diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index cc40249e7ccd..54fd9bca92f9 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-rLebv1lw1zaq401dPK4GbisYkES3/5lIiReTBPvgoJo="; + sha256 = "sha256-fHZtJSxPA2OVNuJalRblsZFCCaYe5pXq0oQG1t6vqt0="; }; - cargoSha256 = "sha256-o1wnweT+wvZNnOT3ZNMJGuiZm7pkhZLssUuIfYeWnBc="; + cargoSha256 = "sha256-yExKz1ckqIaN3fvX6/AJgq1ScDHF1bkYKeoiodFSK0o="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix new file mode 100644 index 000000000000..d352622d53b4 --- /dev/null +++ b/pkgs/development/tools/memray/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchFromGitHub +, libunwind +, lz4 +, pkg-config +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "memray"; + version = "1.2.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bloomberg"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MZOKo0VaCJM/YyvCByM5Yg7H/8onDKNSufBzr+GsFlo="; + }; + + buildInputs = [ + libunwind + lz4 + pkg-config + ] ++ (with python3.pkgs; [ + cython + ]); + + propagatedBuildInputs = with python3.pkgs; [ + jinja2 + rich + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "memray" + ]; + + pytestFlagsArray = [ + "tests" + ]; + + disabledTests = [ + # Import issue + "test_header_allocator" + ]; + + disabledTestPaths = [ + # Very time-consuming and some tests fails (performance-related?) + "tests/integration/test_main.py" + ]; + + meta = with lib; { + description = "Memory profiler for Python"; + homepage = "https://bloomberg.github.io/memray/"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 19984886207c..a03f887a962f 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,30 +2,21 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.17142"; + version = "0.1.20397"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-69GGJfnOHry+N3hKZapKz6eFSerqIHt4wRAhm/q/SOQ="; + sha256 = "sha256-2z5xax9RmBWYV7xNGNZQJKdPY5pUdcFCU+cQoGamvVk="; }; - vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U="; + vendorSha256 = "sha256-EswzTlvFbFZK76cl0TKxIcr8Qa7/RcQCvvw+Si323Hs="; doCheck = false; ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; - preBuild = '' - substituteInPlace data/data.go \ - --replace 'packr.New("circleci-cli-box", "../_data")' 'packr.New("circleci-cli-box", "${placeholder "out"}/share/circleci-cli")' - ''; - - postInstall = '' - install -Dm644 -t $out/share/circleci-cli _data/data.yml - ''; - meta = with lib; { # Box blurb edited from the AUR package circleci-cli description = '' diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix index 22703a4afc38..e5a26b75aa03 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-m7xV5sQZnRytT3QY1a9qihZV0Ub6zKjfDytZ+TDwdFg="; + sha256 = "sha256-SeVLQ05vPywSOnOEhJhQXYhdptmIhvYbbf9SX5eVzik="; }; - cargoSha256 = "sha256-993XWYSUC2KuV2/dgTYAatoy5lGIveT3lL7eOYsbCig="; + cargoSha256 = "sha256-jp84LqFuK6Du2mWmgvadD7p8n/zcLKAKBOMQiERTKBI="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b915cdb65ced..2108ba284040 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -15,8 +15,8 @@ let sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; }; "cppo" = fetchurl { - url = "https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz"; - sha256 = "17ajdzrnmnyfig3s6hinb56mcmhywbssxhsq32dz0v90dhz3wmfv"; + url = "https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz"; + sha256 = "0lxy4xkkkwgs1cj6d9lyzsqi9f6fc9r6cir5imi7yjqrpd86s1by"; }; "cudf" = fetchurl { url = "https://github.com/ocaml/opam-source-archives/raw/main/cudf-0.9.tar.gz"; @@ -27,8 +27,8 @@ let sha256 = "1mh6fv8qbf8xx4h2dc0dpv2lzygvikzjhw1idrknibbwsjw3jg9c"; }; "dune-local" = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/2.9.0/dune-2.9.0.tbz"; - sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; + url = "https://github.com/ocaml/dune/releases/download/2.9.1/dune-2.9.1.tbz"; + sha256 = "09lzq04b642iy0ljp59p32lgk3q8iphjh8fkdp69q29l5frgwx5k"; }; "extlib" = fetchurl { url = "https://ygrek.org/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; @@ -47,12 +47,12 @@ let sha256 = "10wma4hh9l8hk49rl8nql6ixsvlz3163gcxspay5fwrpbg51fmxr"; }; "opam-file-format" = fetchurl { - url = "https://github.com/ocaml/opam-file-format/archive/2.1.3.tar.gz"; - sha256 = "1bqyrlsvmjf4gqzmzbiyja9m1ph30ic9i18x23p5ziymyylw2sfg"; + url = "https://github.com/ocaml/opam-file-format/archive/2.1.4.tar.gz"; + sha256 = "0xbdlpxb0348pbwijna2x6nbi8fcxdh63cwrznn4q4zzbv9zsy02"; }; "re" = fetchurl { - url = "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz"; - sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj"; + url = "https://github.com/ocaml/ocaml-re/releases/download/1.10.3/re-1.10.3.tbz"; + sha256 = "1fqfg609996bgxr14yyfxhvl6hm9c1j0mm2xjdjigqrzgyb4crc4"; }; "result" = fetchurl { url = "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz"; @@ -67,13 +67,13 @@ let sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.1.2.zip"; - sha256 = "0yq3dgx869016xrf65xv0glmqill1nk2ad12x3l36l70pn90rmyd"; + url = "https://github.com/ocaml/opam/archive/2.1.3.zip"; + sha256 = "08n72n5wc476p28ypxjs8fmlvcb42129fcva753gqm0xicqh24xf"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.1.2"; + version = "2.1.3"; nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -83,7 +83,7 @@ in stdenv.mkDerivation { postUnpack = '' ln -sv ${srcs."0install-solver"} $sourceRoot/src_ext/0install-solver.tbz ln -sv ${srcs."cmdliner"} $sourceRoot/src_ext/cmdliner.tbz - ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tbz + ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tar.gz ln -sv ${srcs."cudf"} $sourceRoot/src_ext/cudf.tar.gz ln -sv ${srcs."dose3"} $sourceRoot/src_ext/dose3.tar.gz ln -sv ${srcs."dune-local"} $sourceRoot/src_ext/dune-local.tbz @@ -133,4 +133,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.1.2 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.1.3 -p opam-shebangs.patch diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 0caa77e2bfd8..5a47ce48268e 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -5,6 +5,7 @@ , pkg-config , SystemConfiguration , Security +, CoreFoundation , curl , libiconv , openssl @@ -13,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.23.2"; + version = "0.23.3"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-q/GbEsGQip7+wXxbVFfm9l3tdCT2o4yhWVTY1qmnEic="; + sha256 = "sha256-wMF2uF6h06c/vBBXr2IGk/9RsOxnxvffEtIOR+s+iVk="; }; - cargoSha256 = "sha256-pqOVKLh+ovUy+rJIz0tjp56qhilZTno4t4dZyCY1r7c="; + cargoSha256 = "sha256-UF0bEV77IqGBmqGCqg2cHzom7JDRqlLpoSxbNQsKKiY="; preCheck = '' export HOME=$(mktemp -d) @@ -32,7 +33,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; checkInputs = [ git ]; diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 2fe692d74f6f..5b6014bc2ea2 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.33"; + version = "0.9.34"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-RWlpco03YKlYv9QaGaySudBUG+rZaKURdgMeqFwrq1E="; + sha256 = "sha256-lGsQcOK/sm6/EEgB/o/zVWJfjIUppH08s/gwqejzS+U="; }; - cargoSha256 = "sha256-azT4enQOdj2/rznU3fA8tr+4a/mRLj/HNsyDNRYLonM="; + cargoSha256 = "sha256-lj8spttijptuC1y3MfKBAQ3SAKW3D5tOmI8+1+wsWE0="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index e58c741d2c71..2e058b8a204a 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.12.4"; + version = "0.13.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-URCKsI7q0/b8KkCooKeYr342m7C8ukJJITRDgOUmcEM="; + sha256 = "sha256-e+HM4pO0bLszlcSklsiRPamr/GUVckuw7uBSgDSK7d0="; }; - cargoSha256 = "sha256-qXJeNbGvC6zoxdn2QmApw1m7gn4CI1eUC3Cqhrn8dpU="; + cargoSha256 = "sha256-RKO/YMVWKVtparAfDUtpQ3mbRWataNnjnFUUQozQghs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 0be6e6c7bb6e..4aa6dd211f70 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -1,18 +1,18 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: buildGoModule rec { pname = "sq"; - version = "0.15.4"; + version = "0.15.6"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4CINLOHUVXQ+4e5I1fMqog6LubMm8RnbFmeuBOwALaw="; + sha256 = "sha256-QEg80di2DmMfIrvsRFp7nELs7LiJRVa/wENDnf1zQ2Y="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-lNpWXKtnzwySzinNPxAKuaLqweWuS6zz8s2W4xXWlqM="; + vendorSha256 = "sha256-P1NxcjRA0g9NK2EaEG5E9G2TywTp5uvHesQE7+EG4ag="; # Some tests violates sandbox constraints. doCheck = false; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 7ac62a9e7852..05ea0d2e03e6 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "1.1"; + version = "1.2"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "sha256-wnXvK1OYd6FxJuZai5a0Mvz4gWpjlhLgGrcKlvn2lbs="; + sha256 = "sha256-mVYR8THGGfaTsx3aaSbQBxExRo87K47SD+PU5cZ8z58="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index bfb30cb1e896..84506906b6c6 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uftrace"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "sha256-uRtMJIZJKGQTGqs8QX60FCeXg3j5hv/V/qw4m8eGYD4="; + sha256 = "sha256-YjeZGjSctnhbHqWikdVhiEl0hr/qrA4S4JbCJscXe7A="; }; postUnpack = '' diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 27e702881282..d74d4ad422e8 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.28"; + version = "1.0.29"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-nNR2r8jiS0XKru6IdSeTDeCp1izO0xORiupJRa+fhHY="; + sha256 = "sha256-7Kh8kCwdSZX7E2s7UWptQHabYCVZG4luMiB1RJ72hQc="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 4c8941e973cf..1fd0284784c6 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.81"; + version = "0.2.82"; src = fetchCrate { inherit pname version; - sha256 = "sha256-DUcY22b9+PD6RD53CwcoB+ynGulYTEYjkkonDNeLbGM="; + sha256 = "sha256-BQ8v3rCLUvyCCdxo5U+NHh30l9Jwvk9Sz8YQv6fa0SU="; }; - cargoSha256 = "sha256-mfVQ6rSzCgwYrN9WwydEpkm6k0E3302Kfs/LaGzRSHE="; + cargoSha256 = "sha256-mP85+qi2KA0GieaBzbrQOBqYxBZNRJipvd2brCRGyOM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 92de17fe00a8..5ecb5c5b9469 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.370"; + version = "0.0.372"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-Med1B6E6e1oLkpaL8aNtT/qoHZtkCOwSRVkVQRPNRpI="; + sha256 = "sha256-KsSaBzAjiexyhUmYEFEHhWuRROt553Lhkm1idlT8n5s="; }; - vendorSha256 = "sha256-CloCB7El/fSlBXVzBstm1wgMEobBNKPIQJCilS/PhX8="; + vendorSha256 = "sha256-E6QeWu88MXMMfZAM7vMIGXpJQuduX6GTj3tXvlE9hFo="; subPackages = [ "." ]; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index ed6b2deda509..4bc2e24329ea 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -132,12 +132,14 @@ let }; v5 = { - version = "5.5.1"; - sha256 = "sha256-ssaDy6tYxhXGZ1+05J5DwoKYnfhKIKtZj66DOV84WxA="; - dataSha256 = "sha256-SI6I1wXbB0CgTmIemm3VY9DNnWMoI5bt/hqRwHlUl4k="; + version = "5.6.0"; + sha256 = "sha256-wcbYcVHs4L0etOwUBjKvzsmZtnpOxpFgLV8nx3UfJQI="; + dataSha256 = "sha256-TVaDHYstFEuT0nBExwLE1PtM1CZh71t9CRxC9rEYTd4="; }; + mkClient = version: generic (version // { buildClient = true; buildServer = false; }); + mkServer = version: generic (version // { buildClient = false; buildServer = true; }); in { - minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; }); - minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; }); + minetestclient_5 = mkClient v5; + minetestserver_5 = mkServer v5; } diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 8f2398255a41..c8c67e94b4a4 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt - version = "0.20211102.0"; + version = "0.20220601.1"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "sha256-/ve4oVxKQ4uTaTiTg8Qc0Kyb4GRJKGZ5SQVLIyeJSpI="; + sha256 = "sha256-uYauNtbUlvrnATGks7hWy1zt4Y7AEeADrCr1eVylPbY="; name = "scout-runtime-${version}.tar.gz"; }; diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index f523727d0211..9531324b14a9 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -17,17 +17,16 @@ let , platformCanUseHDCPBlob ? false # set this to true if the platform is able to use hdcp.bin , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.7" , ... } @ args: # delete hdcp.bin if either: the platform is thought to # not need it or unfreeIncludeHDCPBlob is false let deleteHDCPBlobBeforeBuild = !platformCanUseHDCPBlob || !unfreeIncludeHDCPBlob; in - stdenv.mkDerivation ({ + stdenv.mkDerivation (rec { pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}"; - inherit version; + version = "2.7"; src = fetchFromGitHub { owner = "ARM-software"; diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 86a873e06368..abe6f44f31a9 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20220620"; + version = "20220812"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-kVmhwJWm5ExspjBsUIC/4qe83iXo3Bbwb1+HTXcyyxo="; + sha256 = "sha256-O/aPuX2UcU+QdjzK2BDfjcX3/pwfmjZSQ2SR/XVBWr8="; }; # For pod2man during the build process. diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 1b95067bab5e..bcccd20cd6f0 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pam_u2f"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-IwPm+Zsf3o7jw6sopN4tpt3SJclTaT6EXWstg4giH7M="; + sha256 = "sha256-cOdBvKGXtktPvo3R9tV84ritWMp4Y1LFJfPy1EEliUw="; }; nativeBuildInputs = [ pkg-config ]; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://developers.yubico.com/pam-u2f/"; description = "A PAM module for allowing authentication with a U2F device"; + changelog = "https://github.com/Yubico/pam-u2f/raw/pam_u2f-${version}/NEWS"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ philandstuff ]; diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 4cf3e1f7dd1b..e2f0fe59a075 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "psmisc"; - version = "23.4"; + version = "23.5"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-s7omgtsNooYqhr4JUTZ6WCtPaZVC1ujJGz6KxUBWIs8="; + sha256 = "sha256-02jvRPqN8DS30ID42hQFu400NoFC5QiH5YA3NB+EoFI="; }; nativeBuildInputs = [ autoconf automake gettext ]; diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index d781f1c503a6..c50cea7b3850 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { sha256 = "sha256-8LftT22XzmmWxgYez+BAHDX4HOyl5DrwrpuO2+bqqcY="; }; - patches = [ ./test_sleep.patch ]; + patches = [ ./fix_paths.patch ./test_sleep.patch ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/os-specific/solo5/fix_paths.patch b/pkgs/os-specific/solo5/fix_paths.patch new file mode 100644 index 000000000000..8895de311dae --- /dev/null +++ b/pkgs/os-specific/solo5/fix_paths.patch @@ -0,0 +1,29 @@ +diff --git a/toolchain/cc.in b/toolchain/cc.in +index 337562a..0ec9315 100644 +--- a/toolchain/cc.in ++++ b/toolchain/cc.in +@@ -30,9 +30,9 @@ + # symbols. + + prog="$(basename $0)" +-I="$(dirname $0)/../include" ++I="$(realpath $0 | xargs dirname)/../include" + [ ! -d "${I}" ] && echo "$prog: Could not determine include path" 1>&2 && exit 1 +-L="$(dirname $0)/../lib/@@CONFIG_TARGET_TRIPLE@@" ++L="$(realpath $0 | xargs dirname)/../lib/@@CONFIG_TARGET_TRIPLE@@" + [ ! -d "${L}" ] && echo "$prog: Could not determine library path" 1>&2 && exit 1 + # we can't really tell if 'cc' is called with no input, but work around the + # most obvious cases and stop them from "succeeding" and producing an "a.out" +diff --git a/toolchain/ld.in b/toolchain/ld.in +index 01dffa8..13dca2c 100644 +--- a/toolchain/ld.in ++++ b/toolchain/ld.in +@@ -28,7 +28,7 @@ + # linking a unikernel. No default for ABI is provided, as it is expected that a + # caller directly using 'ld' knows what they are doing. + +-L="$(dirname $0)/../lib/@@CONFIG_TARGET_TRIPLE@@" ++L="$(realpath $0 | xargs dirname)/../lib/@@CONFIG_TARGET_TRIPLE@@" + [ ! -d "${L}" ] && echo "$0: Could not determine library path" 1>&2 && exit 1 + # ld accepts -z solo5-abi=ABI, but does not provide a default ABI + # this is intentional diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/servers/althttpd/default.nix index 34b6f6fb5b7b..1f3271be6ab1 100644 --- a/pkgs/servers/althttpd/default.nix +++ b/pkgs/servers/althttpd/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "althttpd"; - version = "unstable-2022-01-10"; + version = "unstable-2022-08-12"; src = fetchfossil { url = "https://sqlite.org/althttpd/"; - rev = "83196564d05f33c3"; - sha256 = "sha256-z/XMVnDihcO56kJaXIJGUUdnz8mR5jlySrLZX1tkV5c="; + rev = "823a1d985d4bacaa"; + sha256 = "sha256-yfVsOfqtHw9ftnK5B4RWeRR/ygfsTEDm7fFSaVxsCas="; }; buildInputs = [ openssl ]; + makeFlags = [ "CC:=$(CC)" ]; + installPhase = '' install -Dm755 -t $out/bin althttpd ''; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index d086c2b922c3..83d145f411f9 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://kafka.apache.org"; description = "A high-throughput distributed messaging system"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = [ maintainers.ragge ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 7d69103282f5..83911d01e6db 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.13.0"; + version = "1.13.1"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-bPLVQ5XvOk6cWtjHNtvZ3McM2SKVbjY6280rIldInpQ="; + sha256 = "sha256-Svclb+tLb0gk3xhoslVvAZZf0LR2M5nR9BmMYLBBHck="; }; passthru.tests.consul = nixosTests.consul; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 80bcc361a8b0..15f1520b8070 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pure-ftpd"; - version = "1.0.50"; + version = "1.0.51"; src = fetchurl { url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz"; - sha256 = "08zas1kg5pnckl28gs7q29952pjfyj8rj59bq96hscqbni7gkqmb"; + sha256 = "sha256-QWD2a3ZhXuojl+rE6j8KFGt5KCB7ebxMwvma17e9lRM="; }; buildInputs = [ openssl pam ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e8d156728d47..d72ae2519e7c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.8.3"; + version = "2022.8.4"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c045703afe1f..c82178ba74bb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -307,7 +307,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.8.3"; + hassVersion = "2022.8.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -325,7 +325,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-Wx5l51+vcByOqdwqcnOn1+yYgp98kXggRmgO/wtiI+U="; + hash = "sha256-x6W69oGCPXK7OLN/XaF4A+OSubSnhFYof1SvLwy9+jY="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix new file mode 100644 index 000000000000..fb8e3fd55acc --- /dev/null +++ b/pkgs/servers/komga/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenvNoCC +, fetchurl +, makeWrapper +, jdk11_headless +}: + +stdenvNoCC.mkDerivation rec { + pname = "komga"; + version = "0.157.0"; + + src = fetchurl { + url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; + sha256 = "sha256-PkQL61fKplt6h1jcFCIMER+ZfzowDP466dR1AaDHw5Q="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildCommand = '' + makeWrapper ${jdk11_headless}/bin/java $out/bin/komga --add-flags "-jar $src" + ''; + + meta = with lib; { + description = "Free and open source comics/mangas server"; + homepage = "https://komga.org/"; + license = licenses.mit; + platforms = jdk11_headless.meta.platforms; + maintainers = with maintainers; [ govanify ]; + }; + +} diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 9340dc24fc24..e497f8099f9b 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-08-08T18-34-09Z"; + version = "2022-08-11T04-37-28Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-HuKfpQY6dllxkrictCMBczHTg2oCLQtZrJQqPG2l6N8="; + sha256 = "sha256-gxDTHy/CDqeQhf/RZaaoloGEfAOg9djjIWdWyb+7fhM="; }; - vendorSha256 = "sha256-uoavsixaLQg0gL70m4ea5fgH5R06YyIZHy1oxDSA0ko="; + vendorSha256 = "sha256-LSAB+0+yNsxi5qCXEBVf3aE8Rt+UP63AIGBV5OhWJDY="; doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index fa654c3a4656..17a09e07b084 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.37.0"; + version = "1.43.1"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-S60/SwbMp6INf98MGc26zMZH8q7gBynyaT/ivN7o0rA="; + sha256 = "sha256-5S9c2lx7EQthY0bTPCSwVcGCD5G+IJEMV5zpCkjTw0s="; }; - vendorSha256 = "sha256-u9FfKOD6kiCFTjwQ7LHE9WC4j2vPm0ZCluL8pC4aQIc="; + vendorSha256 = "sha256-E4+eUjkrOUnVg2CfCo1rc+Zs5HAm4+i8Ax0G8WnsL64="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 235e8863bc2f..be881281faca 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.4.2"; + version = "0.4.4"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ujon6TLniQrYRxJe4+ZTu4/dI2K94r9M/lBmMizDZrA="; + sha256 = "sha256-A3hMSnfxiEgFYueARuldEHT/5ROCIwWjqQj2FdkVYqo="; }; meta = with lib; { diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index fff449f37251..0ed96d249b49 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.1.0"; + version = "12.0.6"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-di1uzTZxeRLevcSS5d/yba5Y6tdy21H2NgU7ZrZTObI="; + sha256 = "sha256-DVum2fUa1BiSyL0d8hzRo3AzEVSRX2EBrJ4DBBIxftE="; }; preConfigure = '' diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 5626217fefef..d59f021678aa 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.40.15"; + version = "0.40.25"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-KIV9ZEVmx7gsFHjtb8d0QfDwN7eQTsS2jYBKrKj988Y="; + sha256 = "sha256-MPfi6rfqlbrnl3CE0YKtIAUagqCB6f3cJtZ7mGUQ5Ng="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-5FGcM9TFl0BGsN3hryIm1hQDCiRww2AEf2kUw3Uga78="; + vendorSha256 = "sha256-Iy01voXaCzbBEbJRxcLDzr5BKj4PHfcib3KH21VzFS4="; doCheck = false; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 5d69e312f5bf..b1d666f0b7a0 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-EodqpYF3wJJdgzHZHqmY0tsrF2YnGirnQWCWaDZ9v8E="; + sha256 = "sha256-/xlnwnUMW7JuUcSnZUV4nqCFcrfGDvXToz7IJykHCGI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index ed11f0828d66..6c7132b46c91 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.13.0"; + version = "0.13.1"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "sha256-8X/+mQrwJ0yaUHRKdoY3G0P8kq22hYfRK+7WRl/zamc="; + sha256 = "sha256-Q9FJXccpTW3nPUOCf5UD8ZWJW25QX8PNHHpsVYjesYE="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index 5ce66fd81331..5e1fdd6e8fc3 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "unstable-2022-04-15"; + version = "unstable-2022-08-11"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; - rev = "7e0eee64df6c7c81a57792674646b5feaf89f263"; - sha256 = "sha256-ixUnuNtxxmiigeVjzuV5uG6rIBPY/1vdBZF2/Qv0Trs="; + rev = "1efe7e3960caeba27e24dd7b546ee5c3545f68bc"; + sha256 = "sha256-GI1+uEpxiMGYiXxfWr1+XtJroFRyX0LhpD7q3zft1E4="; }; strictDeps = true; diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix index e2cb8cd8f43a..5620dcb8420f 100644 --- a/pkgs/tools/X11/wmutils-core/default.nix +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wmutils-core"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "wmutils"; repo = "core"; rev = "v${version}"; - sha256 = "sha256-Nv8ZTi3qVQyOkwyErjtE6/lLCubcLM2BRTY48r1HhHo="; + sha256 = "sha256-OKAvJovGu9rMxEe5g4kdL7Foj41kl3zUYIJa04jf0dI="; }; buildInputs = [ libxcb xcbutil xcb-util-cursor ]; diff --git a/pkgs/tools/backup/zfs-prune-snapshots/default.nix b/pkgs/tools/backup/zfs-prune-snapshots/default.nix index ee60eb040116..2c9e4a2fdf8a 100644 --- a/pkgs/tools/backup/zfs-prune-snapshots/default.nix +++ b/pkgs/tools/backup/zfs-prune-snapshots/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, go-md2man }: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.5.0"; pname = "zfs-prune-snapshots"; src = fetchFromGitHub { owner = "bahamas10"; repo = pname; rev = "v${version}"; - sha256 = "sha256-udzC4AUXk7h7HpRcz0V+kPECzATAYZtX8z2fvKPCZ/c="; + sha256 = "sha256-gCf/ZIeIh84WQNs5wZO1/l3zpnl2sNxsFO7cOa92JUM="; }; nativeBuildInputs = [ go-md2man ]; diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index a10f0673fc2f..8ab6bba1ef12 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "wallutils"; - version = "5.11.0"; + version = "5.11.1"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "sha256-5yx6++uciCoT+gcqGnag9V1eYdfwHIQ8WrsuGU4A51E="; + sha256 = "sha256-FL66HALXsf7shoUKIZp6HORyuxhOfgTrY+PQAe92yk8="; }; goPackagePath = "github.com/xyproto/wallutils"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index f8d8b4d5af4c..d71fca87ab24 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.16"; + version = "5.0.17"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-gdYtQyCczJOGkCjl7fVCjcKkhEW3wDO5HDYNfMhnb1g="; + sha256 = "sha256-sAPbbMoZ4NGiE7lbtcdzQQsPib6i52JwWsLe+bmTshU="; }; cmakeFlags = [ diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index 73e430e54e34..508e39da9d82 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-catgal3bpWJUcTo0x0V0X3VV87AHO2Dp58IpQ/ILsZ8="; + sha256 = "sha256-Lc23VvIZguE6nRHeGDW3pL4exKtJtF8XmFkN2SxUL0g="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 4438d9d637ba..de2b166f47e2 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,12 +1,11 @@ { lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.11.0"; - name = "${pname}-${version}"; + version = "5.12.1"; src = fetchurl { - name = "${name}.AppImage"; + name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-Nj6S53b4w84qppkGB7lMpJhJlxifaD4acPryuZxY7cM="; + hash = "sha256-ugnJcSFgEEPJ9qxqmRGgW1fraE4E/HbbxpK/00TXPmw="; }; udevRules = fetchurl { @@ -14,7 +13,7 @@ hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc="; }; - appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: { + appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: { buildCommand = '' ${oA.buildCommand} @@ -26,7 +25,7 @@ }); in appimageTools.wrapAppImage { - inherit name; + inherit pname version; src = appimageContents; multiPkgs = null; # no 32bit needed @@ -36,7 +35,7 @@ in appimageTools.wrapAppImage { extraInstallCommands = '' # Add desktop convencience stuff - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-*,${pname}} install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps substituteInPlace $out/share/applications/flexoptix-app.desktop \ diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 9cab0bc2237d..e82b13d12c65 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.14.0"; + version = "3.14.1"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-jjBxCfjLjnhdKeMgJwEPytCVKQ4R4wHeF8/3Z/F6UgQ="; + sha256 = "sha256-NnAj9dsB1ZUuTm2W8mPdK2h15Dtro8ve6c+tPoKUsXs="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 012ac19c206c..10844db77ba5 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdfview"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-iY/NUifU57aX795eWpaUBflrclF/nfvb3OKZEpD9VqA="; + sha256 = "sha256-08De/yy9lZUIxNqccS2nL7IE/2gYo0NPAKcHH46M8rg="; }; patches = [ diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index aa77f6b4a305..8cf91fe4808c 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.9"; + version = "0.10.10"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-qDMGeuNY/Y7A6ZGd6giztQrx4psUAjOamUbC0Z4H80k="; + sha256 = "sha256-7SaT2jwrM0pD0BqX18d3nutU52RMCnQb2FuDtoJZMQM="; }; vendorSha256 = "sha256-ccoFTg5OYpaagyzb2lJLr6WlTO/L4YevXK09gZOELOw="; diff --git a/pkgs/tools/misc/nomino/default.nix b/pkgs/tools/misc/nomino/default.nix index c8dcfd313031..01c6b43069e2 100644 --- a/pkgs/tools/misc/nomino/default.nix +++ b/pkgs/tools/misc/nomino/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - sha256 = "sha256-+bnEuSro3/t9aXu2WpwsaqHqB+poSXsVbna01a7pnKo="; + sha256 = "sha256-Zczj2HQkm6/hXH24pOXYT5r7RS/SI/39s5XtNnc7f9o="; }; - cargoSha256 = "sha256-IKsA8btCmKnZfRIwS4QdxJMi1As6SNbTI7ibOL7M+5U="; + cargoSha256 = "sha256-mjekXjHhi8gxjD47DmTs3TGtnXp3FbxiIq7Uo+rOvKc="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index e4ac6b624ce4..35c82b630b7b 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "parted"; - version = "3.4"; + version = "3.5"; src = fetchurl { url = "mirror://gnu/parted/parted-${version}.tar.xz"; - sha256 = "sha256-4SmAIkctpVibfyvh1e48G2bsPZbfutA9xkKv0AnaU0I="; + sha256 = "sha256-STjdXBwSX2x4sfSz4pdSbxjudKpD1FwkhXix0kcMBaI="; }; outputs = [ "out" "dev" "man" "info" ]; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 4cca88a9b40a..4684a024359d 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "profile-sync-daemon"; - version = "6.44"; + version = "6.45"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-sync-daemon"; rev = "v${version}"; - hash = "sha256-7sEC2b4mzgbDTFgpH5abZ/kiwEmGdbKkTLiD73Efdls="; + hash = "sha256-gUGtoa0NUCzhghEMPgb020UdXjFQMZkx4ZmPJDXNGJc="; }; installPhase = '' diff --git a/pkgs/tools/misc/smug/default.nix b/pkgs/tools/misc/smug/default.nix index cf78662620ce..1f8263cdc745 100644 --- a/pkgs/tools/misc/smug/default.nix +++ b/pkgs/tools/misc/smug/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "smug"; - version = "0.2.7"; + version = "0.3.2"; subPackages = [ "." ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "ivaaaan"; repo = "smug"; rev = "v${version}"; - sha256 = "178125835dhnaq9k42yv4pfxpyhgb5179wrxkimb59fy0nk8jzx8"; + sha256 = "sha256-JZV4UfrmvcM7d8Ld4m/jC3GvzJCUgXqsGBSSnz81fXk="; }; - vendorSha256 = "1rba5rpvlr8dyhj145b5i57pm4skfpj3vm7vydkn79k6ak6x985x"; + vendorSha256 = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU="; nativeBuildInputs = [ installShellFiles ]; @@ -21,6 +21,7 @@ buildGoModule rec { postInstall = '' installManPage ./man/man1/smug.1 + installShellCompletion completion/smug.{bash,fish} ''; meta = with lib; { diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index b24c3ead956d..768e4d33e3de 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages }: +{ lib, python3Packages, installShellFiles }: let pypkgs = python3Packages; @@ -6,16 +6,23 @@ let in pypkgs.buildPythonApplication rec { pname = "tmuxp"; - version = "1.11.0"; + version = "1.12.1"; src = pypkgs.fetchPypi { inherit pname version; - sha256 = "sha256-N5kZ+e17ZgLOCvV/lcT/hdG1VNqLxh98QOQyM0BmZCA="; + sha256 = "078624c5ac7aa4142735f856fadb9281fcebb10e6b98d1be2b2f2bbd106613b9"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "libtmux>=0.12.0,<0.13.0" "libtmux" + ''; + # No tests in archive doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = with pypkgs; [ click colorama @@ -23,10 +30,18 @@ pypkgs.buildPythonApplication rec { libtmux ]; + postInstall = '' + installShellCompletion --cmd tmuxp \ + --bash <(_TMUXP_COMPLETE=bash_source $out/bin/tmuxp) \ + --fish <(_TMUXP_COMPLETE=fish_source $out/bin/tmuxp) \ + --zsh <(_TMUXP_COMPLETE=zsh_source $out/bin/tmuxp) + ''; + meta = with lib; { - description = "Manage tmux workspaces from JSON and YAML"; + description = "tmux session manager"; homepage = "https://tmuxp.git-pull.com/"; - license = licenses.bsd3; + changelog = "https://github.com/tmux-python/tmuxp/raw/v${version}/CHANGES"; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index d91f5fa36501..41b30f5f4a21 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txr"; - version = "278"; + version = "280"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "sha256-RwPdDQGFL851eegQfMb8xHxC8AP39heSIALXjp/5/cw="; + sha256 = "sha256-1iqWerUehLFPM63ZjJYY6xo9oHoNK7ne/a6M3+4L4so="; }; buildInputs = [ libffi ]; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 4792deedace8..2b96be63dbf9 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.9.1"; + version = "0.10.1"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-58CcM1bKjH3uEzJ27SBHrZQEUTEFj3U4BS5udd9IL4w="; - aarch64-linux = "sha256-/orLwUCco+iSgvGhJ0s0N4BjA4FYsEi9HgeKHHqKw74="; - x86_64-darwin = "sha256-twsrQkRWfhFZzc+CTetIUx1hGczrAH91C/0jKPe6kPg="; - aarch64-darwin = "sha256-g7pALQ4y4LymAggyHuJSJn0Owhs2BzoNQb1rb9+ZJmw="; + x86_64-linux = "sha256-JAwJOu90mrZhWhxQvfRlaWk7dYTC21Z5KQlKWCDJMQg="; + aarch64-linux = "sha256-nUIWMt5HPexIlQu5n6LFt1I0WogEdnEhLav6UuLRBXo="; + x86_64-darwin = "sha256-rZ2WqbcdcWZ7WXfYowmLZPer3pm74ssK15DEPRA9pPw="; + aarch64-darwin = "sha256-zpxdm1Ix+AUl2YCfgI7U9HC01tXtMEV4T/jSDNGDaq8="; }; in fetchzip { diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 7d84365eb996..b2cb534de40d 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.1.1"; + version = "2.1.2"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-BtH/h2HejXDWSoqWRTjZXMLYDRoMe8lSUDX6Gay1gA8="; + sha256 = "sha256-vFUbsgLgwQGb/2rValFRuZXguxyAJzOBMLnbVs0swes="; }; meta = with lib; { diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 9e4cf7846bdb..e821163f2298 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.3.5"; + version = "1.3.6"; pname = "htpdate"; src = fetchFromGitHub { owner = "twekkel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L3CKBgGk9R8qJFWOS98Tm1j/s/5t6+/Vt2EcZ+or0Ng="; + sha256 = "sha256-0NLlBNYTJ+hmQLH/UYwIOIbq3G1sDo/A03xFHsXdzig="; }; makeFlags = [ diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index 62166f9976d4..97c6021a608d 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kapp"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-TfTnq6cGlCm8Fv/pf6wAFrxbW2CJyZFze+woxy70OzA="; + sha256 = "sha256-sCQD0hZTJaeueBTu4XPiPVC5dhPWkTQn0mKwWVT5H/0="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index e01cddab88b7..a4d1e7365b89 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-08-05T08-01-28Z"; + version = "2022-08-11T00-30-48Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-XtRpRp5KtqM+VwaouzbcjoiwuUDo4NtgaQ/bsCmwP58="; + sha256 = "sha256-wv/Y4MIJFISf+fvV3BYbA5kQqETsYe4vt2lp36DfFrE="; }; - vendorSha256 = "sha256-0WljjAgL//PqooHwAusMQwJpLRYzjpDUNcrmCHUGyNs="; + vendorSha256 = "sha256-5kpE0jtE3ljnUsXQY2cWvABVpegrTSYZCIYy0pz4iz8="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 7f6923da822b..2a7522cf7d71 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "5.4.0"; + version = "6.0.1"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-8+0xIxDjkDJLM7ov//KQzoEpNSB6FJPsXAmNCkQb5Rw="; + sha256 = "sha256-upJ5kA0f78nwuXcmS3CffUgcJ41ngAkLNmc7ZcsakSI="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/redli/default.nix b/pkgs/tools/networking/redli/default.nix index d6a9f6f8709c..449f15fb1eb9 100644 --- a/pkgs/tools/networking/redli/default.nix +++ b/pkgs/tools/networking/redli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redli"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "IBM-Cloud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bR02R9M3041oNUEQId1zgAxMNPyXXQNAYEyE/XIDdPE="; + sha256 = "sha256-nLauKt3OnFZFnFjw0s2kTFdvdYjFkeA6eQwZEhT4n/s="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/cirrusgo/default.nix b/pkgs/tools/security/cirrusgo/default.nix new file mode 100644 index 000000000000..56fb7c71b1ec --- /dev/null +++ b/pkgs/tools/security/cirrusgo/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "cirrusgo"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Ph33rr"; + repo = pname; + rev = "v${version}"; + hash = "sha256-FYI/Ldu91YB/4wCiVADeYxYQOeBGro1msY5VXsnixw4="; + }; + + vendorSha256 = "sha256-KCf2KQ8u+nX/+zMGZ6unWb/Vz6zPNkKtMioFo1FlnVI="; + + meta = with lib; { + description = "Tool to scan SAAS and PAAS applications"; + homepage = "https://github.com/Ph33rr/cirrusgo"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 960f502e2e75..4cd4d2c0a4ea 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.10.2"; + version = "8.10.3"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FiR1zJ9aOdysp5807vZ9aX3O7l8GhDXlFDWuyk5zJQw="; + sha256 = "sha256-uLCV0eSsQhx9/U/iaAPI25w4Q6pI0PeHAPAQvOJwSWI="; }; vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index e95ff1a05477..fcad20c651f2 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/pkgs/tools/security/kube-bench/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uqjF2WtsGMzA/JDS93BSQNuBJorMIJha9qPHJkIbjQo="; + sha256 = "sha256-bKgUnkfOWcX3/JdspEjNhFqS2dMlwEcVffIqNfS6FEU="; }; - vendorSha256 = "sha256-/LSgIfLBsGRSyz9gExgLKAjO+RF/C8CkxSvwx2jZjoI="; + vendorSha256 = "sha256-f/B9E9Ot9njop04PKh0XYG1DnWKBRsVi4XHQNmZeQho="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/social-engineer-toolkit/default.nix b/pkgs/tools/security/social-engineer-toolkit/default.nix new file mode 100644 index 000000000000..4f2d5895cc78 --- /dev/null +++ b/pkgs/tools/security/social-engineer-toolkit/default.nix @@ -0,0 +1,70 @@ +{ lib, fetchFromGitHub, python3Packages, makeWrapper, metasploit }: + +python3Packages.buildPythonApplication rec { + pname = "social-engineer-toolkit"; + version = "8.0.3"; + format = "other"; + + src = fetchFromGitHub { + owner = "trustedsec"; + repo = pname; + rev = version; + sha256 = "ePbmUvnzLO0Wfuhym3bNSPV1x8rcCPqKMeWSRcbJGAo="; + }; + + postPatch = '' + substituteInPlace setoolkit \ + --replace "src/core/config.baseline" "$out/share/social-engineer-toolkit/src/core/config.baseline" + substituteInPlace src/core/setcore.py \ + --replace '"src/core/set.version"' "\"$out/share/social-engineer-toolkit/src/core/set.version\"" \ + --replace "/opt/metasploit-framework" "${metasploit}/bin" + ''; + + nativeBuildInputs = [ + makeWrapper + ]; + + propagatedBuildInputs = with python3Packages; [ + pexpect + pycrypto + requests + pyopenssl + pefile + impacket + qrcode + pillow + # Has been abandoned upstream. Features using this library are broken + # pymssql + ]; + + installPhase = '' + runHook preInstall + + install -Dt $out/bin setoolkit seautomate seproxy + mkdir -p $out/share/social-engineer-toolkit + cp -r modules readme src $out/share/social-engineer-toolkit/ + + runHook postInstall + ''; + + makeWrapperArgs = [ + "--chdir ${placeholder "out"}/share/social-engineer-toolkit" + "--prefix PYTHONPATH : \"${placeholder "out"}/share/social-engineer-toolkit\"" + ]; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "Open-source penetration testing framework designed for social engineering"; + longDescription = '' + The Social-Engineer Toolkit is an open-source penetration testing framework + designed for social engineering. SET has a number of custom attack vectors + that allow you to make a believable attack quickly. + ''; + homepage = "https://github.com/trustedsec/social-engineer-toolkit"; + mainProgram = "setoolkit"; + license = licenses.bsd3; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/tools/security/yubihsm-shell/default.nix index 2533e0c78709..83c2e535403d 100644 --- a/pkgs/tools/security/yubihsm-shell/default.nix +++ b/pkgs/tools/security/yubihsm-shell/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "yubihsm-shell"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-shell"; rev = version; - sha256 = "D0kXiwc+i6mKA4oHuHjgXUmLMsmY5o/VI+1aCWtNjC0="; + sha256 = "sha256-rSIdI6ECLte+dEbT8NOUqS8jkozRhbo+eqFrdhTIKpY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix deleted file mode 100644 index a82318648495..000000000000 --- a/pkgs/tools/system/hardlink/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, pcre2 }: - - -stdenv.mkDerivation { - pname = "hardlink"; - version = "1.3-4"; - - src = fetchurl { - url = "https://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; - sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2"; - }; - - buildInputs = [ pcre2 ]; - NIX_CFLAGS_LINK = "-lpcre2-8"; - - buildPhase = '' - $CC -O2 hardlink.c -o hardlink $NIX_CFLAGS_LINK - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp -f hardlink $out/bin/hardlink - cp -f hardlink.1 $out/share/man/man1/hardlink.1 - ''; - - meta = with lib; { - description = "Consolidate duplicate files via hardlinks"; - homepage = "https://pagure.io/hardlink"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index fcdf35345819..b990ce1c2ed9 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "22.0"; + version = "22.1"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-hjKF/fyV7/uQF6iJNOsRpX4Iw7aDURkdb7hbwfIDBPo="; + sha256 = "sha256-nGWpUqBkpiiNuH5kEHWR1/+0aYIeLf9k3AmzQR85Swk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index b8f2b4605289..ee2a25bdf79d 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -19,6 +19,14 @@ buildGoModule { nativeBuildInputs = [ m4 ]; + buildPhase = '' + runHook preBuild + make PREFIX="$out" + runHook postBuild + ''; + + doCheck = false; # no tests + installPhase = '' runHook preInstall make PREFIX="$out" install diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 3fda2ec6a376..fe84d365f8d6 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.13.09"; + version = "0.14.03"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-BOOB5fA/Cy1gsRA4j8aj3lVY2y4OvIfoiRqOIY9nZzM="; + hash = "sha256-6aA0dWP6q6SJ8TYGctDE2rhDCO5QuAO4cx4J9id9hjY="; }; postPatch = '' diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index a7e8293851b9..df5b35dd9be0 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto, diffutils }: +{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m-batch, xmlto, diffutils }: stdenv.mkDerivation rec { pname = "colordiff"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+TtVnUX88LMd8zmhLsKTyR9JlgR7IkUB18PF3LRgPB0="; }; - nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m xmlto ]; + nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m-batch xmlto ]; buildInputs = [ perl ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 51e2f9778c4b..cad0f96998cf 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.8.3"; + version = "3.9.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p2x3WQIzM1FJBn9mvqfisjTLgjtkZouV/fr/waCiYw0="; + sha256 = "sha256-9tHSdO9VlsbLqFFA/CKhbPvstU3+26jBaBw/tX5qJnw="; }; buildInputs = [ diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index d580f2e9e07a..f7daa1116edb 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayr-${version}"; - sha256 = "sha256-ubindhU3G1iHqf/yiXIJk87uI3o5y2lfs22tbIfiqv4="; + sha256 = "sha256-Od23QF4vasr1gvtahENLPkz4wbx1WFaN1mauB4iDftk="; }; - cargoSha256 = "sha256-X6BYLD7YmlHCO+3b3Ubai222tvsZUmZrwm3vS2PeqDY="; + cargoSha256 = "sha256-ZgFTmeCrFpdGv9vkFKG7VY/tPeOIVKWCMk0JyrtJ22s="; patches = [ ./icon-paths.patch diff --git a/pkgs/tools/wayland/wayout/default.nix b/pkgs/tools/wayland/wayout/default.nix new file mode 100644 index 000000000000..bf949cfc0549 --- /dev/null +++ b/pkgs/tools/wayland/wayout/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromSourcehut +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "wayout"; + version = "1.1.3"; + + src = fetchFromSourcehut { + owner = "~shinyzenith"; + repo = pname; + rev = version; + sha256 = "sha256-EzRetxx0NojhBlBPwhQ7p9rGXDUBlocVqxcEVGIF3+0="; + }; + + cargoSha256 = "sha256-QlxXbfeWJdCythYRRLSpJbTzKkwrL4kmAfyL3tRt194="; + + meta = with lib; { + description = "Simple output management tool for wlroots based compositors implementing"; + homepage = "https://git.sr.ht/~shinyzenith/wayout"; + license = licenses.bsd2; + maintainers = with maintainers; [ onny ]; + broken = stdenv.isDarwin; # Build failed on Darwin + }; + +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b2a8d4a5a659..3ea7c71457a6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -581,6 +581,7 @@ mapAliases ({ ### H ### hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 + hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12 inherit (harePackages) hare harec; # Added 2022-08-10 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3c097f739ca..bc3dd0f3b6c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3319,6 +3319,8 @@ with pkgs; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; + wayout = callPackage ../tools/wayland/wayout { }; + way-displays = callPackage ../tools/wayland/way-displays { }; wev = callPackage ../tools/wayland/wev { }; @@ -4085,6 +4087,8 @@ with pkgs; klog = qt5.callPackage ../applications/radio/klog { }; + komga = callPackage ../servers/komga { }; + krapslog = callPackage ../tools/misc/krapslog { }; krelay = callPackage ../applications/networking/cluster/krelay { }; @@ -4943,6 +4947,8 @@ with pkgs; cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { }; + cirrusgo = callPackage ../tools/security/cirrusgo { }; + inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_21_01_0 citrix_workspace_21_03_0 @@ -7192,8 +7198,6 @@ with pkgs; habitat = callPackage ../applications/networking/cluster/habitat { }; - hardlink = callPackage ../tools/system/hardlink { }; - hashcash = callPackage ../tools/security/hashcash { }; hashcat = callPackage ../tools/security/hashcat { }; @@ -7261,9 +7265,7 @@ with pkgs; hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; - hdfview = callPackage ../tools/misc/hdfview { - hdf5 = hdf5_1_10; - }; + hdfview = callPackage ../tools/misc/hdfview { }; hecate = callPackage ../applications/editors/hecate { }; @@ -7857,6 +7859,8 @@ with pkgs; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; + krunvm = callPackage ../applications/virtualization/krunvm { }; + kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; krop = callPackage ../applications/graphics/krop { }; @@ -9471,7 +9475,9 @@ with pkgs; oshka = callPackage ../development/tools/oshka {}; - osl = callPackage ../development/compilers/osl { }; + osl = libsForQt5.callPackage ../development/compilers/osl { + boost = boost165; + }; osqp = callPackage ../development/libraries/science/math/osqp { }; @@ -14260,7 +14266,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; }; cargo-cross = callPackage ../development/tools/rust/cargo-cross { }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { @@ -19545,9 +19551,7 @@ with pkgs; libmilter = callPackage ../development/libraries/libmilter { }; - libminc = callPackage ../development/libraries/libminc { - hdf5 = hdf5_1_10; - }; + libminc = callPackage ../development/libraries/libminc { }; libmkv = callPackage ../development/libraries/libmkv { }; @@ -20165,6 +20169,8 @@ with pkgs; deps = [ memorymapping ]; } ../development/libraries/memorymapping/setup-hook.sh; + memray = callPackage ../development/tools/memray { }; + memstream = callPackage ../development/libraries/memstream { }; memstreamHook = makeSetupHook { deps = [ memstream ]; @@ -21273,6 +21279,8 @@ with pkgs; soapyuhd = callPackage ../applications/radio/soapyuhd { }; + social-engineer-toolkit = callPackage ../tools/security/social-engineer-toolkit { }; + socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; soco-cli = callPackage ../tools/audio/soco-cli { }; @@ -23178,6 +23186,10 @@ with pkgs; radicale = radicale3; + radicle-cli = callPackage ../applications/version-management/git-and-tools/radicle-cli { + inherit (darwin) DarwinTools; + inherit (darwin.apple_sdk.frameworks) AppKit; + }; radicle-upstream = callPackage ../applications/version-management/git-and-tools/radicle-upstream {}; rake = callPackage ../development/tools/build-managers/rake { }; @@ -23877,6 +23889,12 @@ with pkgs; libcgroup = callPackage ../os-specific/linux/libcgroup { }; + libkrun = callPackage ../development/libraries/libkrun { }; + + libkrun-sev = callPackage ../development/libraries/libkrun { sevVariant = true; }; + + libkrunfw = callPackage ../development/libraries/libkrunfw { }; + libnl = callPackage ../os-specific/linux/libnl { }; libtraceevent = callPackage ../os-specific/linux/libtraceevent {}; @@ -26431,6 +26449,8 @@ with pkgs; clipit = callPackage ../applications/misc/clipit { }; + clipqr = callPackage ../applications/misc/clipqr { }; + cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { }; clp = callPackage ../applications/science/math/clp { }; @@ -33681,6 +33701,10 @@ with pkgs; inherit (llvmPackages) openmp; }; + ciftilib = callPackage ../development/libraries/science/biology/ciftilib { + boost = boost16x; + }; + cmtk = callPackage ../applications/science/biology/cmtk { }; clustal-omega = callPackage ../applications/science/biology/clustal-omega { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5bc1299ee5c4..272cbeb38e66 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17313,6 +17313,23 @@ let }; }; + ObjectPad = buildPerlModule { + pname = "Object-Pad"; + version = "0.68"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.68.tar.gz"; + sha256 = "sha256-xN5jBIQxMJZNrskozF99HphTnu/X7azHvn4Yg0XhnXE="; + }; + buildInputs = [ TestFatal TestRefcount ]; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + propagatedBuildInputs = [ XSParseKeyword XSParseSublike ]; + meta = { + description = "simple syntax for lexical field-based objects"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + ObjectSignature = buildPerlPackage { pname = "Object-Signature"; version = "1.08"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e104a8d57686..c4fe8d82f8f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1940,6 +1940,8 @@ in { configargparse = callPackage ../development/python-modules/configargparse { }; + configclass = callPackage ../development/python-modules/configclass { }; + configobj = callPackage ../development/python-modules/configobj { }; configparser = callPackage ../development/python-modules/configparser { }; @@ -2645,6 +2647,8 @@ in { doit = callPackage ../development/python-modules/doit { }; + doit-py = callPackage ../development/python-modules/doit-py { }; + dominate = callPackage ../development/python-modules/dominate { }; doorbirdpy = callPackage ../development/python-modules/doorbirdpy { }; @@ -5473,6 +5477,8 @@ in { mergedeep = callPackage ../development/python-modules/mergedeep { }; + mergedict = callPackage ../development/python-modules/mergedict { }; + merkletools = callPackage ../development/python-modules/merkletools { }; meross-iot = callPackage ../development/python-modules/meross-iot { }; @@ -5630,6 +5636,8 @@ in { moku = callPackage ../development/python-modules/moku { }; + monai = callPackage ../development/python-modules/monai { }; + monero = callPackage ../development/python-modules/monero { }; mongomock = callPackage ../development/python-modules/mongomock { }; @@ -10489,9 +10497,7 @@ in { tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - tables = callPackage ../development/python-modules/tables { - hdf5 = pkgs.hdf5_1_10; - }; + tables = callPackage ../development/python-modules/tables { }; tablib = callPackage ../development/python-modules/tablib { }; @@ -11418,6 +11424,8 @@ in { webcolors = callPackage ../development/python-modules/webcolors { }; + webdav4 = callPackage ../development/python-modules/webdav4 { }; + webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; webencodings = callPackage ../development/python-modules/webencodings { }; @@ -11524,6 +11532,8 @@ in { wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { }; + wsgidav = callPackage ../development/python-modules/wsgidav { }; + wsgiprox = callPackage ../development/python-modules/wsgiprox { }; wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { };