diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-15 00:02:51 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-15 00:02:51 +0000 |
commit | 604991674d3921284607cd13a4969bb6382aca65 (patch) | |
tree | c6968be3adae75fce690241757f9345947698098 /pkgs | |
parent | 08b62a0025ee9331067d6f4c478699e6a82bd33d (diff) | |
parent | 537907d90e7272b65756a6e8261264bee5465b3c (diff) | |
download | nixlib-604991674d3921284607cd13a4969bb6382aca65.tar nixlib-604991674d3921284607cd13a4969bb6382aca65.tar.gz nixlib-604991674d3921284607cd13a4969bb6382aca65.tar.bz2 nixlib-604991674d3921284607cd13a4969bb6382aca65.tar.lz nixlib-604991674d3921284607cd13a4969bb6382aca65.tar.xz nixlib-604991674d3921284607cd13a4969bb6382aca65.tar.zst nixlib-604991674d3921284607cd13a4969bb6382aca65.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
37 files changed, 261 insertions, 118 deletions
diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index cbd704a24a91..6033843e4aeb 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "icon-library"; - version = "0.0.17"; + version = "0.0.18"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/8c4cad88809cd4ddc0eeae6f5170c001/icon-library-${version}.tar.xz"; - hash = "sha256-Gspx3fJl+ZoUN3heGWaeMuxUsjWCrIdg4pJj7DeMTSY="; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/874b27fcf34662d9686f670d406142c2/icon-library-${version}.tar.xz"; + hash = "sha256-qCGwTePA817mulFjyRZKw+Fw1S77+QTtA7WH+KocL48="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 59fe59e910fb..fd5fb779517c 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -13,6 +13,7 @@ , libspiro , lua5 , qtbase +, qtsvg , texliveSmall , wrapQtAppsHook , zlib @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { libspiro lua5 qtbase + qtsvg zlib ] ++ (lib.optionals withTeXLive [ texliveSmall diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index c231febabd60..c1d893e0cff9 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -201,6 +201,8 @@ def print_updates(channels_old, channels_new): channels = {} last_channels = load_as_json(PIN_PATH) +src_hash_cache = {} + print(f'GET {RELEASES_URL}', file=sys.stderr) with urlopen(RELEASES_URL) as resp: @@ -240,13 +242,27 @@ with urlopen(RELEASES_URL) as resp: google_chrome_suffix = channel_name try: - channel['hash'] = prefetch_src_sri_hash( - channel_name_to_attr_name(channel_name), - release["version"] - ) + version = release["version"] + existing_releases = dict(map(lambda channel: (channel[1]['version'], channel[1]['hash']), last_channels.items())) + + if version in src_hash_cache: + print(f'Already got hash {src_hash_cache[version]} for {version}, skipping FOD prefetch for {channel_name_to_attr_name(channel_name)}') + + channel["hash"] = src_hash_cache[version] + elif version in existing_releases: + print(f'Already got hash {existing_releases[version]} for {version} (from upstream-info.nix), skipping FOD prefetch for {channel_name_to_attr_name(channel_name)}') + + channel["hash"] = existing_releases[version] + else: + channel["hash"] = prefetch_src_sri_hash( + channel_name_to_attr_name(channel_name), + version + ) + src_hash_cache[version] = channel["hash"] + channel['hash_deb_amd64'] = nix_prefetch_url( f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + - f'google-chrome-{google_chrome_suffix}_{release["version"]}-1_amd64.deb') + f'google-chrome-{google_chrome_suffix}_{version}-1_amd64.deb') except subprocess.CalledProcessError: # This release isn't actually available yet. Continue to # the next one. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 00a9e8af67e3..6711701fe3f9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,9 +15,9 @@ version = "2023-11-28"; }; }; - hash = "sha256-mncN1Np/70r0oMnJ4oV7PU6Ivi5AiRar5O2G8bNdwY8="; - hash_deb_amd64 = "sha256-t/5Mx3P3LaH/6GjwMFP+lVoz7xq7jqAKYxLqlWBnwIE="; - version = "121.0.6167.160"; + hash = "sha256-mLXBaW4KBieOiz2gRXfgA/KPdmUnNlpUIOqdj7CywcY="; + hash_deb_amd64 = "sha256-UDgO1sJ7bggFTe7C36CnHYXjG9rM+ZqFCOzNyIDpQ0Y="; + version = "121.0.6167.184"; }; ungoogled-chromium = { deps = { @@ -28,12 +28,12 @@ version = "2023-11-28"; }; ungoogled-patches = { - hash = "sha256-qwMQoJEJxNjDEdqzSMBTozv8+wl+SbBmzIm/VbiGxKw="; - rev = "121.0.6167.160-1"; + hash = "sha256-nJDLCVynuGFRIjLBV0NmC0zHeEDHjzFM16FKAv2QyNY="; + rev = "121.0.6167.184-1"; }; }; - hash = "sha256-mncN1Np/70r0oMnJ4oV7PU6Ivi5AiRar5O2G8bNdwY8="; - hash_deb_amd64 = "sha256-t/5Mx3P3LaH/6GjwMFP+lVoz7xq7jqAKYxLqlWBnwIE="; - version = "121.0.6167.160"; + hash = "sha256-mLXBaW4KBieOiz2gRXfgA/KPdmUnNlpUIOqdj7CywcY="; + hash_deb_amd64 = "sha256-UDgO1sJ7bggFTe7C36CnHYXjG9rM+ZqFCOzNyIDpQ0Y="; + version = "121.0.6167.184"; }; } diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 58cb1c6a71b6..847ab81241b4 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.11.1"; + version = "3.12.0"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - hash = "sha256-gskFI6nxRb5lx6EwWuqghqg7NmCaj0JS7PpV0i4qUqQ="; + hash = "sha256-77vsl7BvptNlU/1epn4Eo+3Lnedn5awUgqbkyapW7+A="; }; patches = [ diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 1852ef3ff1c8..77b57e08e2bb 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc"; + hardeningDisable = [ "format" ]; + # workaround wrong library IDs postInstall = lib.optionalString stdenv.isDarwin '' ln -sv "$out/lib/xfitter/"* "$out/lib/" diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 00acdef9b7ab..71ac28ca749d 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -1,13 +1,13 @@ { lib , callPackage , pkg-config -, gcc13Stdenv +, stdenv , hyprland }: let mkHyprlandPlugin = args@{ pluginName, ... }: - gcc13Stdenv.mkDerivation (args // { + stdenv.mkDerivation (args // { pname = "${pluginName}"; nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ]; buildInputs = [ hyprland ] diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 05a1a6fbbdaf..3f61ecdb2a46 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -923,6 +923,7 @@ rec { --sort name \ --exclude=./proc \ --exclude=./sys \ + --exclude=.${builtins.storeDir} \ --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ --hard-dereference \ -cf $out/layer.tar . diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 5784e650dc2e..88f36d337f25 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -639,6 +639,20 @@ rec { includeStorePaths = false; }; + helloOnRootNoStoreFakechroot = pkgs.dockerTools.streamLayeredImage { + name = "hello"; + tag = "latest"; + contents = [ + (pkgs.buildEnv { + name = "hello-root"; + paths = [ pkgs.hello ]; + }) + ]; + config.Cmd = [ "hello" ]; + includeStorePaths = false; + enableFakechroot = true; + }; + etc = let inherit (pkgs) lib; diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 4e979fa2cdad..b5cee2033ddd 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "310.2"; + version = "311"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-VaH34UT8kXKZbRPTNvL1afeONb3n6vK0UB1UgWeNRWY="; + hash = "sha256-RsOLYvwLu0eNmSZJoCi1dcB2a3JqMbus/gOyL74kCB4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index ac3758584662..f2c22d54ade8 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -7,17 +7,17 @@ let pname = "mqttx"; - version = "1.9.8"; + version = "1.9.9"; suffixedUrl = suffix: "https://github.com/emqx/MQTTX/releases/download/v${version}/MQTTX-${version}${suffix}.AppImage"; sources = { "aarch64-linux" = fetchurl { url = suffixedUrl "-arm64"; - hash = "sha256-pdR9LwWgFdO0Dtn7ByyYKpLrfoBnl75TzQ31aIAJ/gs="; + hash = "sha256-mCCRvLS6diKoKYZNUMsyiWyFWmyYYB0pAxNT0yriJHI="; }; "x86_64-linux" = fetchurl { url = suffixedUrl ""; - hash = "sha256-XHAroiFuUcK0aUleNDskI1bfVX7HfTvIvSup9gKJj1w="; + hash = "sha256-InGfGiT3c5M8ueFZl5/hFmYRPeXnwSCUPhAqmz0jsU8="; }; }; diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index 3f2002a0da4a..d94b143a0c0e 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -5,16 +5,19 @@ php.buildComposerProject (finalAttrs: { pname = "phpdocumentor"; - version = "3.4.1"; + version = "3.4.3"; src = fetchFromGitHub { owner = "phpDocumentor"; repo = "phpDocumentor"; rev = "v${finalAttrs.version}"; - hash = "sha256-fNjix3pJDRCTWM3Xtn+AtZe4RJfgQ60kiJB9J9tC5t4="; + hash = "sha256-NCBCwQ8im6ttFuQBaG+bzmtinf+rqNnbogcK8r60dCM="; }; - vendorHash = "sha256-rsBg2EHbvYLVr6haN1brHZFVjLDaxqdkNWf0HL3Eoy0="; + vendorHash = "sha256-/TJ/CahmOWcRBlAsJDzWcfhlDd+ypRapruFT0Dvlb1w="; + + # Needed because of the unbound version constraint on phpdocumentor/json-path + composerStrictValidation = false; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix index 3caf4f7ee5b4..7310488376dd 100644 --- a/pkgs/by-name/ro/robo/package.nix +++ b/pkgs/by-name/ro/robo/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "robo"; - version = "4.0.4"; + version = "4.0.6"; src = fetchFromGitHub { owner = "consolidation"; repo = "robo"; rev = finalAttrs.version; - hash = "sha256-4sQc3ec34F5eBy9hquTqmzUgvFCTlml3LJdP39gPim4="; + hash = "sha256-rpCs24Q15XM4BdW1+IfysFR/8/ZU4o5b4MyJL48uDaU="; }; - vendorHash = "sha256-QX7AFtW6Vm9P0ABOuTs1U++nvWBzpvtxhTbK40zDYqc="; + vendorHash = "sha256-Ul8XjH0Nav37UVpNQslOkF2bkiyqUAEZiIbcSW2tGkQ="; meta = { changelog = "https://github.com/consolidation/robo/blob/${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/by-name/ti/tilix/package.nix index 65da21cbabc7..2e0bdad0be8c 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/by-name/ti/tilix/package.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -16,18 +17,17 @@ , libunwind , appstream , nixosTests -, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tilix"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = version; - sha256 = "sha256-sPVL5oYDOmloRVm/nONKkC20vZc907c7ixBF6E2PQ8Y="; + rev = finalAttrs.version; + hash = "sha256-KP0ojwyZ5FaYKW0nK9mGGAiz1h+gTbfjCUDCgN2LAO8="; }; # Default upstream else LDC fails to link @@ -56,15 +56,6 @@ stdenv.mkDerivation rec { libunwind ]; - patches = [ - # https://github.com/gnunn1/tilix/issues/2151 - (fetchpatch { - name = "tilix-replace-std-xml-with-gmarkup.patch"; - url = "https://github.com/gnunn1/tilix/commit/b02779737997a02b98b690e6f8478d28d5e931a5.patch"; - hash = "sha256-6p+DomJEZ/hCW8RTjttKsTDsgHZ6eFKj/71TU5O/Ysg="; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py @@ -81,8 +72,8 @@ stdenv.mkDerivation rec { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = "https://gnunn1.github.io/tilix-web"; license = licenses.mpl20; - maintainers = with maintainers; [ midchildan ]; + maintainers = with maintainers; [ midchildan jtbx ]; platforms = platforms.linux; mainProgram = "tilix"; }; -} +}) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index e29007a1876c..26c9efec448a 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , stdenvNoCC -, gcc13Stdenv , fetchFromGitHub , substituteAll , makeWrapper @@ -123,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio libnotify pipewire - gcc13Stdenv.cc.cc.lib + stdenv.cc.cc.lib ] ++ lib.optional withTTS speechd); in '' diff --git a/pkgs/data/themes/elegant-sddm/default.nix b/pkgs/data/themes/elegant-sddm/default.nix new file mode 100644 index 000000000000..eaf435089d71 --- /dev/null +++ b/pkgs/data/themes/elegant-sddm/default.nix @@ -0,0 +1,63 @@ +{ lib +, formats +, stdenvNoCC +, fetchFromGitHub +, qtgraphicaleffects + /* An example of how you can override the background with a NixOS wallpaper + * + * environment.systemPackages = [ + * (pkgs.elegant-sddm.override { + * themeConfig.General = { + background = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}"; + * }; + * }) + * ]; + */ +, themeConfig ? null +}: + +let + user-cfg = (formats.ini { }).generate "theme.conf.user" themeConfig; +in + +stdenvNoCC.mkDerivation { + pname = "elegant-sddm"; + version = "unstable-2024-02-08"; + + src = fetchFromGitHub { + owner = "surajmandalcell"; + repo = "Elegant-sddm"; + rev = "3102e880f46a1b72c929d13cd0a3fb64f973952a"; + hash = "sha256-yn0fTYsdZZSOcaYlPCn8BUIWeFIKcTI1oioTWqjYunQ="; + }; + + propagatedBuildInputs = [ + qtgraphicaleffects + ]; + + dontWrapQtApps = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/sddm/themes" + cp -r Elegant/ "$out/share/sddm/themes/Elegant" + '' + (lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/Elegant/theme.conf.user + '') + '' + runHook postInstall + ''; + + postFixup = '' + mkdir -p $out/nix-support + + echo ${qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages + ''; + + meta = with lib; { + description = "Sleek and stylish SDDM theme crafted in QML"; + homepage = "https://github.com/surajmandalcell/Elegant-sddm"; + license = licenses.gpl3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index c61a4dc96162..45b7e4caaf1d 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "libtheora"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { url = "https://github.com/xiph/theora/commit/28cc6dbd9b2a141df94f60993256a5fca368fa54.diff"; sha256 = "16jqrq4h1b3krj609vbpzd5845cvkbh3mwmjrcdg35m490p19x9k"; }) + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + ./mingw-remove-export.patch ]; configureFlags = [ "--disable-examples" ]; @@ -30,6 +32,6 @@ stdenv.mkDerivation rec { description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/libtheora/mingw-remove-export.patch b/pkgs/development/libraries/libtheora/mingw-remove-export.patch new file mode 100644 index 000000000000..bf0ffc07fc43 --- /dev/null +++ b/pkgs/development/libraries/libtheora/mingw-remove-export.patch @@ -0,0 +1,18 @@ +diff --git a/win32/xmingw32/libtheoradec-all.def b/win32/xmingw32/libtheoradec-all.def +index 566eeb3..4a2e766 100644 +--- a/win32/xmingw32/libtheoradec-all.def ++++ b/win32/xmingw32/libtheoradec-all.def +@@ -1,4 +1,3 @@ +-EXPORTS + ; Old alpha API + theora_version_string @ 1 + theora_version_number @ 2 +diff --git a/win32/xmingw32/libtheoraenc-all.def b/win32/xmingw32/libtheoraenc-all.def +index 36d2dad..d1da2f4 100644 +--- a/win32/xmingw32/libtheoraenc-all.def ++++ b/win32/xmingw32/libtheoraenc-all.def +@@ -1,4 +1,3 @@ +-EXPORTS + ; Old alpha API + theora_encode_init @ 1 + theora_encode_YUVin @ 2 diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 9cfc8683eca5..8a626f46181a 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchFromGitHub, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }: +{ lib, callPackage, fetchFromGitHub, fetchpatch, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }: php.buildComposerProject (finalAttrs: { # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to @@ -22,6 +22,18 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-KsTZi7dSlQcAxoen9rpofbptVdLYhK+bZeDSXQY7o5M="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-24821.patch"; + url = "https://github.com/composer/composer/commit/77e3982918bc1d886843dc3d5e575e7e871b27b7.patch"; + hash = "sha256-Q7gkPLf59+p++DpfJZeOrAOiWePuGkdGYRaS/rK+Nv4="; + excludes = [ + # Skipping test files, they are not included in the source tarball + "tests/*" + ]; + }) + ]; + nativeBuildInputs = [ makeBinaryWrapper ]; postInstall = '' diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index cdfb91d72042..577fddc3087b 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.2"; + version = "0.21.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-xJ5OuQXvccgEjzuMqa75+mv3MipgdsiHc9yjrZYoCow="; + hash = "sha256-tyDRHw3c5Kn9IXm5K7Qpn1xfmu5c3pb9D1mpeqo6SHg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lttng/default.nix b/pkgs/development/python-modules/lttng/default.nix new file mode 100644 index 000000000000..9cdb580fc474 --- /dev/null +++ b/pkgs/development/python-modules/lttng/default.nix @@ -0,0 +1,29 @@ +{ toPythonModule +, python +, lttng-tools +, swig2 +}: + +toPythonModule (lttng-tools.overrideAttrs ({ nativeBuildInputs ? [ ], configureFlags ? [ ], ... }: { + pname = "lttng"; + + nativeBuildInputs = nativeBuildInputs ++ [ swig2 ]; + + configureFlags = configureFlags ++ [ + "--enable-python-bindings" + # "--disable-bin-lttng" # The Python bindings depend on liblttng-ctl, which is only built when the binary is enabled. + "--disable-bin-lttng-consumerd" + "--disable-bin-lttng-crash" + "--disable-bin-lttng-relayd" + "--disable-bin-lttng-sessiond" + # "--disable-extras" # The Python bindings are an extra. + "--disable-man-pages" + ]; + + # Nix treats nativeBuildInputs specially for cross-compilation, but in this + # case, cross-compilation is accounted for explicitly. Using the variables + # ensures that the platform setup isn't messed with further. It also allows + # regular Python to be added in the future if it is ever needed. + PYTHON = "${python.pythonOnBuildForHost}/bin/python"; + PYTHON_CONFIG = "${python.pythonOnBuildForHost}/bin/python-config"; +})) diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index 4cd17ece484f..45c061ee439c 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.2.0"; + version = "1.2.1"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-nikQ/GFRWmYYzboc9TWIi9gd5kwgCxOLhvIEQWusFik="; + outputHash = "sha256-L/ltoLlr4TdsDYwYtaCs6+Q2yTiyzoa2GQ3VK28AlzE="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index ef8ea595eb2c..e5551dc29c55 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -20,8 +20,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.19.0"; - sha256 = "sha256-9StBryBZapq9jtdSQYN+xDlFRoIhRIu/hBNh4gkYGbY="; + version = "18.19.1"; + sha256 = "sha256-CQ+WouzeCAtrOCxtZCvKXQvkcCp4y1Vb578CsgvRbe0="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index d1a75dcdf7e5..5b75793e8f69 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.11.0"; - sha256 = "sha256-MYB+vu6wScU/F2XkqVrtaUdqS2lt0QDLU5q2aNeVC0A="; + version = "20.11.1"; + sha256 = "sha256-d4E+2/P38W0tNdM1NEPe5OYdXuhNnjE4x1OKPAylIJ4="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index 1a34a5c9cc75..6a0aa535d41a 100644 --- a/pkgs/development/web/nodejs/v21.nix +++ b/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.6.1"; - sha256 = "sha256-eoLzVtHcul12bw4dTHUOLhjWKQtxC30ZqHJSQeevH2A="; + version = "21.6.2"; + sha256 = "sha256-GRKU1EXR5oADWazIF0UpseGOECFH3F9ZYDDT3OlpMeU="; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index ef3f13dc1bf0..03165fa5df7d 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -17,18 +17,18 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-dfyyxE2U5rSSoTY2L5bKsnjQ8u53GgAXa+V+idDr51Q="; + hash = "sha256-02agp4EGT23QBKC8j1JIAkzVLRykFl55aH/wPF0bU/Y="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-27r6lZiD1Ptk0WIYdwNLSZy6iMnmaZjKXBUjr+5+1lQ="; + hash = "sha256-hd0wY1an12zY0E6VPjiD23Mn5ZDPvFvIdu6FGoc7nYY="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index ad2560a751cb..5013f88dbdfc 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.12"; + version = "2.25.13"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-6zOa+mvXN1SQYgUimdxkYQ/Eh+iaCb+FeXe/dglbHmk="; + hash = "sha256-ojoW3hq+DvgGlvWSRNk9VCooRzi5spp8o8oKqb74tmc="; }; passthru.updateScript = { diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index 09412bb2ccf8..9160b3fe81a9 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -6,22 +6,21 @@ , yarn , nodejs , nixosTests -, git , prefetch-yarn-deps }: buildGoModule rec { pname = "alice-lg"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "alice-lg"; repo = "alice-lg"; rev = version; - hash = "sha256-BdhbHAFqyQc8UbVm6eakbVmLS5QgXhr06oxoc6vYtsM="; + hash = "sha256-BbwTLHDtpa8HCECIiy+UxyQiLf9iAD2GzE0azXk7QGU="; }; - vendorHash = "sha256-SNF46uUTRCaa9qeGCfkHBjyo4BWOlpRaTDq+Uha08y8="; + vendorHash = "sha256-8N5E1CW5Z7HujwXRsZLv7y4uNOJkjj155kmX9PCjajQ="; passthru.ui = stdenv.mkDerivation { pname = "alice-lg-ui"; @@ -30,10 +29,10 @@ buildGoModule rec { yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/ui/yarn.lock"; - hash = "sha256-NeK9IM8E2IH09SVH9lMlV3taCmqwlroo4xzmv4Q01jI="; + hash = "sha256-PwByNIegKYTOT8Yg3nDMDFZiLRVkbX07z99YaDiBsIY="; }; - nativeBuildInputs = [ nodejs yarn git prefetch-yarn-deps ]; + nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix index f3b816a7a2c3..c8842e968e81 100644 --- a/pkgs/servers/birdwatcher/default.nix +++ b/pkgs/servers/birdwatcher/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "birdwatcher"; - version = "2.2.4"; + version = "2.2.5"; vendorHash = "sha256-NTD2pnA/GeTn4tXtIFJ227qjRtvBFCjWYZv59Rumc74="; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "alice-lg"; repo = "birdwatcher"; rev = version; - hash = "sha256-nsmwq7aUcozpp3av38S9wTKv0kiGfmyglQgse9MWSl4="; + hash = "sha256-TTU5TYWD/KSh/orDdQnNrQJ/G7z5suBu7psF9V6AAIw="; }; deleteVendor = true; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 5ff385cf65ac..95dc64156f42 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.9.2"; + version = "4.9.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-TLgYBFjs+1KKPZo0uihEts0u1pyhxGHd4koOvWaCkUQ="; + hash = "sha256-FmBFMFFJ3s3pWCH3bwabZl9rISLf99RquVLVDZ8B7Us="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index acbeed1c710f..37c8e8ec207c 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -491,7 +491,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.6.1" +version = "1.6.2" dependencies = [ "anyhow", "bytes", @@ -1402,7 +1402,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.6.1" +version = "1.6.2" dependencies = [ "anyhow", "big_s", @@ -1634,7 +1634,7 @@ dependencies = [ [[package]] name = "file-store" -version = "1.6.1" +version = "1.6.2" dependencies = [ "faux", "tempfile", @@ -1656,7 +1656,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.6.1" +version = "1.6.2" dependencies = [ "insta", "nom", @@ -1687,7 +1687,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.6.1" +version = "1.6.2" dependencies = [ "criterion", "serde_json", @@ -1805,7 +1805,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.6.1" +version = "1.6.2" dependencies = [ "arbitrary", "clap", @@ -2763,7 +2763,7 @@ dependencies = [ [[package]] name = "index-scheduler" -version = "1.6.1" +version = "1.6.2" dependencies = [ "anyhow", "big_s", @@ -2960,7 +2960,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.6.1" +version = "1.6.2" dependencies = [ "criterion", "serde_json", @@ -3472,7 +3472,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.6.1" +version = "1.6.2" dependencies = [ "insta", "md5", @@ -3481,7 +3481,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.6.1" +version = "1.6.2" dependencies = [ "actix-cors", "actix-http", @@ -3572,7 +3572,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.6.1" +version = "1.6.2" dependencies = [ "base64 0.21.5", "enum-iterator", @@ -3591,7 +3591,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.6.1" +version = "1.6.2" dependencies = [ "actix-web", "anyhow", @@ -3621,7 +3621,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.6.1" +version = "1.6.2" dependencies = [ "anyhow", "clap", @@ -3669,7 +3669,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.6.1" +version = "1.6.2" dependencies = [ "arroy", "big_s", @@ -4076,7 +4076,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.6.1" +version = "1.6.2" dependencies = [ "big_s", "serde_json", diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 45059659b97d..1a0f387d15ef 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -8,7 +8,7 @@ , nix-update-script }: -let version = "1.6.1"; +let version = "1.6.2"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-bA0UWRX16HTB/XCuzRa1C71DxfMJx1fZ/xVZFkxq1SM="; + hash = "sha256-D8KAleYaeMv3rCwhGE0IteuDUVk4RiOxsTBe7LhLAKg="; }; cargoBuildFlags = [ diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index f4cc746a24f3..f03f38742e19 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dmtx-utils"; - version = "0.7.6"; + version = "0.7.6-unstable-2023-09-21"; src = fetchFromGitHub { owner = "dmtx"; repo = "dmtx-utils"; - rev = "v${version}"; - sha256 = "06m3qncqdlcnmw83n95yrx2alaq6bld320ax26z4ndnla41yk0p4"; + rev = "057faa00143c152e8e21c29a36137f771614daed"; + hash = "sha256-uXzPAv6DappyHBNmsTg6qRUvtUUdP1IPOdDvIcevfco="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index b00df9c90273..e320b0355e4e 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hyperledger-fabric"; - version = "2.5.1"; + version = "2.5.5"; src = fetchFromGitHub { owner = "hyperledger"; repo = "fabric"; rev = "v${version}"; - hash = "sha256-hZAGLSf/hez2pvfmaZJRD5b7GW3+exUXgLXUd2Awvpg="; + hash = "sha256-Ev9a+d15kr6apKyGR5xTa/2I3cByyPSTW2Y+HAQk9GU="; }; vendorHash = null; diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 44863361a088..36b677aa20ba 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "unstable-2023-11-20"; + version = "0.9.3"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; - rev = "3022cf3686b85288e6fbecb2bd23ad113fd83f3b"; - sha256 = "sha256-ut+/F7cQ5Xamb7T45a78i0mjqnNG9/73jPNaDLxzAx8="; + rev = "refs/tags/v${version}"; + hash = "sha256-dxdBXoV9X2oA5ig6PK/GuNLRRzO1E0zHJwVFQp7GY2g="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-JRWlHwPFqNC/IIKQqRQszx4HHW1XsmROA67KmnxkmWQ="; + cargoHash = "sha256-fNAS2pCt3Oxz8qyn6GnJpx3Tq/EyPzbwns28tKeMqf0="; postInstall = '' installManPage man/man*/* @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; - # changelog = "https://github.com/ajeetdsouza/zoxide/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ajeetdsouza/zoxide/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; mainProgram = "zoxide"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d72c2579655..0f2bcda97d50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3093,8 +3093,6 @@ with pkgs; termonad = callPackage ../applications/terminal-emulators/termonad { }; - tilix = callPackage ../applications/terminal-emulators/tilix { }; - tym = callPackage ../applications/terminal-emulators/tym { }; wayst = callPackage ../applications/terminal-emulators/wayst { }; @@ -5664,7 +5662,6 @@ with pkgs; hyprdim = callPackage ../applications/misc/hyprdim { }; hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - stdenv = gcc13Stdenv; wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; }; @@ -5675,15 +5672,9 @@ with pkgs; hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { }; - hyprlang = callPackage ../by-name/hy/hyprlang/package.nix { - stdenv = gcc13Stdenv; - }; - hyprnome = callPackage ../applications/misc/hyprnome { }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { - stdenv = gcc13Stdenv; - }; + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { wlroots = wlroots_0_16; @@ -8965,8 +8956,6 @@ with pkgs; gtdialog = callPackage ../development/libraries/gtdialog { }; - gtkclipblock = callPackage ../by-name/gt/gtkclipblock/package.nix { stdenv = gcc13Stdenv; }; - gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; }; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; @@ -27669,6 +27658,8 @@ with pkgs; ebtables = callPackage ../os-specific/linux/ebtables { }; + elegant-sddm = libsForQt5.callPackage ../data/themes/elegant-sddm { }; + error-inject = callPackages ../os-specific/linux/error-inject { }; extrace = callPackage ../os-specific/linux/extrace { }; @@ -36447,7 +36438,6 @@ with pkgs; xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { - stdenv = gcc13Stdenv; inherit (qt6) qtbase qttools qtwayland wrapQtAppsHook; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cdef92e31be..92354bbb789b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6713,6 +6713,8 @@ self: super: with self; { ltpycld2 = callPackage ../development/python-modules/ltpycld2 { }; + lttng = callPackage ../development/python-modules/lttng { }; + luddite = callPackage ../development/python-modules/luddite { }; luftdaten = callPackage ../development/python-modules/luftdaten { }; |