diff options
Diffstat (limited to 'pkgs/applications')
8 files changed, 40 insertions, 108 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/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix deleted file mode 100644 index 65da21cbabc7..000000000000 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, meson -, ninja -, python3 -, pkg-config -, ldc -, dconf -, dbus -, gsettings-desktop-schemas -, desktop-file-utils -, gettext -, gtkd -, libsecret -, wrapGAppsHook -, libunwind -, appstream -, nixosTests -, fetchpatch -}: - -stdenv.mkDerivation rec { - pname = "tilix"; - version = "1.9.5"; - - src = fetchFromGitHub { - owner = "gnunn1"; - repo = "tilix"; - rev = version; - sha256 = "sha256-sPVL5oYDOmloRVm/nONKkC20vZc907c7ixBF6E2PQ8Y="; - }; - - # Default upstream else LDC fails to link - mesonBuildType = [ - "debugoptimized" - ]; - - nativeBuildInputs = [ - desktop-file-utils - ldc - meson - ninja - pkg-config - python3 - wrapGAppsHook - appstream - ]; - - buildInputs = [ - dbus - gettext - dconf - gsettings-desktop-schemas - gtkd - libsecret - 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 - ''; - - preFixup = '' - substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \ - --replace "Exec=tilix" "Exec=$out/bin/tilix" - ''; - - passthru.tests.test = nixosTests.terminal-emulators.tilix; - - meta = with lib; { - description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; - homepage = "https://gnunn1.github.io/tilix-web"; - license = licenses.mpl20; - maintainers = with maintainers; [ midchildan ]; - platforms = platforms.linux; - mainProgram = "tilix"; - }; -} 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 ] |