diff options
Diffstat (limited to 'pkgs/applications')
12 files changed, 62 insertions, 33 deletions
diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 9d93c8ae435..5f108049c35 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-gPrXeS7XT38Dil/EBwmeKIJrmPlEK+hmiyHi4p28tl0="; + sha256 = "sha256-rox8X+lYiiCXO66JemW+R2I6y/IxdK6qpaiFXYoL6nY="; }; - cargoSha256 = "sha256-9YKCtryb9mTPz9iWE7Iuk2SKgV0knWRbaouF+1DCjv8="; + cargoSha256 = "sha256-ujmBAld6DCc1l+yUu9qhRF8pS5HoIlstcdPTeTAyyXs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index b086523e7b8..1dfa0bcb5e9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "90.0.4430.93", - "sha256": "0zimr975vp0v12zz1nqjwag3f0q147wrmdhpzgi4yf089rgwfbjk", - "sha256bin64": "1vifcrrfv69i0q7qnnml43xr0c20bi22hfw6lygq3k2x70zdzgl6", + "version": "90.0.4430.212", + "sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb", + "sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7", "deps": { "gn": { "version": "2021-02-09", @@ -55,8 +55,8 @@ "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" }, "ungoogled-patches": { - "rev": "90.0.4430.93-1", - "sha256": "11adnd96iwkkri3yyzvxsq43gqsc12fvd87rvqqflj0irrdk98a0" + "rev": "90.0.4430.212-1", + "sha256": "05jh05a4g50ws7pr18dl5pwi95knygh6xywp7kyydir7wy1pbin8" } } } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 897428a7577..929c254a1bd 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub , go-bindata @@ -11,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.19.0"; + version = "1.20.0"; - vendorSha256 = "sha256-WGW2uz3YJIUjLsYQ6rXNvgJGLrZSIkEEk07llLzMVXA="; + vendorSha256 = "sha256-ncgf2C4PZMoVMZIMDn9LwP2EDqg7T/WbUPRd/SqGGnU="; doCheck = false; @@ -21,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-F+nPSWX9gs/hvOR6g8MW4b+JW+w3ScDaaF/FLHbLspY="; + sha256 = "sha256-TnvbO8OLjnI5WGy3QR4OZbesOBat2VsL7ElCnj2Tkmk="; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index 82f508c63ee..cf4a9cde526 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.12.10"; - sha256 = "12hlzjkay7y1502nmfvq2qkhp9pq7vp4zxypawnh98qvxbzv149l"; + version = "0.12.12"; + sha256 = "0hz5fsqv8jh22zhs0r1yk0c4qf4sf11hmqg4db91kp2xrq72a0qg"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 99c43aeeee4..f4551d1e823 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.4"; - sha256 = "0znaxz9mzbqb59p6rwa5h89m344m2ci39jsx8dfh1v5fc17r0fcq"; + version = "1.0.5"; + sha256 = "06l56fi4fhplvl8v0i88q18yh1hwwd12fngnrflb91janbyk6p4l"; } diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 4cab638ba67..ca10fdcf9bc 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.29.1"; + version = "0.29.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fr33DRFZrUZQELYMf8z5ShOZobwylgoiW+yi6qdtFP4="; + sha256 = "sha256-e4DwMphX8I37MShMt5nnoizfL919mJaFCkDGNeGXHbQ="; }; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 008592778aa..4adc508392a 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "davmail"; - version = "5.4.0"; + version = "5.5.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3135.zip"; - sha256 = "05n2j5canh046744arvni6yfdsandvjkld93w3p7rg116jrh19gq"; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3299.zip"; + sha256 = "sha256-NN/TUOcUIifNzrJnZmtYhs6UVktjlfoOYJjYaMEQpI4="; }; sourceRoot = "."; @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' + runHook preInstall mkdir -p $out/share/davmail cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail $out/bin/davmail \ --prefix PATH : ${jre}/bin \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 libXtst ]} + runHook postInstall ''; meta = with lib; { @@ -25,6 +27,6 @@ stdenv.mkDerivation rec { description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; maintainers = [ maintainers.hinton ]; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 3e58e83143f..6b73f03531d 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, qtbase, qttools , seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: @@ -13,6 +13,15 @@ mkDerivation rec { sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; + patches = [ + # Fix compilation failure with "error: template with C linkage", fixes #122505 + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_glib2.diff?h=seafile-client&id=7be253aaa2bdb6771721f45aa08bc875c8001c5a"; + name = "fix_build_with_glib2.diff"; + sha256 = "0hl7rcqfr8k62c1pr133bp3j63b905izaaggmgvr1af4jibal05v"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] ++ lib.optional withShibboleth qtwebengine; @@ -29,6 +38,6 @@ mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ eduardosm ]; }; } diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index ce322037735..7dcb6d467d6 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -4,7 +4,7 @@ , unwrapped # If it's a minimal build, we don't want to wrap it with lndir and # wrapProgram.. -, wrap ? true +, doWrap ? true # For the wrapper , makeWrapper # For lndir @@ -138,7 +138,7 @@ let ; pkgs = packages; }; - self = if wrap then + self = if doWrap then stdenv.mkDerivation { inherit name passthru; buildInputs = [ diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index e51d181266a..fd49957aa35 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg -, libraw, libtiff, libpng, libjpeg, libheif, ffms +, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "0h3slgpj6zdc0rwmyr9zb0vgf53283hpwb7h26skdswmggsk90i5"; }; + patches = [ + # Backport fix for broken build on glib-2.68 + (fetchpatch { + url = "https://gitlab.com/free-astro/siril/-/commit/d319fceca5b00f156e1c5e3512d3ac1f41beb16a.diff"; + sha256 = "00lq9wq8z48ly3hmkgzfqbdjaxr0hzyl2qwbj45bdnxfwqragh5m"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config git criterion wrapGAppsHook ]; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 2636d9100d5..03abea94a2e 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -4,6 +4,8 @@ , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests +# Used by the NixOS module: +, isNixOS ? false }: stdenv.mkDerivation rec { @@ -27,6 +29,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = lib.optionalString isNixOS '' + echo -e '\ninclude /etc/sway/config.d/*' >> config.in + ''; + nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 964828fdaba..07459295d75 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -4,6 +4,8 @@ , withBaseWrapper ? true, extraSessionCommands ? "", dbus , withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 , extraOptions ? [] # E.g.: [ "--verbose" ] +# Used by the NixOS module: +, isNixOS ? false }: assert extraSessionCommands != "" -> withBaseWrapper; @@ -11,6 +13,7 @@ assert extraSessionCommands != "" -> withBaseWrapper; with lib; let + sway = sway-unwrapped.override { inherit isNixOS; }; baseWrapper = writeShellScriptBin "sway" '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then @@ -20,16 +23,16 @@ let fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS - exec ${sway-unwrapped}/bin/sway "$@" + exec ${sway}/bin/sway "$@" else - exec ${dbus}/bin/dbus-run-session ${sway-unwrapped}/bin/sway "$@" + exec ${dbus}/bin/dbus-run-session ${sway}/bin/sway "$@" fi ''; in symlinkJoin { - name = "sway-${sway-unwrapped.version}"; + name = "sway-${sway.version}"; paths = (optional withBaseWrapper baseWrapper) - ++ [ sway-unwrapped ]; + ++ [ sway ]; nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); @@ -49,5 +52,5 @@ in symlinkJoin { passthru.providedSessions = [ "sway" ]; - inherit (sway-unwrapped) meta; + inherit (sway) meta; } |