diff options
Diffstat (limited to 'pkgs/applications')
17 files changed, 161 insertions, 86 deletions
diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix index db07acf7c36..d47bff7fe88 100644 --- a/pkgs/applications/audio/dsf2flac/default.nix +++ b/pkgs/applications/audio/dsf2flac/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dsf2flac"; - version = "unstable-2018-01-02"; + version = "unstable-2021-07-31"; src = fetchFromGitHub { owner = "hank"; repo = pname; - rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16"; - sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc"; + rev = "6b109cd276ec7c7901f96455c77cf2d2ebfbb181"; + sha256 = "sha256-VlXfywgYhI2QuGQvpD33BspTTgT0jOKUV3gENq4HiBU="; }; buildInputs = [ boost flac id3lib taglib zlib ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A DSD to FLAC transcoding tool"; homepage = "https://github.com/hank/dsf2flac"; license = licenses.gpl2; - maintainers = with maintainers; [ dmrauh ]; - platforms = with platforms; linux; + maintainers = with maintainers; [ artemist ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index a08c25f016a..7d8cf72eba2 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -37,14 +37,14 @@ let in stdenv.mkDerivation rec { pname = "surge-XT"; - version = "unstable-2021-12-11"; + version = "1.0.1"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; - rev = "320f68543d0279c11cea8dc7f5170399cccc9602"; + rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-Jcs5FpX5AZl72aKYNbRcfYqb2PRt0r1pQXk957xk0aM="; + sha256 = "sha256-u7jXNCDFRzq9oFaxovfTEipQsN+e4+whLexJrSJdXWw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index bfc413c24ad..552358319e1 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { preFixup = '' makeWrapper ${jdk}/bin/java $out/bin/bluej \ "''${gappsWrapperArgs[@]}" \ - --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot" + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp $out/share/bluej/bluej.jar bluej.Boot" ''; meta = with lib; { diff --git a/pkgs/applications/editors/maui-nota/default.nix b/pkgs/applications/editors/maui-nota/default.nix new file mode 100644 index 00000000000..9664aab2b2c --- /dev/null +++ b/pkgs/applications/editors/maui-nota/default.nix @@ -0,0 +1,56 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-filebrowsing +, mauikit-texteditor +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "nota"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "nota"; + rev = "v${version}"; + sha256 = "sha256-Sgpm5njhQDe9ohAVFcN5iPNC6v9+QZnGRPYxuLvUno8="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-filebrowsing + mauikit-texteditor + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Multi-platform text editor"; + homepage = "https://invent.kde.org/maui/nota"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 9a4f1b92d41..e1003180050 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook +, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap , writeShellScriptBin @@ -68,7 +68,12 @@ let runtimeDependencies = lib.optional stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; - nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook nodePackages.asar wrapGAppsHook ]; + nativeBuildInputs = [ unzip ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + nodePackages.asar + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; dontBuild = true; dontConfigure = true; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 1479fe7bc7d..5f03b8ea7e7 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; preFixup = '' - gappsWrapperArgs+=(--add-flags "--datapath \"$out/share\""); + gappsWrapperArgs+=(--add-flags "--datapath $out/share"); ''; meta = { diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix deleted file mode 100644 index 41c6cdee41c..00000000000 --- a/pkgs/applications/misc/ocropus/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, fetchFromGitHub, fetchurl, python2Packages, curl }: - -let - getmodel = name: sha256: { - inherit name; - src = fetchurl { - url = "http://www.tmbdev.net/ocropy/${name}"; - inherit sha256; - }; - }; - - models = [ - (getmodel "en-default.pyrnn.gz" - "1xyi3k3p81mfw0491gb1haisazfyi2i18f1wjs1m34ak39qfqjdp") - (getmodel "fraktur.pyrnn.gz" - "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b") - ]; - -in -python2Packages.buildPythonApplication rec { - pname = "ocropus"; - version = "1.3.3"; - - src = fetchFromGitHub { - sha256 = "02p1334mic5cfhvpfphfrbim4036yfd8s2zzpwm0xmm829z71nr7"; - rev = "v${version}"; - repo = "ocropy"; - owner = "tmbdev"; - }; - - propagatedBuildInputs = with python2Packages; [ curl numpy scipy pillow - matplotlib beautifulsoup4 pygtk lxml ]; - - enableParallelBuilding = true; - - preConfigure = with lib; '' - ${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;") - models)} - - substituteInPlace ocrolib/common.py --replace /usr/local $out - substituteInPlace ocrolib/default.py --replace /usr/local $out - ''; - - doCheck = false; # fails - checkPhase = '' - patchShebangs . - substituteInPlace ./run-test \ - --replace 'ocropus-rpred' 'ocropus-rpred -Q $NIX_BUILD_CORES' - PATH=".:$PATH" ./run-test - ''; - - meta = with lib; { - description = "Open source document analysis and OCR system"; - license = licenses.asl20; - homepage = "https://github.com/tmbdev/ocropy/"; - maintainers = with maintainers; [ domenkozar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index b216d750d56..79b9b498fbd 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook +{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper , dpkg , alsa-lib , at-spi2-atk @@ -102,7 +102,10 @@ stdenv.mkDerivation rec { dontPatchELF = true; doInstallCheck = true; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; + nativeBuildInputs = [ + dpkg + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 748552a4067..502b2bf41ef 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.10"; + version = "0.36.11"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C7VUDwgxE5VlHamgJk9dDhaBCOLXLDg0TFEhH2jV4oc="; + sha256 = "sha256-kXa3iG94WTH6KpQksl2r0yXyr4KuLY2AZdZtZ6zWYUA="; }; - vendorSha256 = "sha256-ZI2ETgxpRk10WMxb/v1j/LumL2xtE3QBcARs7spYMOk="; + vendorSha256 = "sha256-7SUf4r+6r6dkBoBZFg2AUK114QEl0+1lwRA4ymYArFs="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 05833c1eeaf..f5d984bf3a6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,5 +1,5 @@ { pname, version, src, meta, binaryName, desktopName, autoPatchelfHook -, makeDesktopItem, lib, stdenv, wrapGAppsHook, alsa-lib, at-spi2-atk +, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libxshmfence mesa nss - wrapGAppsHook + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) ]; dontWrapGApps = true; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 6afccfaaa07..96c6809b045 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, makeWrapper, nixosTests , gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) ]; buildInputs = [ diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 00289e5c628..7ee1cc9ab4f 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.26.4"; + version = "15.29.4"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-2CprtdKHHTLxS8jA4bRVoHvj/8zyVUV0aGPzU7mNxM8="; + sha256 = "sha256-jkFqOtU+D62S7QmNPvz58Z8wJ79lkN11pWQrtNdD+Uk="; }; unpackPhase = '' @@ -30,7 +30,7 @@ mkDerivation rec { $out/share/teamviewer/config \ $out/share/teamviewer/tv_bin/RTlib \ $out/share/teamviewer/tv_bin/xdg-utils \ - $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} + $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,tv-delayed-start.sh} ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 03f7c6c2b40..fc5c18e4ccd 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { --replace '-I/usr/X11R6/include' "" \ --replace '/usr/local/' $out/ \ --replace 'sudo' "" \ - --replace '-C surf depend' '-C surf' + --replace '-C surf depend' '-C surf' \ + --replace 'FFLAGS =' 'FFLAGS = -fallow-argument-mismatch' + + substituteInPlace ambfor/makefile --replace 'FFLAGS =' 'FFLAGS = -fallow-argument-mismatch' + sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile ''; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index 4c3d1d4c1a7..f49b9d1f45f 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "0lz8rfl5xwdj17zn7a30ipi7cgjwqki21a7wg9rdg7iwx27bpnmg"; }; + postPatch = '' + substituteInPlace Src/siesta_init.F --replace '/bin/rm' 'rm' + ''; + passthru = { inherit mpi; }; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index e13fd578927..d84f0b2abf6 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ + makeWrapper + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; dontWrapGApps = true; diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/applications/version-management/rcshist/default.nix index cd176972277..a9c7bbefc13 100644 --- a/pkgs/applications/version-management/rcshist/default.nix +++ b/pkgs/applications/version-management/rcshist/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { version = "1.04"; src = fetchurl { - url = "https://invisible-island.net/datafiles/release/rcshist.tar.gz"; + url = "https://web.archive.org/web/20220508220019/https://invisible-island.net/datafiles/release/rcshist.tar.gz"; sha256 = "01ab3xwgm934lxr8bm758am3vxwx4hxx7cc9prbgqj5nh30vdg1n"; }; diff --git a/pkgs/applications/video/vvave/default.nix b/pkgs/applications/video/vvave/default.nix new file mode 100644 index 00000000000..1612ce42001 --- /dev/null +++ b/pkgs/applications/video/vvave/default.nix @@ -0,0 +1,59 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-accounts +, mauikit-filebrowsing +, qtmultimedia +, qtquickcontrols2 +, taglib +}: + +mkDerivation rec { + pname = "vvave"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "vvave"; + rev = "v${version}"; + sha256 = "sha256-ykX1kd3106KTDTJQIGk6miSgbj+oROiXQl/nkCjTphE="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-accounts + mauikit-filebrowsing + qtmultimedia + qtquickcontrols2 + taglib + ]; + + meta = with lib; { + description = "Multi-platform media player"; + homepage = "https://invent.kde.org/maui/vvave"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} + |