diff options
56 files changed, 409 insertions, 226 deletions
diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index a1bb5bcef5c4e..5f982ff6f64fe 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -10,13 +10,13 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-EPORD8jDmTnCm/ON1Vz2R7DpFVyAR8q7r2KZyKTiGr4="; + hash = "sha256-NAAl/XmJqRnJyOYNJqmMlCIiGsCsSH7gGTMbD46gpss="; }; deleteVendor = true; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 623a8d783f767..c326b9725b8ef 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch2 , meson , ninja , gtk3 @@ -42,22 +41,13 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.7"; + version = "0.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gPCj2HVS+L3vpeNig77XZ9AFdtqMyWpEo9NKQjXEmeA="; + sha256 = "sha256-F3Ky+h56VHnVKAKLyaMD8oVeHZWaWzyReSLmOpipCxk="; }; - patches = [ - # Fix build with vala 0.56.4, can be removed on next update - # https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/69 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/shotwell/-/commit/cd82759231e5ece2fa0dea40397c9051d15fd5c2.patch"; - hash = "sha256-Vy2kvUlmPdEEuPB1RTcI5pGYNveeiQ+lId0YVlWo4wU="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 2c9ce250ee581..b695286085d16 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.14.0"; + version = "0.14.4"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-AYo1sRzsOuyv0p3X8/TmsWdCBq3Gcqo0J6+B2aI7UIo="; + hash = "sha256-AUZFrASwROmcOhoObAdV/Dn9dA7HvxmEqqZOIJH+rI0="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-ro/m9t8vHxyAS+a42/OkaqhrUs0FPGu0Ns9tn5HyKXg="; + vendorHash = "sha256-oReSh0acGcjH+a7GRRV6cy6qgU4puN+iuXzLuRQmx3A="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 46747974dd2f4..9fd3fc41ce510 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.29.1"; + version = "0.29.2"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-lHpXmJPOjyzlNl7fLQH6Ufj20YRzeGz4NGxd3Bgr3mA="; + hash = "sha256-toB0rRkqRTjf51g+BcMZiHjlG/slMyzA5OfO4DbTCH8="; }; - vendorHash = "sha256-VGLGa1/8sdVC3H4hxpvF/t2YgbRlbeNTJMJb5zwknPw="; + vendorHash = "sha256-sntlF8VCOtIB6kFJZaDs2Uu8zWZwMLcnHWuZy2D30Zg="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 43f9e16de63a8..dfbeb9d95d21e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -428,13 +428,13 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-bn02BLLSgdo7/Oh95rNOxVUVvwflSvU43DOsii5LM0E=", + "hash": "sha256-im5YyI1x9ys0MowuNm7JcbJvXPCHxcXXWJeRXRrRIr4=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v15.10.0", + "rev": "v15.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-s4FynUO6bT+8uZYkecbQCtFw1jFTAAYUkSzONI6Ba9g=" + "vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ=" }, "google": { "hash": "sha256-rF68NnqyEY4BWl+oLOxfTaQw5zEGs6Ue/L9DwzsJ46M=", diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 2fc75004cd0d6..a5fb59b3bc493 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.45.2"; + version = "0.45.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-elaCrClNLTw3YiEjygwJxjiqYlp7BWwjvdIYDx5rWE8="; + hash = "sha256-rqMi+rBWOWoJeoOBpBPKp1lFKzZlWQJfShN5Uyxb5eM="; }; vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y="; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index cd27ceef5ac8c..7b5a26975f3b0 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,15 +15,15 @@ buildGoModule rec { pname = "cri-o"; - version = "1.26.3"; + version = "1.27.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-mWhWL886lZggjow4xd02jbxaVl9PTEG24jiys4N19Lw="; + sha256 = "sha256-ZFt8KcEJ7iN2JgKbOGDgpq0+pjlxEU7V9GSX+c3VnbY="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 189105ab54521..7924d7f70f6f0 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jmVgrrbxkvzDkUYpNivz3jOOEEkr90iS5W4aY3L7Cug="; + sha256 = "sha256-uZE827dc79i7JPxHDI3kmAANN9XUIuhR0c9BUe92DyQ="; }; - vendorHash = "sha256-8YmApeijOmWFfLu4UJTa1Ufn0RbaO4TKe7QHvjluMRg="; + vendorHash = "sha256-CysPzlup8TVVR4rCm3cWTjnxwJznMv0wbaeCC0ofWSU="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index 2a499b4288986..c3ff184d91977 100644 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "deepin-system-monitor"; - version = "5.9.32"; + version = "5.9.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-jze5Pigk4edjojmpNNwaVVfcpk5Aed/S0y9YE0HdC0A"; + sha256 = "sha256-X7/YwnJyA/HOLsOGARjsHWgL2qxW1eU1TvoWulvz0j4="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-launcher/default.nix b/pkgs/desktops/deepin/core/dde-launcher/default.nix index cd73cf8dc7e0b..7d850c544d536 100644 --- a/pkgs/desktops/deepin/core/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/core/dde-launcher/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { }; postPatch = '' + #fix build with new dtk(https://github.com/linuxdeepin/dde-launcher/pull/369) + substituteInPlace src/windowedframe.h \ + --replace "#include <dregionmonitor.h>" " " substituteInPlace src/boxframe/{backgroundmanager.cpp,boxframe.cpp} \ --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" substituteInPlace dde-launcher.desktop dde-launcher-wapper src/dbusservices/com.deepin.dde.Launcher.service \ diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix index 24e22e99c5024..a0845277355e5 100644 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dtkcommon"; - version = "5.6.3"; + version = "5.6.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-9gFJ0Uun0q/XVaegxTUu4Kkc+/GE09eAV68VZgWurrM="; + sha256 = "sha256-FHXwgFTevCGTNUPlb/oeltE2//Sjwz7YVvko7QPOsRo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix index 282d079570d36..3ca5622d197c4 100644 --- a/pkgs/desktops/deepin/library/dtkcore/default.nix +++ b/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -1,23 +1,29 @@ { stdenv , lib , fetchFromGitHub -, pkg-config , cmake -, gsettings-qt +, pkg-config +, qttools +, doxygen , wrapQtAppsHook +, qtbase +, gsettings-qt , lshw +, libuchardet , dtkcommon +, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { pname = "dtkcore"; - version = "5.6.3"; + version = "5.6.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-DEpo/eKMjtTVGEkq5JofkRNSHtTOZ1t2QNjrdulUtPQ="; + sha256 = "sha256-ge8DiJMSaZo7GeQEgnDbi5SLsLxtOQ/P5/9aBgaG7Ds="; }; postPatch = '' @@ -28,23 +34,40 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + qttools + doxygen wrapQtAppsHook ]; buildInputs = [ + qtbase gsettings-qt lshw - ]; + libuchardet + ] + ++ lib.optional withSystemd systemd; propagatedBuildInputs = [ dtkcommon ]; cmakeFlags = [ "-DDVERSION=${version}" - "-DBUILD_DOCS=OFF" + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_DOCS=ON" + "-DQCH_INSTALL_DESTINATION=${qtbase.qtDocPrefix}" "-DDSG_PREFIX_PATH='/run/current-system/sw'" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" + "-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" ]; + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + meta = with lib; { description = "Deepin tool kit core library"; homepage = "https://github.com/linuxdeepin/dtkcore"; diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index b408055b0c37e..5112feffd9ec4 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -4,36 +4,42 @@ , pkg-config , cmake , qttools +, doxygen , wrapQtAppsHook -, librsvg -, lxqt +, qtbase , dtkcore , qtimageformats +, lxqt +, librsvg , freeimage +, libraw }: stdenv.mkDerivation rec { pname = "dtkgui"; - version = "5.6.3"; + version = "5.6.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-r6ZwGPiK6CcKEg8RoHV07wJbQI3idJFV3WFtuKim8n4="; + sha256 = "sha256-4NHt/hLtt99LhWvBX9e5ueB5G86SXx553G6fyHZBXcE="; }; nativeBuildInputs = [ cmake qttools + doxygen pkg-config wrapQtAppsHook ]; buildInputs = [ + qtbase lxqt.libqtxdg librsvg freeimage + libraw ]; propagatedBuildInputs = [ @@ -43,10 +49,19 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDVERSION=${version}" - "-DBUILD_DOCS=OFF" + "-DBUILD_DOCS=ON" + "-DQCH_INSTALL_DESTINATION=${qtbase.qtDocPrefix}" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + meta = with lib; { description = "Deepin Toolkit, gui module for DDE look and feel"; homepage = "https://github.com/linuxdeepin/dtkgui"; diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix index 170ae821eba2a..65c556d77b74b 100644 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -1,14 +1,16 @@ { stdenv , lib , fetchFromGitHub -, dtkgui -, pkg-config , cmake +, pkg-config , qttools +, doxygen +, wrapQtAppsHook +, dtkgui +, qtbase , qtmultimedia , qtsvg , qtx11extras -, wrapQtAppsHook , cups , gsettings-qt , libstartup_notification @@ -17,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dtkwidget"; - version = "5.6.3"; + version = "5.6.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-APk2p8pdLsaKvPp95HtEI1F1LM4ySUL+fhGsC5vHasU="; + sha256 = "sha256-PhVK/lUFrDW1bn9lUhLuKWLAVj7E7+/YC5USShrg3ds="; }; postPatch = '' @@ -35,11 +37,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools + doxygen pkg-config wrapQtAppsHook ]; buildInputs = [ + qtbase qtmultimedia qtsvg qtx11extras @@ -53,10 +57,19 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDVERSION=${version}" - "-DBUILD_DOCS=OFF" + "-DBUILD_DOCS=ON" + "-DQCH_INSTALL_DESTINATION=${qtbase.qtDocPrefix}" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + meta = with lib; { description = "Deepin graphical user interface library"; homepage = "https://github.com/linuxdeepin/dtkwidget"; diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix index b3e5a189135cd..426cb091a32c0 100644 --- a/pkgs/desktops/deepin/library/qt5integration/default.nix +++ b/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "qt5integration"; - version = "5.6.4"; + version = "5.6.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-MZkhTvjTyBrlntgFq2F3iGK7WvfmnGJQLk5B1OM5kQo="; + sha256 = "sha256-7b18ydyy/TIEGDkFAoium1LSx3Qs4I4pYpMfehOBZbY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 272a7b9d87007..1255bdb1534af 100644 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qt5platform-plugins"; - version = "5.6.5"; + version = "5.6.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-DHgnfJTUw1hY53DmDfzVFM6Ff8q6pbNDPmPeSsV7MwY="; + sha256 = "sha256-EG5M4rcMK62DX4ywm2IH0lGHC510BnMqcefMlF9pyr8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 7c7b14b23e305..3cd8ef3ba313e 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lqzXTL9FZSk0UVzDRHo7iV6TP4YyTKkkNvZ93WPDqAI="; + sha256 = "MKG3OLZwvRJORiRo5nEYf8DbpbnuKvao69nnh0vzt34="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 4613df1caf319..1c244d089c634 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "44.0"; + version = "44.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-QdhfqwXEMImNv9hH5I4fW0k13Dy87lRudZqQftpnEFQ="; + sha256 = "sha256-4slj8jL+WhCR3MGL7CWnMOkbAq9uRmYB76VeUAzXTKs="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 32d1b6a072243..10a24bf2ff521 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-9+UIjBj9sIaQrgNL92oa6tWafc0Xsm4ffJl1SAUQoP0="; + hash = "sha256-0RB+r47hNai/8Yqv1dDtTomLEoQdBLmZxUHZ1LJO9iM="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index b9491a236dfd2..6fe8432826145 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.42.2"; + version = "0.42.3"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "FYHjkw9dOv4XSHLJawoc014UJ5VCUffnMs5iZlOBioc="; + sha256 = "D97CEoU36LVcPFQNCoDcfCSaspFT9L4Bl6XzECWlpaA="; }; patches = [ diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index a6349d4f138c2..1a24deeddb164 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "23.1.2"; + version = "23.2.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - hash = "sha256-vtzcKPOxmfEl8IF7/hNGfeZmX+AdrHydeYsyYuB1B4o="; + hash = "sha256-XxwB5C1NBjq6cjlfzYmvudH6dlItFYSU9dd5DwH7tH0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 1d67d0d7dcbb3..9be9a724b1f24 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.20"; + version = "1.4.21"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-PrKosbXZYp7mpQoqJLrm9hRV23XcthgVNu1UtvORfWo="; + hash = "sha256-yidDRKG0Lko+aqoCX7sBKsoOUOTEk3GX/gEx8oTCNSc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 2415a0a528f6a..11958148d879e 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "docformatter"; - version = "1.6.0"; + version = "1.6.2"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CzfJk8EkUKPGIJwaDC/IT4CDCJpQI7XEZFnH+RahURI="; + hash = "sha256-fQm+eMA1p7uCVgQ3Hbm3UY1mhROsThtgkjRRPg3XcsI="; }; patches = [ diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index e53b38d04e91f..6d6d596e80b4b 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -1,19 +1,25 @@ { lib +, atom , buildPythonPackage +, bytecode +, cppy , fetchFromGitHub -, setuptools-scm -, atom -, ply , kiwisolver +, pegen +, ply , qtpy +, setuptools +, setuptools-scm +, pythonOlder , sip_4 -, cppy -, bytecode }: buildPythonPackage rec { pname = "enaml"; version = "0.16.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nucleic"; @@ -22,6 +28,24 @@ buildPythonPackage rec { hash = "sha256-0W5FWGS4vu5+O6/C4El60QDsRNj+P4xGQ62NdkfJd5I="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + atom + bytecode + cppy + kiwisolver + pegen + ply + qtpy + sip_4 + ]; + # qt bindings cannot be found during tests doCheck = false; @@ -40,21 +64,10 @@ buildPythonPackage rec { "enaml.workbench" ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - atom - ply - kiwisolver - qtpy - sip_4 - cppy - bytecode - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - meta = with lib; { - homepage = "https://github.com/nucleic/enaml"; description = "Declarative User Interfaces for Python"; + homepage = "https://github.com/nucleic/enaml"; + changelog = "https://github.com/nucleic/enaml/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ raboof ]; }; diff --git a/pkgs/development/python-modules/pegen/default.nix b/pkgs/development/python-modules/pegen/default.nix new file mode 100644 index 0000000000000..bc88e02a642e4 --- /dev/null +++ b/pkgs/development/python-modules/pegen/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pegen"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "we-like-parsers"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-5nxOMgkDAkHtVFSNXf0SPoag6/E7b97eVnFoAqyJE3g="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pegen" + ]; + + meta = with lib; { + description = "Library to generate PEG parsers"; + homepage = "https://github.com/we-like-parsers/pegen"; + changelog = "https://github.com/we-like-parsers/pegen/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 908fb0c8a0ae0..a9d95e8e45a57 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.5"; + version = "0.7.7"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Husvo+JUM1ffCpN6cAxbZ2GyqlKEQArtRiBkcP5cC+U="; + hash = "sha256-j0mxWXwPbjD/W2wdqh17L0FP2eREI8IusLL9cuySGAY="; }; nativeBuildInputs = [ @@ -34,20 +34,21 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyroute2" - "pr2modules.common" - "pr2modules.config" - "pr2modules.ethtool" - "pr2modules.ipdb" - "pr2modules.ipset" - "pr2modules.ndb" - "pr2modules.nftables" - "pr2modules.nslink" - "pr2modules.protocols" + "pyroute2.common" + "pyroute2.config" + "pyroute2.ethtool" + "pyroute2.ipdb" + "pyroute2.ipset" + "pyroute2.ndb" + "pyroute2.nftables" + "pyroute2.nslink" + "pyroute2.protocols" ]; meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; + changelog = "https://github.com/svinota/pyroute2/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ fab mic92 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index a0855cd3f0f70..61f1477c7c51e 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchFromGitHub , aiohttp +, async-timeout +, orjson , pythonOlder , requests , websocket-client @@ -10,7 +12,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.11.1"; + version = "0.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,15 +21,18 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-lfqQelAHh/xJH1jPz3JK32AIEA7ghUP6Mnya2M34V/w="; + hash = "sha256-i6XI6hiQTOGHB4KcDgz/MlYAhdEKaElLfNMq2R0fgu8="; }; postPatch = '' - sed -i '/download_url/d' setup.py + substituteInPlace setup.py \ + --replace "{{VERSION_PLACEHOLDER}}" "${version}" ''; propagatedBuildInputs = [ aiohttp + async-timeout + orjson requests websocket-client websockets diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index d2db80dbd383e..9a68f24a04402 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,17 +1,18 @@ { lib , buildPythonPackage , fetchFromGitHub -, pbr +, flit-core +, flit-scm , pytestCheckHook , pythonOlder -, setuptools-scm }: buildPythonPackage rec { pname = "ssdp"; version = "1.1.1"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "codingjoe"; @@ -22,29 +23,28 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - setuptools-scm - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" + ''; - buildInputs = [ - pbr + nativeBuildInputs = [ + flit-core + flit-scm ]; nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" \ - --replace "--cov=ssdp" "" - ''; - - pythonImportsCheck = [ "ssdp" ]; + pythonImportsCheck = [ + "ssdp" + ]; meta = with lib; { description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)"; homepage = "https://github.com/codingjoe/ssdp"; + changelog = "https://github.com/codingjoe/ssdp/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 7085f0fe703b9..3a51416cadc23 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "5.2.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pDcrna+DEtgjaaqmSZcpem8Ea8B8oJ91159ayAkztBQ="; + hash = "sha256-cr2nv5vnUo4bl6W7rLBxbN9qDJWXsT/b+jZM7DwTBxM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 56af48f6403ee..2b9076ae60430 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "tablib"; - version = "3.3.0"; - format = "setuptools"; + version = "3.4.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EeAqb4HSVuBmaHfYOXly0QMCMHpUwE/XFX6S+vdAyxA="; + hash = "sha256-d+qX+vb5Kn4ZjAW9DGkPPLpXuD6kWmNrcvlny2/m8WA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 0614f375a3a9b..6cd8e7faa1e13 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "titlecase"; - version = "2.3"; + version = "2.4"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ppannuto"; repo = "python-titlecase"; - rev = "v${version}"; - sha256 = "169ywzn5wfzwyknqavspkdpwbx31nycxsxkl7iywwk71gs1lskkw"; + rev = "refs/tags/v${version}"; + hash = "sha256-aJbbfNnQvmmYPXVOO+xx7ADetsxE+jnVQOVDzV5jUp8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 4340c9a549572..615eb49ae6c2d 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.150"; + version = "2.3.192"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AgYI3V5xJT6LEZYrJV8nO/86MMp5deuTdLhnUHdrge4="; + hash = "sha256-vTn6Fum47wpgpICyiL+s6azhAgqzLj2w7wntypsatiU="; }; patches = [ @@ -116,8 +116,8 @@ buildPythonApplication rec { # Tests are comparing console output "cli" "console" - # Starting to fail after 2.3.96 - "test_runner_verify_secrets_skip" + # Starting to fail after 2.3.192 + "test_non_multiline_pair" ]; disabledTestPaths = [ diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 7c09718fd9519..146d10b2438bb 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.46.0"; + version = "0.46.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-ne/i8LLNCo5Kg0xAL/ZexR5uRmZLXcgZ6yZNT5vSYb0="; + hash = "sha256-oMf1uUD+7z42Z6bfMxNCWNFu/WwdEqBocVbbfe2OPbo="; }; - vendorHash = "sha256-K+/xJ9ei+LyWodubRw5mFzi4U1V1MB5h4nUuPrTASBY="; + vendorHash = "sha256-1S3my0/77LiiGZDemVrYzN1jMcZdTyd404y67euraeI="; doCheck = false; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 6edf64e695fa3..18ade20a4fe8e 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.17.17"; + version = "0.17.18"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-UPY/edmriacHqQ030nvYsuRj6OwdazFbsCs1oHAahaU="; + hash = "sha256-RiVyPqQzww5Iw24XI6Dmeh2RqTRQOkmalPjKvl3Nyg4="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/development/tools/jd-diff-patch/default.nix index ad7f7fad3cc6a..a322ad52ddf46 100644 --- a/pkgs/development/tools/jd-diff-patch/default.nix +++ b/pkgs/development/tools/jd-diff-patch/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "jd-diff-patch"; - version = "1.6.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "josephburnett"; repo = "jd"; rev = "v${version}"; - sha256 = "sha256-Ti7eElLplnYGP7v1VuGpyeZ3ZIau6Ffx4ACMBDIBROw="; + sha256 = "sha256-fi+vj1vHhgw2OPQqQ0827P6Axy/cio0UVFLeD/nhFvw="; }; # not including web ui excludedPackages = [ "gae" "pack" ]; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Commandline utility and Go library for diffing and patching JSON values"; diff --git a/pkgs/development/tools/language-servers/dot-language-server/default.nix b/pkgs/development/tools/language-servers/dot-language-server/default.nix index efaca2119b50b..ef42edeec9d9c 100644 --- a/pkgs/development/tools/language-servers/dot-language-server/default.nix +++ b/pkgs/development/tools/language-servers/dot-language-server/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "dot-language-server"; - version = "1.1.26"; + version = "1.1.27"; src = fetchFromGitHub { owner = "nikeee"; repo = "dot-language-server"; rev = "v${version}"; - hash = "sha256-Wv+Bw+mcc4vn1CfjIy5vAg5Kw7TUf+flcqLguvQVaCQ="; + hash = "sha256-Dha6S+qc9rwPvxUkBXYUomyKckEcqp/ESU/24GkrmpA="; }; - npmDepsHash = "sha256-w7c6f+VlBx2kvLyEWgbT9S0hA7mu5gCNuQzGThkXAGY="; + npmDepsHash = "sha256-nI8xPCTZNqeGW4I99cDTxtVLicF1MEIMTPRp7O0bFE4="; npmBuildScript = "compile"; diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix index e640209e9f64b..8a75ecafe9548 100644 --- a/pkgs/development/tools/misc/phpunit/default.nix +++ b/pkgs/development/tools/misc/phpunit/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { homepage = "https://phpunit.de"; changelog = "https://github.com/sebastianbergmann/phpunit/blob/${version}/ChangeLog-${lib.versions.majorMinor version}.md"; maintainers = with maintainers; [ onny ] ++ teams.php.members; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix index ae3e0f1631533..5e8d5c504f735 100644 --- a/pkgs/development/tools/rust/cargo-careful/default.nix +++ b/pkgs/development/tools/rust/cargo-careful/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.2.4"; + version = "0.3.2"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-kKF/Fp6RCF9PUdgqeo2e4vLVhl8+5M4oa0Q18ZdXJRc="; + hash = "sha256-+rj9f4uCNDWwX+0Dsr7dwoeQunvsniG61+W9ehs0KDY="; }; - cargoHash = "sha256-rhTi4rHfU+ZgNAMXSX7r5k3NfMUPNjHIUDs6FzeqcWk="; + cargoHash = "sha256-dxb+euJ5PCdDjfne+iUTgsdOSt2HLiItHrVwHx4588c="; meta = with lib; { description = "A tool to execute Rust code carefully, with extra checking along the way"; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 03fbd4dd31e21..6d35e4d3ab8a2 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -5,26 +5,25 @@ , pkg-config , openssl # darwin dependencies -, Security -, CoreFoundation +, darwin , libiconv , curl }: rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-PrrhxY+Hk1XfdV0u4GgIsbo8oNOFnqbCeivY2Ix6g+k="; + sha256 = "sha256-rGZJyCWGk2RUr52ICp4dVER3JMBrnLdOMusRm/GG2PE="; }; - cargoHash = "sha256-D3upXhKFkuZfEVOPJ9mCwoZkbkX9s2MltyTkKcBvb6I="; + cargoHash = "sha256-B6Ka35y2fJEDVd891P60TNppr5HGFnzVjLhhfoFCYUA="; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ]; + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]); nativeBuildInputs = [ pkg-config ] # curl-sys wants to run curl-config on darwin ++ lib.optionals stdenv.isDarwin [ curl.dev ]; @@ -37,9 +36,8 @@ rustPlatform.buildRustPackage rec { "--skip serialize_test2_report" "--skip serialize_test3_report" "--skip serialize_test6_report" - "--skip test_package::case_2" - "--skip test_package::case_3" - "--skip test_package::case_6" + # multiple test cases that time-out or cause memory leaks + "--skip test_package" "--skip test_package_update_readme::case_2" "--skip test_package_update_readme::case_3" "--skip test_package_update_readme::case_5" diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 1808440ab33a4..64d6e70a0f50f 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -1,18 +1,18 @@ { stdenv , lib -, fetchzip +, fetchCrate , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.16"; + version = "0.5.17"; - src = fetchzip { - url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-aVvYQ9/04juse89EzYY6f9HEwRHjZxbDnuJpX6jzlbc="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-kU8Wq0BRE/Tajmi/PV6dja9HJy0lbZwzGuMIXDnFUw0="; }; - cargoSha256 = "sha256-dxKtOWhHSZdr5RNQ+w+CXFHN+oQXUmSQ7w9i9IO7Q6I="; + cargoSha256 = "sha256-Zv6CkUhMTMqGM8PH+ciDV20vq88tU5THSw0NByO1v70="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 1662e6a198a9a..b68634b80bc3b 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,30 +2,30 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.77.tar.xz", + "name": "factorio_alpha_x64-1.1.81.tar.xz", "needsAuth": true, - "sha256": "1qcjp51sykq0ygq4j4zih3yp1x517b2j54xfyi8g4minfk57zwk9", + "sha256": "0a8wql8lqlf7jd2bgsgqvkl62jz4gym03iwccif4xc5y1f8sqh32", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.77/alpha/linux64", - "version": "1.1.77" + "url": "https://factorio.com/get-download/1.1.81/alpha/linux64", + "version": "1.1.81" }, "stable": { - "name": "factorio_alpha_x64-1.1.76.tar.xz", + "name": "factorio_alpha_x64-1.1.80.tar.xz", "needsAuth": true, - "sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p", + "sha256": "084j0vb3xp57c0i01jqfxnp8ky6c9rid5yx96l8jqg51071wai6g", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.76/alpha/linux64", - "version": "1.1.76" + "url": "https://factorio.com/get-download/1.1.80/alpha/linux64", + "version": "1.1.80" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.76.tar.xz", + "name": "factorio_demo_x64-1.1.81.tar.xz", "needsAuth": false, - "sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj", + "sha256": "1rj6bcir4jjs23yh07w64rygf67xkpsvgi6byxmrhcv5pi1vavgj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.76/demo/linux64", - "version": "1.1.76" + "url": "https://factorio.com/get-download/1.1.81/demo/linux64", + "version": "1.1.81" }, "stable": { "name": "factorio_demo_x64-1.1.76.tar.xz", @@ -38,20 +38,20 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.77.tar.xz", + "name": "factorio_headless_x64-1.1.81.tar.xz", "needsAuth": false, - "sha256": "1ygzlr26bp7l9znbjyqj7il6yq9faxjfr6cvfqbs8ls66qiv0ls6", + "sha256": "1ibz80bc45lasmy46657awq002gs93nzgirli7zrwcdps50d7vbl", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.77/headless/linux64", - "version": "1.1.77" + "url": "https://factorio.com/get-download/1.1.81/headless/linux64", + "version": "1.1.81" }, "stable": { - "name": "factorio_headless_x64-1.1.76.tar.xz", + "name": "factorio_headless_x64-1.1.80.tar.xz", "needsAuth": false, - "sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94", + "sha256": "0db6g50gwcq2lwlgagc7in12wag6siwcldlq367x2h0d2q0rxj36", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.76/headless/linux64", - "version": "1.1.76" + "url": "https://factorio.com/get-download/1.1.80/headless/linux64", + "version": "1.1.80" } } } diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index ea8ba9d042bcb..1ec3b6905a657 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,32 +1,71 @@ -{ lib, stdenv, fetchurl, makeWrapper -, pkg-config, intltool -, perl, perlPackages, gettext, libX11, libXext, libXi, libXt -, libXft, libXinerama, libXrandr, libXxf86vm, libGL, libGLU, gle -, gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam -, systemd, coreutils +{ lib +, stdenv +, fetchurl +, coreutils +, gdk-pixbuf +, gdk-pixbuf-xlib +, gettext +, gle +, gtk3 +, intltool +, libGL +, libGLU +, libX11 +, libXext +, libXft +, libXi +, libXinerama +, libXrandr +, libXt +, libXxf86vm +, libxml2 +, makeWrapper +, pam +, perlPackages +, pkg-config +, systemd , forceInstallAllHacks ? false , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: -stdenv.mkDerivation rec { - version = "6.04"; +stdenv.mkDerivation (finalAttrs: { pname = "xscreensaver"; + version = "6.06"; src = fetchurl { - url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-eHAUsp8MV5Pswtk+EQmgSf9IqwwpuFHas09oPO72sVI="; + url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz"; + hash = "sha256-9TT6uFqDbeW4vo6R/CG4DKfWpO2ThuviB9S+ek50mac="; }; nativeBuildInputs = [ - pkg-config intltool makeWrapper + intltool + makeWrapper + pkg-config ]; buildInputs = [ - perl gettext libX11 libXext libXi libXt - libXft libXinerama libXrandr libXxf86vm libGL libGLU gle - gtk2 gdk-pixbuf gdk-pixbuf-xlib libxml2 pam - perlPackages.LWPProtocolHttps perlPackages.MozillaCA - ] ++ lib.optional withSystemd systemd; + gdk-pixbuf + gdk-pixbuf-xlib + gettext + gle + gtk3 + libGL + libGLU + libX11 + libXext + libXft + libXi + libXinerama + libXrandr + libXt + libXxf86vm + libxml2 + pam + perlPackages.LWPProtocolHttps + perlPackages.MozillaCA + perlPackages.perl + ] + ++ lib.optional withSystemd systemd; preConfigure = '' # Fix installation paths for GTK resources. @@ -45,10 +84,11 @@ stdenv.mkDerivation rec { for bin in $out/bin/*; do wrapProgram "$bin" \ --prefix PATH : "$out/libexec/xscreensaver" \ - --prefix PATH : "${lib.makeBinPath [ coreutils perl ]}" \ + --prefix PATH : "${lib.makeBinPath [ coreutils perlPackages.perl ]}" \ --prefix PERL5LIB ':' $PERL5LIB done - '' + lib.optionalString forceInstallAllHacks '' + '' + + lib.optionalString forceInstallAllHacks '' make -j$NIX_BUILD_CORES -C hacks/glx dnalogo cat hacks/Makefile.in \ | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks @@ -60,9 +100,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.unix; # Once had cygwin problems downloadPage = "https://www.jwz.org/xscreensaver/download.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 81c1c801f96fd..4b4f4f808547d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -100,6 +100,10 @@ , withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" && (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") # assumes hard floats && !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 + # buildPackages.targetPackages.llvmPackages is the same as llvmPackages, + # but we do it this way to avoid taking llvmPackages as an input, and + # risking making it too easy to ignore the above comment about llvmPackages. + && lib.meta.availableOn stdenv.hostPlatform buildPackages.targetPackages.llvmPackages.compiler-rt , withLibidn2 ? true , withLocaled ? true , withLogind ? true diff --git a/pkgs/servers/geospatial/mapserver/default.nix b/pkgs/servers/geospatial/mapserver/default.nix index ac8af5b7de0c6..d131d331c763f 100644 --- a/pkgs/servers/geospatial/mapserver/default.nix +++ b/pkgs/servers/geospatial/mapserver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mapserver"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-t9tthHszqtbFEh50IhQMtBb9rD9tU3QbDlUsVRVkQ6U="; + sha256 = "sha256-fAf4kOe/6bQW0i46+EZbD/6iWI2Bjkn2no6XeR/+mg4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index a116c7a4ddc86..fc6fb31561764 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-6T4wWuhikanoQGGjVvNJak5yvgcEfhGtOmfLc2xKmms="; + hash = "sha256-6T4wWuhikanoQGGjVvNJak5yvgcEfhGtOmfLc2xKmms="; }; - vendorSha256 = "sha256-+JxS4Q6rTpdBwms2nkVDY/Kluv2qu2T0BaOIjfeX85M="; + vendorHash = "sha256-+JxS4Q6rTpdBwms2nkVDY/Kluv2qu2T0BaOIjfeX85M="; ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index a12049e6fea72..d3944f63871c0 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-yh617C99WSi//3YBIim5QLJTh8KgVcMkgG6AqRJYVvA="; + hash = "sha256-Nd73GQJUYkFMyvMLAUgu/LQuDEW74s9+YKwqnftPoPM="; }; vendorHash = "sha256-V9Y+dZv3RKiyzGJB1o4+M4QQeRpBkCtJOr2zyjTCKTY="; diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index a6a4eea245a19..be18edfe46d99 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, help2man , installShellFiles , pkg-config , bzip2 diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/tools/graphics/sic-image-cli/default.nix index e3fbcf438857a..c121cf2406c06 100644 --- a/pkgs/tools/graphics/sic-image-cli/default.nix +++ b/pkgs/tools/graphics/sic-image-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sic-image-cli"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "foresterre"; repo = "sic"; rev = "v${version}"; - sha256 = "sha256-JSBvHbqGTwjiKRPuomXtFLgu77ZB4bOlV/JgzIxaWC0="; + sha256 = "sha256-ZKxBanCfPBo5k1EI/cJKpHiWF7M1blZdchWy3DMHrnQ="; }; - cargoSha256 = "sha256-HWnYBLxiz7Kd5rmgTFeIG8XtiRzhRKuo/vunJRPLdWU="; + cargoSha256 = "sha256-cj9UAPwgj4ZT+ReZWi9hOBNicMBOt9qdveYYF5CFapw="; nativeBuildInputs = [ installShellFiles nasm ]; diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 432c59bd02a37..87eb76030e062 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.5.1"; + version = "1.3.5.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-QxRtslteGb45xlLclyg5i5+w2+QGTgieAJeqjjCvaIA="; + hash = "sha256-79N0DX+yQhTuAhspBmeqM/iFQpJ1LabKyFfzHoLLbeg="; }; outputs = [ "out" "lib" ]; @@ -151,6 +151,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Khronos Vulkan Conformance Tests"; homepage = "https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/vulkancts/README.md"; + changelog = "https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/${finalAttrs.pname}-${finalAttrs.version}"; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; }; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 7df58d84b8192..d045dc1f67a8c 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "2.0.11"; + version = "2.1.1"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-/LkQnS3NMvZf0yP6X32sayXvUDd0et5VkCWvJe4GboI="; + sha256 = "sha256-l0kl+4ISrfT9rQlvCs3GSJfQAqGwxhYmcqn3USl9Ewo="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/networking/phantomsocks/default.nix b/pkgs/tools/networking/phantomsocks/default.nix new file mode 100644 index 0000000000000..fc8fef3a14b88 --- /dev/null +++ b/pkgs/tools/networking/phantomsocks/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "phantomsocks"; + version = "unstable-2023-04-05"; + + src = fetchFromGitHub { + owner = "macronut"; + repo = pname; + rev = "a54ae9f3611e8623f89e69273f2ded7f7c0a7abf"; + hash = "sha256-ytTLwKlwbaiSWDRZBkOV7Hrl5ywWzLbv/fJ7nVlD++E="; + }; + + vendorHash = "sha256-c0NQfZuMMWz1ASwFBcpMNjxZwXLo++gMYBiNgvT8ZLQ="; + + meta = with lib;{ + homepage = "https://github.com/macronut/phantomsocks"; + description = "A cross-platform proxy client/server for Linux/Windows/macOS"; + longDescription = '' + A cross-platform proxy tool that could be used to modify TCP packets + to implement TCB desync to bypass detection and censoring. + ''; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ oluceps ]; + }; +} diff --git a/pkgs/tools/networking/tun2socks/default.nix b/pkgs/tools/networking/tun2socks/default.nix index 7706ff8e8886c..2dfbba299dee3 100644 --- a/pkgs/tools/networking/tun2socks/default.nix +++ b/pkgs/tools/networking/tun2socks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tun2socks"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "xjasonlyu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FBYRqxS8DJbIc8j8X6WNxl6a1YRcNrPSnNfrq/Y0fMM="; + sha256 = "sha256-uu0FBhckZ06eXEEuKwN3MopGMDbMjjcABYa/lgM48n4="; }; - vendorSha256 = "sha256-XWzbEtYd8h63QdpAQZTGxyxMAAnpKO9Fp4y8/eeZ7Xw="; + vendorHash = "sha256-QIXgRoxmJaeYGx77EB53zIb94InlQbUSOXE+cUdBttI="; ldflags = [ "-w" "-s" "-buildid=" diff --git a/pkgs/tools/networking/whatip/default.nix b/pkgs/tools/networking/whatip/default.nix index c3e5a29f60491..735936a4da41f 100644 --- a/pkgs/tools/networking/whatip/default.nix +++ b/pkgs/tools/networking/whatip/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "whatip"; - version = "1.1"; + version = "1.2"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GabMus"; repo = pname; rev = version; - hash = "sha256-ltimqdFTvvjXtvLC5jAdRaNX15i2Ww5mB3DIr4r9Yzg="; + hash = "sha256-gt/NKgnCpRoVmLvEJJq2geng4miM2g+YhXYEOm5pPTA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index fcd1487dfb5dd..bb71c3134d88c 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EzdyJzUPoWcLux6RiEZL3DiB65T+pgY70bpD1fX1JN4="; + hash = "sha256-w0ZOkPw8Y6Z1hyZecZfjd/YrTP8v6S0jNhgNzLjMRrY="; }; - vendorHash = "sha256-yTndvnlCmXsQSpImcwuwSXB0WuF2naGJEHfU1iAJApM="; + vendorHash = "sha256-0WkOIgIA1fKn2SeS5QFeLGCGMstdlkU+eDRUVAs3ETA="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e296abe639285..8aca756206a50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16148,9 +16148,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; - cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { - inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; - }; + cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { }; cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { inherit (darwin.apple_sdk.frameworks) AppKit; @@ -32977,6 +32975,8 @@ with pkgs; pfsshell = callPackage ../tools/misc/pfsshell { }; + phantomsocks = callPackage ../tools/networking/phantomsocks { }; + photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a784017465ce..f6af5c709edb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7191,6 +7191,8 @@ self: super: with self; { peaqevcore = callPackage ../development/python-modules/peaqevcore { }; + pegen = callPackage ../development/python-modules/pegen { }; + pebble = callPackage ../development/python-modules/pebble { }; pecan = callPackage ../development/python-modules/pecan { }; |