diff options
Diffstat (limited to 'pkgs/applications')
48 files changed, 1170 insertions, 560 deletions
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index f4a9383c29c1..984048828923 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,38 +1,24 @@ -{ stdenv, fetchurl, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 -, wafHook -, python2Packages}: +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 +, python3Packages , meson, ninja }: -let - inherit (python2Packages) python dbus-python; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "a2jmidid"; - version = "8"; + version = "9"; - src = fetchurl { - url = "https://github.com/linuxaudio/a2jmidid/archive/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz"; - sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7"; + src = fetchFromGitHub { + owner = "linuxaudio"; + repo = pname; + rev = version; + sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; }; - nativeBuildInputs = [ pkgconfig makeWrapper wafHook ]; - buildInputs = [ alsaLib dbus libjack2 python dbus-python ]; - - patches = [ - (fetchpatch { - url = "https://github.com/linuxaudio/a2jmidid/commit/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2.diff"; - sha256 = "1nxrvnhxlgqc9wbxnp1gnpw4wjyzxvymwcg1gh2nqzmssgfykfkc"; - }) - (fetchpatch { - url = "https://github.com/linuxaudio/a2jmidid/commit/7f82da7eb2f540a94db23331be98d42a58ddc269.diff"; - sha256 = "1nab9zf0agbcj5pvhl90pz0cx1d204d4janqflc5ymjhy8jyrsdv"; - }) - (fetchpatch { - url = "https://github.com/linuxaudio/a2jmidid/commit/c07775d021a71cb91bf64ce1391cf525415cb060.diff"; - sha256 = "172v9hri03qdqi8a3zsg227k5qxldd8v5bj4jk7fyk5jf50fcxga"; - }) - ]; + nativeBuildInputs = [ pkgconfig makeWrapper meson ninja ]; + buildInputs = [ alsaLib dbus libjack2 ] ++ + (with python3Packages; [ python dbus-python ]); postInstall = '' wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH + substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index aa4f12268916..bcdc1fe719cd 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -1,8 +1,10 @@ { stdenv , fetchFromGitHub , cmake +, nixosTests , alsaLib , SDL2 +, libiconv }: stdenv.mkDerivation rec { @@ -17,7 +19,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; + buildInputs = [ SDL2 ] + ++ stdenv.lib.optional stdenv.isLinux alsaLib + ++ stdenv.lib.optional stdenv.isDarwin libiconv; + + passthru.tests = { + ft2-clone-starts = nixosTests.ft2-clone; + }; meta = with stdenv.lib; { description = "A highly accurate clone of the classic Fasttracker II software for MS-DOS"; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 589354cf2348..c0900c56d0bd 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig, cmake, python, ffmpeg_3, phonon, automoc4 +, pkgconfig, cmake, python3, ffmpeg_3, phonon, automoc4 , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt , id3lib, taglib, mp4v2, flac, libogg, libvorbis , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols @@ -7,18 +7,17 @@ }: stdenv.mkDerivation rec { - pname = "kid3"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; - sha256 = "0i0c4bmsm36jj1v535kil47ig0ig70ykrzcw2f56spr25xns06ka"; + sha256 = "sha256-WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc="; }; nativeBuildInputs = [ wrapQtAppsHook ]; - buildInputs = with stdenv.lib; - [ pkgconfig cmake python ffmpeg_3 phonon automoc4 + buildInputs = [ + pkgconfig cmake python3 ffmpeg_3 phonon automoc4 chromaprint docbook_xml_dtd_45 docbook_xsl libxslt id3lib taglib mp4v2 flac libogg libvorbis zlib readline qtbase qttools qtmultimedia qtquickcontrols ]; @@ -35,34 +34,33 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple and powerful audio tag editor"; longDescription = '' - If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, - MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF - files (e.g. full albums) without typing the same information - again and again and have control over both ID3v1 and ID3v2 tags, - then Kid3 is the program you are looking for. + If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, + MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files (e.g. full + albums) without typing the same information again and again and have + control over both ID3v1 and ID3v2 tags, then Kid3 is the program you are + looking for. With Kid3 you can: - Edit ID3v1.1 tags; - Edit all ID3v2.3 and ID3v2.4 frames; - Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags - - Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, - Speex, TrueAudio, WavPack, WMA, WAV, AIFF files and tracker - modules (MOD, S3M, IT, XM); - - Edit tags of multiple files, e.g. the artist, album, year and - genre of all files of an album typically have the same values - and can be set together; + - Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, Speex, + TrueAudio, WavPack, WMA, WAV, AIFF files and tracker modules (MOD, S3M, + IT, XM); + - Edit tags of multiple files, e.g. the artist, album, year and genre of + all files of an album typically have the same values and can be set + together; - Generate tags from filenames; - Generate tags from the contents of tag fields; - Generate filenames from tags; - Rename and create directories from tags; - Generate playlist files; - Automatically convert upper and lower case and replace strings; - - Import from gnudb.org, TrackType.org, MusicBrainz, Discogs, - Amazon and other sources of album data; - - Export tags as CSV, HTML, playlists, Kover XML and in other - formats; - - Edit synchronized lyrics and event timing codes, import and - export LRC files + - Import from gnudb.org, TrackType.org, MusicBrainz, Discogs, Amazon and + other sources of album data; + - Export tags as CSV, HTML, playlists, Kover XML and in other formats; + - Edit synchronized lyrics and event timing codes, import and export + LRC files. ''; homepage = "http://kid3.sourceforge.net/"; license = licenses.lgpl2Plus; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix new file mode 100644 index 000000000000..19f6d7bfb5ae --- /dev/null +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, dpkg +, qt5 +, libjack2 +, alsaLib +, bzip2 +, libpulseaudio }: + +stdenv.mkDerivation rec { + pname = "ocenaudio"; + version = "3.9.2"; + + src = fetchurl { + url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; + sha256 = "1fvpba3dnzb7sm6gp0znbrima02ckfiy2zwb66x1gr05y9a56inv"; + }; + + + nativeBuildInputs = [ + autoPatchelfHook + qt5.qtbase + libjack2 + libpulseaudio + bzip2 + alsaLib + ]; + + buildInputs = [ dpkg ]; + + dontUnpack = true; + dontBuild = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out + dpkg -x $src $out + cp -av $out/opt/ocenaudio/* $out + rm -rf $out/opt + + # Create symlink bzip2 library + ln -s ${bzip2.out}/lib/libbz2.so.1 $out/libbz2.so.1.0 + ''; + + meta = with stdenv.lib; { + description = "Cross-platform, easy to use, fast and functional audio editor"; + homepage = "https://www.ocenaudio.com"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 13edd8ea3830..6fd52834b007 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 -, at-spi2-atk, at-spi2-core, libpulseaudio +, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa }: let @@ -10,15 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.26.501.gbe11e53b-15"; + version = "1.1.42.622.gbd112320-37"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "41"; - + rev = "42"; deps = [ alsaLib @@ -36,10 +35,12 @@ let gdk-pixbuf glib gtk2 + libdrm libgcrypt libnotify libpng libpulseaudio + mesa nss pango stdenv.cc.cc @@ -77,7 +78,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "41bc8d20388bab39058d0709d99b1c8e324ea37af217620797356b8bc0b24aedbe801eaaa6e00a93e94e26765602e5dc27ad423ce2e777b4bec1b92daf04f81e"; + sha512 = "06371c6a285aba916a779cd9f2a933f97db8fb38393545baa94c8984302e003c559af7b1b35afd7df5f2c35e379e2cb80c00facf527bc22df09061cdb67d9d7a"; }; buildInputs = [ squashfsTools makeWrapper ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d9b829132021..e8d8eb900262 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,9 +9,9 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.0.2.0"; # "Android Studio 4.0.2" - build = "193.6821437"; - sha256Hash = "sha256-v3lug8XCl4tekMBP4N1wS925FnDaSMDf6SIJhwKydzY="; + version = "4.1.0.19"; # "Android Studio 4.1.0" + build = "201.6858069"; + sha256Hash = "sha256-S5Uh/EpjE61l/z4UsPP7UEJ9Rk/hQidVVWX0bg/60gI="; }; betaVersion = { version = "4.1.0.18"; # "Android Studio 4.1 RC 3" diff --git a/pkgs/applications/editors/vscode/update.sh b/pkgs/applications/editors/vscode/update-vscode.sh index c030e38a70a0..5066a8e41823 100755..100644 --- a/pkgs/applications/editors/vscode/update.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -8,10 +8,6 @@ if [ ! -f "$ROOT/vscode.nix" ]; then echo "ERROR: cannot find vscode.nix in $ROOT" exit 1 fi -if [ ! -f "$ROOT/vscodium.nix" ]; then - echo "ERROR: cannot find vscodium.nix in $ROOT" - exit 1 -fi # VSCode @@ -26,16 +22,3 @@ sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable" VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL}) sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" - -# VSCodium - -VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') -sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" - -VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" -VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL}) -sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix" - -VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" -VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) -sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh new file mode 100755 index 000000000000..0e8ce6da5a02 --- /dev/null +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused gawk + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +if [ ! -f "$ROOT/vscodium.nix" ]; then + echo "ERROR: cannot find vscodium.nix in $ROOT" + exit 1 +fi + +# VSCodium + +VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') +sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" +VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 540fa2718975..45c38b3e5732 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,6 +1,7 @@ { stdenv , mkDerivation , fetchFromGitHub +, substituteAll , gdal , cmake , ninja @@ -18,7 +19,7 @@ mkDerivation rec { pname = "OpenOrienteering-Mapper"; - version = "0.9.3"; + version = "0.9.4"; buildInputs = [ gdal @@ -37,18 +38,14 @@ mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "05bliglpc8170px6k9lfrp9ylpnb2zf47gnjns9b2bif8dv8zq0l"; + sha256 = "13k9dirqm74lknhr8w121zr1hjd9gm1y73cj4rrj98rx44dzmk7b"; }; - patches = [ + patches = (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 - ./fix-qttranslations-path.diff - ]; - - postPatch = '' - substituteInPlace src/util/translation_util.cpp \ - --subst-var-by qttranslations ${qttranslations} - ''; + src = ./fix-qttranslations-path.diff; + inherit qttranslations; + }); cmakeFlags = [ # Building the manual and bundling licenses fails diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 3347567b88b4..41bfdb3fc5d9 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -1,4 +1,4 @@ -{stdenv, python3Packages, gettext, qt5, fetchFromGitHub}: +{stdenv, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: python3Packages.buildPythonApplication rec { pname = "dupeguru"; @@ -14,6 +14,15 @@ python3Packages.buildPythonApplication rec { fetchSubmodules = true; }; + patches = [ + # already merged to master, remove next version bump + (fetchpatch { + name = "remove-m-from-so-var.patch"; + url = "https://github.com/arsenetar/dupeguru/commit/bd0f53bcbe463c48fe141b73af13542da36d82ba.patch"; + sha256 = "07iisz8kcr7v8lb21inzj1avlpfhh9k8wcivbd33w49cr3mmnr26"; + }) + ]; + nativeBuildInputs = [ gettext python3Packages.pyqt5 @@ -58,6 +67,5 @@ python3Packages.buildPythonApplication rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.novoxudonoser ]; - broken = true; # mv: cannot stat '_block.cpython-38m*.so': No such file or directory }; } diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index db82aea2a508..ffe7d4ec47de 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,16 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.15.0"; + version = "1.15.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1g9hmb5637x8bhm2wzarqnxzj0i93fcdm1myvld2d97a2d32hy6m"; + sha256 = "1pysh0gz3f3dxk5bfkzaii4myrgik396mf6vlks50inpbnslmqsl"; }; - doCheck = false; propagatedBuildInputs = with python3Packages; [ requests ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; + pytestFlagsArray = [ + # requires network access + "--ignore=test/test_results.py" + ]; + meta = { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; diff --git a/pkgs/applications/misc/gnome-passwordsafe/default.nix b/pkgs/applications/misc/gnome-passwordsafe/default.nix new file mode 100644 index 000000000000..7b0553f7f9e3 --- /dev/null +++ b/pkgs/applications/misc/gnome-passwordsafe/default.nix @@ -0,0 +1,80 @@ +{ stdenv +, meson +, ninja +, pkg-config +, gettext +, fetchFromGitLab +, python3 +, libhandy +, libpwquality +, wrapGAppsHook +, gtk3 +, glib +, gdk-pixbuf +, gobject-introspection +, desktop-file-utils +, appstream-glib }: + +python3.pkgs.buildPythonApplication rec { + pname = "gnome-passwordsafe"; + version = "3.99.2"; + format = "other"; + strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "PasswordSafe"; + rev = version; + sha256 = "0pi2l4gwf8paxm858mxrcsk5nr0c0zw5ycax40mghndb6b1qmmhf"; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + wrapGAppsHook + desktop-file-utils + appstream-glib + gobject-introspection + ]; + + buildInputs = [ + gtk3 + glib + gdk-pixbuf + libhandy + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + construct + + # pykeepass 3.2.1 changed some exception types, and is not backwards compatible. + # Remove override once the MR is |