diff options
Diffstat (limited to 'pkgs/applications')
16 files changed, 245 insertions, 103 deletions
diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index a4b68707ee7c..40fb0cfda596 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -34,11 +34,12 @@ stdenv.mkDerivation rec { buildInputs = [ file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile - ] ++ pythonPath - ++ optional withQt qtbase + ] ++ optional withQt qtbase ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3; + propagatedBuildInputs = pythonPath; + enableParallelBuilding = true; installFlags = [ "PREFIX=$(out)" ]; @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { patchPythonScript "$f" done patchPythonScript "$out/share/carla/carla_settings.py" + patchPythonScript "$out/share/carla/carla_database.py" for program in $out/bin/*; do wrapQtApp "$program" \ diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index fc7e6c0fc359..a1b5944a51e1 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -1,26 +1,27 @@ -{ buildPythonApplication, fetchFromGitHub, lib, paramiko, peewee, pyqt5 -, python-dateutil, APScheduler, psutil, qdarkstyle, secretstorage -, appdirs, setuptools, qt5 +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "069fq5gv324l2ap3g6m6i12lhq1iqm27dsmaagyc3sva945j0gxw"; + sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5"; }; postPatch = '' sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg ''; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle secretstorage appdirs setuptools ]; @@ -33,7 +34,7 @@ buildPythonApplication rec { ''; meta = with lib; { - license = licenses.gpl3; + license = licenses.gpl3Only; homepage = "https://vorta.borgbase.com/"; maintainers = with maintainers; [ ma27 ]; description = "Desktop Backup Client for Borg"; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index ad559a6f2167..66ad424253eb 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices @@ -12,39 +12,19 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" else throw "ImageMagick is not supported on this platform."; - - cfg = { - version = "6.9.11-29"; - sha256 = "0adjdpi91ya0g3v7y503n95833m25aibkim5swg5lnwjrba407hg"; - patches = []; - } - # Freeze version on mingw so we don't need to port the patch too often. - # FIXME: This version has multiple security vulnerabilities - // lib.optionalAttrs (stdenv.hostPlatform.isMinGW) { - version = "6.9.2-0"; - sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; - patches = [(fetchpatch { - name = "mingw-build.patch"; - url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/" - + "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch"; - sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0"; - })]; - }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "imagemagick"; - inherit (cfg) version; + version = "6.9.11-60"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; - rev = cfg.version; - inherit (cfg) sha256; + rev = version; + sha256 = "12810882a0kf4zlgyi290z9bjs921m05njbljkjfw6s1hf0mncl0"; }; - patches = cfg.patches; - outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 5a1e5ba65ded..2b14079ae609 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchurl, fetchFromGitHub, lib }: +{ buildGoModule, fetchurl, fetchFromGitHub, lib }: let gouiJS = fetchurl { @@ -11,41 +11,49 @@ let sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; }; -in buildGoPackage rec { - name = "perkeep-${version}"; - version = "unstable-2020-03-23"; + packages = [ + "perkeep.org/server/perkeepd" + "perkeep.org/cmd/pk" + "perkeep.org/cmd/pk-get" + "perkeep.org/cmd/pk-put" + "perkeep.org/cmd/pk-mount" + ]; + +in buildGoModule rec { + pname = "perkeep"; + version = "0.11"; src = fetchFromGitHub { owner = "perkeep"; repo = "perkeep"; - rev = "c2e31370ddefd86b6112a5d891100ea3382a4254"; - sha256 = "0jf02k20ms7h60wglcq6dj3vqi9rlfww7db5iplgwznbij70c1i4"; + rev = version; + sha256 = "07j5gplk4kcrbazyg4m4bwggzlz5gk89h90r14jvfcpms7v5nrll"; }; - goPackagePath = "perkeep.org"; + vendorSha256 = "1af9a6r9qfrak0n5xyv9z8n7gn7xw2sdjn4s9bwwidkrdm81iq6b"; + deleteVendor = true; # Vendor is out of sync with go.mod buildPhase = '' - cd "$NIX_BUILD_TOP/go/src/$goPackagePath" + cd "$NIX_BUILD_TOP/source" # Skip network fetches - sed -i '/fetchAllJS/a if true { return nil }' make.go cp ${publisherJS} app/publisher/publisher.js cp ${gouiJS} server/perkeepd/ui/goui.js - go run make.go + go run make.go -offline=true -targets=${lib.concatStringsSep "," packages} ''; - # devcam is only useful when developing perkeep, we should not install it as - # part of this derivation. + # genfileembed gets built regardless of -targets, to embed static + # content into the Perkeep binaries. Remove it in post-install to + # avoid polluting paths. postInstall = '' - rm -f $out/bin/devcam + rm -f $out/bin/genfileembed ''; meta = with lib; { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = "https://perkeep.org"; license = licenses.asl20; - maintainers = with maintainers; [ cstrahan kalbasit ]; - platforms = platforms.unix; + maintainers = with maintainers; [ cstrahan danderson kalbasit ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7d54db22fa8a..8bb049afc664 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -153,8 +153,8 @@ let ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags # ++ optional (versionRange "68" "72") (githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") - ] ++ optional (versionRange "89" "90") (githubPatch - # To fix the build of chromiumBeta: + ] ++ optional (versionRange "89" "90.0.4402.0") (githubPatch + # To fix the build of chromiumBeta and chromiumDev: "b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs "1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x" ); @@ -279,6 +279,12 @@ let # Disable PGO (defaults to 2 since M89) because it fails without additional changes: # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version chrome_pgo_phase = 0; + } // optionalAttrs (chromiumVersionAtLeast "90") { + # Disable build with TFLite library because it fails without additional changes: + # ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it + # Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz + # See also chrome/services/machine_learning/README.md + build_with_tflite_lib = false; } // optionalAttrs ungoogled { chrome_pgo_phase = 0; enable_hangout_services_extension = false; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix new file mode 100644 index 000000000000..de032cc60e99 --- /dev/null +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: + +buildGoModule rec { + pname = "cloudfoundry-cli"; + version = "7.2.0"; + + src = fetchFromGitHub { + owner = "cloudfoundry"; + repo = "cli"; + rev = "v${version}"; + sha256 = "0cf5vshyz6j70sv7x43r1404hdcmkzxgdb7514kjilp5z6wsr1nv"; + }; + # vendor directory stale + deleteVendor = true; + vendorSha256 = "0p0s0dr7kpmmnim4fps62vj4zki2qxxdq5ww0fzrf1372xbl4kp2"; + + subPackages = [ "." ]; + + # upstream have helpfully moved the bash completion script to a separate + # repo which receives no releases or even tags + bashCompletionScript = fetchurl { + url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7"; + sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01" + "-X code.cloudfoundry.org/cli/version.binaryVersion=${version}" + ]; + + postInstall = '' + mv "$out/bin/cli" "$out/bin/cf" + installShellCompletion --bash $bashCompletionScript + ''; + + meta = with lib; { + description = "The official command line client for Cloud Foundry"; + homepage = "https://github.com/cloudfoundry/cli"; + maintainers = with maintainers; [ ris ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 7051799a2775..827cac7c2970 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -4,14 +4,14 @@ let mkRambox = opts: callPackage (import ./rambox.nix opts) { }; in mkRambox rec { pname = "rambox-pro"; - version = "1.4.1"; + version = "1.5.0"; desktopName = "Rambox Pro"; src = { x86_64-linux = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.AppImage"; - sha256 = "18383v3g26hd1czvw06gmjn8bdw2w9c7zb04zkfl6szgakrv26x4"; + sha256 = "1g7lrjm8yxklqpc2mp8gy0g61wfilr15dl80r3sh6pa5b4k5spir"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 93ab78c439a6..601489d4532d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre_headless, libmatthew_java, dbus, dbus_java }: +{ stdenv, lib, fetchurl, makeWrapper, openjdk11_headless, libmatthew_java, dbus, dbus_java }: stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.12"; + version = "0.7.4"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "0i1y2p5qi2bwhkm8sv0wkb0lfi2vm26qalnpg6kn0ikcxkqkq5bc"; + sha256 = "18dv2944nsryl6372jqgb52z3s1grvgfc5sb1b1rgn0y84g8g46n"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; @@ -18,15 +18,15 @@ stdenv.mkDerivation rec { cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli '' + (if stdenv.isLinux then '' - makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \ - --set JAVA_HOME "${jre_headless}" \ + makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \ + --set JAVA_HOME "${openjdk11_headless}" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \ --add-flags "org.asamk.signal.Main" '' else '' wrapProgram $out/bin/signal-cli \ - --prefix PATH : ${lib.makeBinPath [ jre_headless ]} \ - --set JAVA_HOME ${jre_headless} + --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \ + --set JAVA_HOME ${openjdk11_headless} ''); # Execution in the macOS (10.13) sandbox fails with diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index bda9c5ae0a07..6ef9ec32538f 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -3,6 +3,8 @@ set -eu -o pipefail -version="$(curl -Ls https://zoom.us/download\?os\=linux | pup '.linux-ver-text text{}' | cut -d' ' -f2)" +version="$(curl -Ls https://zoom.us/download\?os\=linux | \ + pup '.linux-ver-text text{}' | \ + awk -F'[ ().]' '{printf $2"."$3"."$6"."$7"\n"}')" update-source-version zoom-us "$version" diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 148665d6b6d4..58952f28b558 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.0"; + version = "3.0.1"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0ciddvyhyp38fnfsi1plj3z8d76f28lbzbxib2857vw7rzyqfcky"; + sha256 = "0f50kib8l99vlp9wqszq2r2g5panzphsgs7viga8lyc83v229b33"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index 1c72d4ef88c0..a13f84096863 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "protonvpn-linux-cli"; - version = "2.2.4"; + version = "2.2.6"; src = fetchFromGitHub { owner = "protonvpn"; repo = "linux-cli"; rev = "v${version}"; - sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw"; + sha256 = "0y7v9ikrmy5dbjlpbpacp08gy838i8z54m8m4ps7ldk1j6kyia3n"; }; propagatedBuildInputs = (with python3Packages; [ @@ -29,8 +29,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Linux command-line client for ProtonVPN"; homepage = "https://github.com/protonvpn/linux-cli"; - maintainers = with maintainers; [ jtcoolen jefflabonte ]; + maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; license = licenses.gpl3; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 7d5b965e60fe..a9ddf48bae60 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -1,24 +1,56 @@ -{ lib, stdenv, buildFHSUserEnv, fetchurl, makeWrapper, makeDesktopItem, libxslt, atk -, fontconfig, freetype, gdk-pixbuf, glib, gtk2, libudev0-shim, libxml2 -, pango, pixman, libX11, libXext, libXinerama, libXrandr , libXrender -, libXtst, libXcursor, libXi, libxkbfile , libXScrnSaver, zlib, liberation_ttf -, libtiff, dbus, at-spi2-atk, harfbuzz, gtk3-x11, libuuid, pcsclite +{ stdenv +, lib +, at-spi2-atk +, atk +, buildFHSUserEnv +, dbus +, fetchurl +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gsettings-desktop-schemas +, gtk2 +, gtk3-x11 +, harfbuzz +, liberation_ttf +, libjpeg +, libtiff +, libudev0-shim +, libuuid +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libxkbfile +, libxml2 +, libXrandr +, libXrender +, libXScrnSaver +, libxslt +, libXtst +, makeDesktopItem +, makeWrapper +, pango +, pcsclite +, pixman +, zlib }: - let - version = "2006"; + version = "2012"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - # The downloaded archive also contains i386 and ARM binaries, but these have not been tested. + # The downloaded archive also contains i386 and ARM binaries, but these have not been tested. vmwareHorizonClientFiles = stdenv.mkDerivation { name = "vmwareHorizonClientFiles"; inherit version; src = fetchurl { - url = https://download3.vmware.com/software/view/viewclients/CART21FQ2/vmware-view-client-linux-2006-8.0.0-16522670.tar.gz; - sha256 = "8c46d49fea42f8c1f7cf32a5f038f5a47d2b304743b1e4f4c68c658621b0e79c"; + url = "https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-Linux-2012-8.1.0-17349998.tar.gz"; + sha256 = "0afda1f3116e75a4e7f89990d8ee60ccea5f3bb8a2360652162fa11c795724ce"; }; buildInputs = [ makeWrapper ]; installPhase = '' @@ -30,12 +62,16 @@ let # when it cannot detect a new enough version already present on the system. # The checks are distribution-specific and do not function correctly on NixOS. # Deleting the bundled library is the simplest way to force it to use our version. - rm -f "$out/lib/vmware/gcc/libstdc++.so.6" + rm "$out/lib/vmware/gcc/libstdc++.so.6" + + # This libjpeg library interferes with Chromium, so we will be using ours instead. + rm $out/lib/vmware/libjpeg.* # Force the default GTK theme (Adwaita) because Horizon is prone to # UI usability issues when using non-default themes, such as Adwaita-dark. makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \ --set GTK_THEME Adwaita \ + --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ --suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware" ''; }; @@ -46,10 +82,37 @@ let runScript = "${vmwareHorizonClientFiles}/bin/vmware-view_wrapper"; targetPkgs = pkgs: [ - pcsclite dbus vmwareHorizonClientFiles atk fontconfig freetype gdk-pixbuf glib gtk2 - libudev0-shim libxml2 pango pixman liberation_ttf libX11 libXext libXinerama - libXrandr libXrender libXtst libXcursor libXi libxkbfile at-spi2-atk libXScrnSaver - zlib libtiff harfbuzz gtk3-x11 libuuid + at-spi2-atk + atk + dbus + fontconfig + freetype + gdk-pixbuf + glib + gtk2 + gtk3-x11 + harfbuzz + liberation_ttf + libjpeg + libtiff + libudev0-shim + libuuid + libX11 + libXcursor + libXext + libXi + libXinerama + libxkbfile + libxml2 + libXrandr + libXrender + libXScrnSaver + libXtst + pango + pcsclite + pixman + vmwareHorizonClientFiles + zlib ]; }; @@ -61,15 +124,22 @@ let mimeType = "x-scheme-handler/vmware-view"; }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { name = "vmware-view"; + dontUnpack = true; + installPhase = '' mkdir -p $out/bin $out/share/applications cp "${desktopItem}"/share/applications/* $out/share/applications/ ln -s "${vmwareFHSUserEnv}/bin/vmware-view" "$out/bin/" ''; + unwrapped = vmwareHorizonClientFiles; + + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Allows you to connect to your VMware Horizon virtual desktop"; homepage = "https://www.vmware.com/go/viewclients"; diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/update.sh b/pkgs/applications/networking/remote/vmware-horizon-client/update.sh new file mode 100755 index 000000000000..126cb17a7c28 --- /dev/null +++ b/pkgs/applications/networking/remote/vmware-horizon-client/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p curl -p jq -p common-updater-scripts -i bash +set -e + +entryPointURL='https://my.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY' + +function getTarballMetaUrl { + curl "$entryPointURL" | jq -r ' + .dlgEditionsLists | .[] | select(.name | contains("Client for Linux")) | + .dlgList | .[] | select(.name | contains("tarball version")) | + @uri "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)" + ' +} + +meta="$( curl "$(getTarballMetaUrl)" | jq ".downloadFiles | .[]" )" + +ver="$( echo "$meta" | jq -r .version )" +url="$( echo "$meta" | jq -r .thirdPartyDownloadUrl )" +sum="$( echo "$meta" | jq -r .sha256checksum )" + +echo +echo "version: $ver" +echo "tar url: $url" +echo " sha256: $sum" + +cd "$(dirname "$0")/../../../../.." +update-source-version vmware-horizon-client.unwrapped "$ver" "$sum" "$url" diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index ad52e75ac358..47cda0518219 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.50.2"; + version = "0.50.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-n5tLYrqqM0KUQrlJWZtKGClKONAz3EXBAlEqIrdPBpI="; + sha256 = "sha256-8sFBxcs3tnIQQ4S39aF8r9SGm9VOHPpgQYyLkUaOscw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 32e8f6ee56e2..9595639d381e 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "molden"; src = fetchurl { - url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; + url = "ftp://ftp.cmbi.umcn.nl/pub/molgraph/molden/molden${version}.tar.gz"; sha256 = "02qi16pz2wffn3cc47dpjqhfafzwfmb79waw4nnhfyir8a4h3cq1"; }; @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Display and manipulate molecular structures"; - homepage = "http://www.cmbi.ru.nl/molden/"; + homepage = "http://www3.cmbi.umcn.nl/molden/"; license = { fullName = "Free for academic/non-profit use"; - url = "http://www.cmbi.ru.nl/molden/CopyRight.html"; + url = "http://www3.cmbi.umcn.nl/molden/CopyRight.html"; free = false; }; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e9496247f06d..207ebdf2211f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,12 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage -, makeWrapper, installShellFiles, pkg-config -, go-md2man, go, containerd, runc, docker-proxy, tini, libtool -, sqlite, iproute, lvm2, systemd, docker-buildx -, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git -, procps, libseccomp -, nixosTests -, buildxSupport ? false -}: +{ lib, callPackage }: with lib; @@ -16,8 +8,16 @@ rec { , mobyRev, mobySha256 , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport - } : + , tiniRev, tiniSha256, buildxSupport ? false + # package dependencies + , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage + , makeWrapper, installShellFiles, pkg-config + , go-md2man, go, containerd, runc, docker-proxy, tini, libtool + , sqlite, iproute, lvm2, systemd, docker-buildx + , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git + , procps, libseccomp + , nixosTests + }: let docker-runc = runc.overrideAttrs (oldAttrs: { name = "docker-runc-${version}"; @@ -215,7 +215,7 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* - docker_20_10 = makeOverridable dockerGen rec { + docker_20_10 = callPackage dockerGen rec { version = "20.10.2"; rev = "v${version}"; sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; @@ -227,6 +227,5 @@ rec { containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; - inherit buildxSupport; }; } |