diff options
Diffstat (limited to 'pkgs/applications/misc')
52 files changed, 319 insertions, 56 deletions
diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index 306a914dc19eb..9f0d9d62e053b 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -129,6 +129,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform password manager"; homepage = "https://1password.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 7ffc4a5fc7fac..e39450e5bef07 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -131,6 +131,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform password manager"; homepage = "https://1password.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 6231e62bc2dcb..0d18b3dd37a3e 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.4.1"; + version = "2.5.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-ANRYE1BoezrcDxZrQYp/OPdtn4J+FmC/PLSIP5Amm18=" "zip"; - i686-linux = fetch "linux_386" "sha256-w3anr76uj/Z+ilZ+LUGOB1CoKkvxcD+v8c8lVADPwRY=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-axZ+XDIMJlAicnYTIXgcaoT+Zcg6xvHlchl/ng7V9GY=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-/DnrQ4fwbc2ELtsEClvzA9kTrse3pMgGLbhiKZ3gphA=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip"; + i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; @@ -48,6 +48,7 @@ stdenv.mkDerivation { ''; postInstall = '' + HOME=$TMPDIR installShellCompletion --cmd ${mainProgram} \ --bash <($out/bin/${mainProgram} completion bash) \ --fish <($out/bin/${mainProgram} completion fish) \ @@ -67,6 +68,7 @@ stdenv.mkDerivation { homepage = "https://developer.1password.com/docs/cli/"; downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; maintainers = with maintainers; [ joelburget marsam ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; inherit mainProgram platforms; }; diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index bbe37b5ed743b..fdd2970fdac7b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -27,7 +27,8 @@ in postInstall = '' patchShebangs node_modules/ npm run build - ln -s $out/lib/node_modules/asf-ui/dist $out/lib/dist + cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist + rm -rf $out/lib/node_modules/ ''; meta = with lib; { diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 2bce30365f08c..1a164f578a016 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = "http://www.adobe.com/products/reader"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; knownVulnerabilities = [ "Numerous unresolved vulnerabilities" diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 07cbee42694d9..6e28c58798e79 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.25.4"; + version = "0.26.1"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM="; + sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index c448b86d0c4d0..ca243f4437071 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.authy.com"; description = "Twilio Authy two factor authentication desktop application"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ iammrinal0 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index aa7150bb6b0b5..0261f983ac79d 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -166,6 +166,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ xavierzwirtz ]; description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index d5d6f6b5358ea..15e3c51e9ad4c 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "binance"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ="; + sha256 = "sha256-Q1cvEQ/yxytzrPfiyeTZSCPecnmSdhy+ds/gtie4vwo="; }; nativeBuildInputs = [ @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Binance Cryptoexchange Official Desktop Client"; homepage = "https://www.binance.com/en/desktop-download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index fb89d2a7e373d..84095c4165417 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,22 +1,20 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, mkDerivation, fetchurl, qtbase, qmake }: -let version = "0.6.4"; in -stdenv.mkDerivation { +mkDerivation rec { pname = "confclerk"; - inherit version; + version = "0.7.1"; src = fetchurl { url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; - sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; + sha256 = "0l5i4d6lymh0k6gzihs41x4i8v1dz0mrwpga096af0vchpvlcarg"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase ]; + nativeBuildInputs = [ qmake ]; - nativeBuildInputs = [ qmake4Hook ]; - - installPhase = '' + postInstall = '' mkdir -p $out/bin - cp src/bin/confclerk $out/bin + mv $out/confclerk $out/bin/ ''; meta = { diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 3f54826fc52af..abde33b730c03 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -127,6 +127,10 @@ PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access, Teradata, Firebird, Derby, etc. ''; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # dependencies from maven + ]; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ jojosch mkg20001 ]; diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 20d47e204f7cc..560afe32b8a19 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.87"; + version = "0.88"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-7O2AY7tWYiOIy4ImFBxWu6S+ljc3VmqS/j4KyEzVVIA="; + sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY="; }; postPatch = '' diff --git a/pkgs/applications/misc/foxitreader/default.nix b/pkgs/applications/misc/foxitreader/default.nix index b206d14323b1c..c6ed7bc1ad3ff 100644 --- a/pkgs/applications/misc/foxitreader/default.nix +++ b/pkgs/applications/misc/foxitreader/default.nix @@ -73,6 +73,7 @@ mkDerivation rec { meta = with lib; { description = "A viewer for PDF documents"; homepage = "https://www.foxitsoftware.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ p-h rhoriguchi ]; diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix index 9b335b1aedae4..8c68f8672c3b5 100644 --- a/pkgs/applications/misc/gometer/default.nix +++ b/pkgs/applications/misc/gometer/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Analytic-Tracking tool for GoLance"; homepage = "https://golance.com/download-gometer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; }; diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 950cb236ecbfa..dd6964318e77d 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -115,6 +115,7 @@ mkDerivation rec { meta = with lib; { description = "A world sphere viewer"; homepage = "https://www.google.com/earth/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ friedelino shamilton ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix new file mode 100644 index 0000000000000..f3b721bc49597 --- /dev/null +++ b/pkgs/applications/misc/hollywood/default.nix @@ -0,0 +1,94 @@ +{ stdenv +, fetchFromGitHub +, makeWrapper +, lib +, coreutils +, apg +, atop +, bmon +, cmatrix +, pygments +, moreutils +, util-linux +, jp2a +, man +, mplayer +, openssh +, tree +, mlocate +, findutils +, ccze +, ncurses +, python3 +, wget +, libcaca +, newsboat +, rsstail +, w3m +, ticker +, tmux +}: + +stdenv.mkDerivation { + pname = "hollywood"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "dustinkirkland"; + repo = "hollywood"; + rev = "35275a68c37bbc39d8b2b0e4664a0c2f5451e5f6"; + sha256 = "sha256-faIm1uXERvIDZ6SK6uarVkWGNJskAroHgq5Cg7nUZc4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ ./nixos-paths.patch ]; + postPatch = '' + rm lib/hollywood/speedometer + rm bin/wallstreet + rm -r lib/wallstreet + ''; + + dontBuild = true; + + installPhase = + let pathDeps = [ + tmux + coreutils + ncurses + jp2a + mlocate + apg + atop + bmon + cmatrix + pygments + moreutils + util-linux + jp2a + man + mplayer + openssh + tree + findutils + ccze + ]; + in '' + runHook preInstall + + mkdir -p $out + cp -r bin $out/bin + cp -r lib $out/lib + cp -r share $out/share + wrapProgram $out/bin/hollywood --prefix PATH : ${lib.makeBinPath pathDeps} + + runHook postInstall + ''; + + meta = { + description = "Fill your console with Hollywood melodrama technobabble"; + homepage = "https://a.hollywood.computer/"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.anselmschueler ]; + }; +} diff --git a/pkgs/applications/misc/hollywood/nixos-paths.patch b/pkgs/applications/misc/hollywood/nixos-paths.patch new file mode 100644 index 0000000000000..d280a6b003c1e --- /dev/null +++ b/pkgs/applications/misc/hollywood/nixos-paths.patch @@ -0,0 +1,67 @@ +diff --git a/bin/hollywood b/bin/hollywood +index 6f1ee68..09bc4ea 100755 +--- a/bin/hollywood ++++ b/bin/hollywood +@@ -74,7 +74,7 @@ if [ -z "$TMUX" ]; then + else + tmux_launcher=tmux + fi +- $tmux_launcher new-session -d -s $PKG "/bin/bash" ++ $tmux_launcher new-session -d -s $PKG "/usr/bin/env bash" + $tmux_launcher send-keys -t $PKG "$0 $1" + $tmux_launcher send-keys -t $PKG Enter + exec $tmux_launcher attach-session -t $PKG +diff --git a/lib/hollywood/code b/lib/hollywood/code +index 532ce73..3448447 100755 +--- a/lib/hollywood/code ++++ b/lib/hollywood/code +@@ -19,7 +19,7 @@ command -v view >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*.java" "/usr/*.c" "/usr/*.cpp" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*.java" "/run/current-system/sw/*.java" "/usr/*.c" "/run/current-system/sw/*.c" "/usr/*.cpp" "/run/current-system/sw/*.cpp" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/hexdump b/lib/hollywood/hexdump +index f2fb0bd..db059f5 100755 +--- a/lib/hollywood/hexdump ++++ b/lib/hollywood/hexdump +@@ -19,8 +19,8 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- for f in $(ls /usr/bin/ | sort -R); do +- head -c 4096 "/usr/bin/$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" ++ for f in $(find /usr/bin/ /run/current-system/sw/bin/ | sort -R); do ++ head -c 4096 "$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" + sleep 0.7 + done + done +diff --git a/lib/hollywood/jp2a b/lib/hollywood/jp2a +index e87b950..6541f80 100755 +--- a/lib/hollywood/jp2a ++++ b/lib/hollywood/jp2a +@@ -19,7 +19,7 @@ command -v jp2a >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*jpg" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*jpg" "/run/current-system/sw/*jpg" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/man b/lib/hollywood/man +index 2d42513..f4d8bbb 100755 +--- a/lib/hollywood/man ++++ b/lib/hollywood/man +@@ -19,7 +19,7 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(ls /usr/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) ++ FILES=$(ls /usr/share/man/man1/ /run/current-system/sw/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) + for f in $FILES; do + man "$f" | ccze -A + sleep 0.2 diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 44169f6a539e2..390f756beb101 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Time tracking software"; homepage = "https://hubstaff.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus srghma ]; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index ae049699121ed..1a079ab8274c3 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GPU-accelerated procedural modeler and slicer for 3D printing"; homepage = "https://icesl.loria.fr/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.inria-icesl; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ mgttlinger ]; diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix index 1e20a0d6faf04..619a821a32c69 100644 --- a/pkgs/applications/misc/ideamaker/default.nix +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.raise3d.com/ideamaker/"; description = "Raise3D's 3D slicer software"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 120affb988c01..ecad4bd9821b0 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Supermicro IPMI configuration tool"; homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 579890c78ba3e..fbc436c882cfc 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -72,7 +72,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; maintainers = with maintainers; [ vlaci ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/join-desktop/default.nix b/pkgs/applications/misc/join-desktop/default.nix index 0b09911ddb24b..369aae0386336 100644 --- a/pkgs/applications/misc/join-desktop/default.nix +++ b/pkgs/applications/misc/join-desktop/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/joaomgcd/JoinDesktop/"; description = "Desktop app for Join"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license license = licenses.free; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 67807887ec615..d35a526dfdb3b 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18427"; + version = "18463"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-SsoeKfpWi41sd77LfaQW0OcHnyf8iLolKWF74dhalpY="; + sha256 = "sha256-++8XtzAykJ+85Kvzy3xgaZoKaVlJwz+Ct1xb/QkC1Gc="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-cz3OT03StvJy9XYBiPxx+nz36O0cg+XrL/uc52/G/1c="; + sha256 = "sha256-n7GlUWYOAXw4G59SBsO8HZ1OaiUWwzOsiURPFBYq31E="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index b50bc7e561147..64044693203e7 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.jottacloud.com/"; downloadPage = "https://repo.jotta.us/archives/linux/"; maintainers = with maintainers; [ evenbrenden ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index 8ee8337bea2a9..05d1c98e56ac8 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "Analytics and time-series database"; homepage = "http://www.kx.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "i686-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index e2480dd18bded..b428690b7a403 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/koreader/koreader"; description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = intersectLists platforms.x86_64 platforms.linux; license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 68453252ba539..de131b7ce63f0 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/applications/misc/masterpdfeditor4/default.nix index b4b9a4d624469..befb11a0a48b3 100644 --- a/pkgs/applications/misc/masterpdfeditor4/default.nix +++ b/pkgs/applications/misc/masterpdfeditor4/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Master PDF Editor - version 4, without watermark"; homepage = "https://code-industry.net/free-pdf-editor/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index afdfc6c905e04..2d5b6ee8f2ae6 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.5.0c"; + version = "1.5.1"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE="; + sha256 = "sha256-qOXw/KGt3DyWQGBe/pbMujQITCMItHobxuK+1r00ZIs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index 62c1834d26ad7..198d170bd89ca 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Morphological analysis of Russian text"; homepage = "https://yandex.ru/dev/mystem/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ae82d4023247d..822f2c13cbeae 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -311,8 +311,8 @@ in src = fetchFromGitHub { owner = "jneilliii"; repo = "OctoPrint-STLViewer"; - rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + rev = "refs/tags/${version}"; + sha256 = "sha256-S7zjEbyo59OJpa7INCv1o4ybQ+Sy6a3EJ5AJ6wiBe1Y="; }; meta = with lib; { diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 0930edbd4158b..c44fc41a5c650 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -8,7 +8,6 @@ , which , python3 , rsync -, makeWrapper , qtbase , qtsvg , libGLU @@ -20,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.05.31-10"; + version = "2022.06.18-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc="; + sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI="; fetchSubmodules = true; }; @@ -45,7 +44,6 @@ mkDerivation rec { which python3 rsync - makeWrapper ]; # Most dependencies are vendored @@ -64,16 +62,6 @@ mkDerivation rec { bash ./configure.sh ''; - # Tell the program that the read-only and the read-write data locations - # are different, and create the read-write one. - # https://github.com/organicmaps/organicmaps/issues/2387 - postInstall = '' - wrapProgram $out/bin/OMaps \ - --add-flags "-resources_path $out/share/organicmaps/data" \ - --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \ - --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' - ''; - meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 745796098e8cc..e4626ef3c947c 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -42,6 +42,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/torakiki/pdfsam"; description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.agpl3; platforms = platforms.all; maintainers = with maintainers; [ _1000101 ]; diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix index 8c034d6636b32..047d9e4190fcb 100644 --- a/pkgs/applications/misc/pdfstudio/common.nix +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -88,6 +88,10 @@ buildFHSUserEnv { homepage = "https://www.qoppa.com/${pname}/"; description = "An easy to use, full-featured PDF editing software"; longDescription = longDescription; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; mainProgram = pname; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 58d45d19bee58..669f25e1509eb 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -142,6 +142,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "GUI for managing Windows programs under linux"; homepage = "https://www.playonlinux.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.pasqui23 ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 8fcd9e1a04fe9..1c286d611e6be 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -122,6 +122,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.noneucat ]; diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/applications/misc/premid/default.nix index d2b8663d24531..3fe8c64f20be5 100644 --- a/pkgs/applications/misc/premid/default.nix +++ b/pkgs/applications/misc/premid/default.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { description = "A simple, configurable utility to show your web activity as playing status on Discord"; homepage = "https://premid.app"; downloadPage = "https://premid.app/downloads"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; [ natto1784 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 1488538cc55ed..679b77157cd05 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,8 +1,39 @@ -{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem -, pkg-config, wrapGAppsHook, boost, cereal, cgal_5, curl, dbus, eigen, expat -, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme, ilmbase, libpng, mpfr, nlopt -, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch -, wxGTK31-gtk3-override ? null }: +{ stdenv +, lib +, binutils +, fetchFromGitHub +, cmake +, copyDesktopItems +, makeDesktopItem +, pkg-config +, wrapGAppsHook +, boost +, cereal +, cgal_5 +, curl +, dbus +, eigen +, expat +, glew +, glib +, gmp +, gtest +, gtk3 +, hicolor-icon-theme +, ilmbase +, libpng +, mpfr +, nlopt +, openvdb +, pcre +, qhull +, systemd +, tbb +, wxGTK31-gtk3 +, xorg +, fetchpatch +, wxGTK31-gtk3-override ? null +}: let wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec { pname = "wxwidgets-prusa3d-patched"; @@ -16,7 +47,8 @@ let }; }); wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "prusa-slicer"; version = "2.4.2"; @@ -28,6 +60,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ + binutils boost cereal cgal_5 @@ -58,6 +91,16 @@ in stdenv.mkDerivation rec { url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch"; sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6"; }) + # Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238 + # Can be removed with the next version update + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch"; + sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8="; + }) + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch"; + sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20="; + }) ]; doCheck = true; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 69f0b26b9ec41..273b2d6046ed8 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -53,6 +53,7 @@ in mkDerivation rec { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; maintainers = with maintainers; [ cstrahan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 81219fc752697..ae32aac267e17 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://robomongo.org/"; description = "Query GUI for mongodb. Formerly called Robomongo"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ eperuffo ]; }; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index e26a40667da9c..23684142a09b4 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -48,6 +48,7 @@ description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; homepage = "https://github.com/SideQuestVR/SideQuest"; downloadPage = "https://github.com/SideQuestVR/SideQuest/releases"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ joepie91 rvolosatovs ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix index eb0af95d58d59..f183fbed3d2e4 100644 --- a/pkgs/applications/misc/signumone-ks/default.nix +++ b/pkgs/applications/misc/signumone-ks/default.nix @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Digital signature tool for Costa Rican electronic invoicing"; homepage = "https://signum.one/download.html"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index f723ba27beb8d..35f153393518c 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -27,6 +27,7 @@ let description = "The simplest way to keep notes"; homepage = "https://github.com/Automattic/simplenote-electron"; license = licenses.gpl2; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ kiwi ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 0f331ef6e2ce4..2ec034e882e18 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,12 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: +{ lib +, fetchFromGitHub +, gobject-introspection +, gtk3 +, gtksourceview3 +, webkitgtk +, wrapGAppsHook +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -8,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; + hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; }; buildInputs = [ @@ -20,9 +28,16 @@ python3Packages.buildPythonApplication rec { # any Pokemon, and clicking Stats and Moves tab. webkitgtk ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ + cairosvg natsort + ndspy packaging pycairo pygal @@ -36,6 +51,7 @@ python3Packages.buildPythonApplication rec { skytemple-files skytemple-icons skytemple-ssb-debugger + tilequant ]; doCheck = false; # there are no tests diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index b5bcbabf8674b..6a9c8843c09a3 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Snapmaker Luban is an easy-to-use 3-in-1 software tailor-made for Snapmaker machines"; homepage = "https://github.com/Snapmaker/Luban"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.simonkampe ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 85f4ffec5f16b..90aab7987b389 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line client for the Snowflake database"; homepage = "https://www.snowflake.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ andehen ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 42f4d36eea5d5..c9d845574ff0b 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mastodon/Misskey Client for PC"; homepage = "https://thedesk.top"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 34cc97023989e..0b1bed6785755 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Online freelancing platform desktop application for time tracking"; homepage = "https://www.upwork.com/ab/downloads/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zakkor wolfangaukang ]; diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index f49b14e8fc48f..3972d7a17230c 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electron based Mastodon, Pleroma and Misskey client for Windows, Mac and Linux"; homepage = "https://whalebird.social"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang colinsane ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 70543b5fa186c..539a0f7d1a1d8 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qt4 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation rec { pname = "xkblayout-state"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo="; }; - buildInputs = [ qt4 ]; + buildInputs = [ libX11 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index a395ffd521f53..17134dcd3892b 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -85,7 +85,10 @@ stdenv.mkDerivation rec { and save to Evernote. ''; homepage = "https://www.xmind.net/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; |