diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
37 files changed, 584 insertions, 194 deletions
diff --git a/nixpkgs/pkgs/applications/misc/anup/default.nix b/nixpkgs/pkgs/applications/misc/anup/default.nix new file mode 100644 index 000000000000..9c99c84eabee --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/anup/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, sqlite, xdg-utils}: + +rustPlatform.buildRustPackage rec { + pname = "anup"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Acizza"; + repo = "anup"; + rev = version; + sha256 = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA="; + }; + + buildInputs = [ + sqlite + xdg-utils + ]; + + cargoSha256 = "sha256-1TA2HDHKA3twFtlAWaC2zcRzS8TJwcbBt1OTQ3hC3qM="; + + meta = with lib; { + homepage = "https://github.com/Acizza/anup"; + description = "An anime tracker for AniList featuring a TUI"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ natto1784 ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/authenticator/default.nix b/nixpkgs/pkgs/applications/misc/authenticator/default.nix index 46b61720d0a3..ffa34d041e9c 100644 --- a/nixpkgs/pkgs/applications/misc/authenticator/default.nix +++ b/nixpkgs/pkgs/applications/misc/authenticator/default.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271 description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/nixpkgs/pkgs/applications/misc/bemenu/default.nix index eaad132de927..371bb3a3ef92 100644 --- a/nixpkgs/pkgs/applications/misc/bemenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-UdsfIXlKfXmsrFwrerX1wfne4mdtd69WXnXu3EmxCBY="; + sha256 = "sha256-2xmi/Mh5iU50yc2R1x1yzP8Xaz+mUgLnH73tAeLwxI8="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/nixpkgs/pkgs/applications/misc/cheat/default.nix b/nixpkgs/pkgs/applications/misc/cheat/default.nix index 9c8f060f1691..f7a56a48fc72 100644 --- a/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-wH0MTTwUmi/QZXo3vWgRYmlPxMxgfhghrTIZAwdVjQ0="; + sha256 = "sha256-YKGCZm0BaFLi+kujl04B4IU1qay15XNfvelxfUkCP8o="; }; subPackages = [ "cmd/cheat" ]; diff --git a/nixpkgs/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix index 676efb2aa042..4197c1af040b 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.1.2"; + version = "4.1.3"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -36,7 +36,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "0zvv8nmjzw5pchykz5p28483nby4lp4ah7iqr08pv36gy89l51v5"; + sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781"; extraPostFetch = '' mv $out ./all @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "05m6vbd4sfjk536kwa5wa3kv21jxxqnglx0ddvnmxfhf98371bhk"; + sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf"; }; postUnpack = '' diff --git a/nixpkgs/pkgs/applications/misc/free42/default.nix b/nixpkgs/pkgs/applications/misc/free42/default.nix index 16344d975fea..feadf1590921 100644 --- a/nixpkgs/pkgs/applications/misc/free42/default.nix +++ b/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2TOYvZBI2EW9xjbjA4Bh+TgjbyEXRzOByalLYBW8Ba8="; + sha256 = "sha256-ZoW5gBAUp/5U8Is3Nhx+SHY4d0F3PGOS1/WOokKRnCU="; }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; diff --git a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 854b8a5f9b36..ac33025b727e 100644 --- a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.4"; + version = "1.17.5"; src = fetchPypi { inherit pname version; - sha256 = "4df80fd923b03b2413a3d1c50e32c3006d100ed5acc1400ace69d8dc2162d293"; + sha256 = "9d64bca2bf0cdecaff1336e0656917eb9028586fee4ac342761d6cb9a0cdb4f9"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/nixpkgs/pkgs/applications/misc/go-jira/default.nix index 2f2a0a22126e..4a368e92ec33 100644 --- a/nixpkgs/pkgs/applications/misc/go-jira/default.nix +++ b/nixpkgs/pkgs/applications/misc/go-jira/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jira"; - version = "1.0.27"; + version = "1.0.28"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-jira"; repo = "jira"; - sha256 = "1sw56aqghfxh88mfchf0nvqld0x7w22jfwx13pd24slxv1iag1nb"; + sha256 = "sha256-h/x77xGqdOxPBxdchElZU9GFgjnNo89o9gx4fYM5dME="; }; - vendorSha256 = "0d64gkkzfm6hbgqaibj26fpaqnjs50p1675ycrshdhn6blb5mbxg"; + vendorSha256 = "sha256-r69aFl3GwgZ1Zr4cEy4oWlqsrjNCrqjwW9BU9+d8xDQ="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/hubstaff/default.nix b/nixpkgs/pkgs/applications/misc/hubstaff/default.nix index f291ab898e3d..1bc22b6613d4 100644 --- a/nixpkgs/pkgs/applications/misc/hubstaff/default.nix +++ b/nixpkgs/pkgs/applications/misc/hubstaff/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE , libXext , freetype, libXrender, fontconfig, libXft, libXinerama , libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 -, curl }: +, curl, writeShellScript, common-updater-scripts }: let - - data = builtins.fromJSON (builtins.readFile ./revision.json); - - inherit (data) version url sha256; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.19-9e79d1da/Hubstaff-1.5.19-9e79d1da.sh"; + version = "1.5.19-9e79d1da"; + sha256 = "1l4sq8cblpl1kclkx5pgy0ldfmqa3n8bvdl5qml0n78r0lpk382j"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft @@ -56,6 +55,18 @@ stdenv.mkDerivation { ln -s $opt/data/resources $opt/x86_64/resources ''; + updateScript = writeShellScript "hubstaff-updater" '' + set -eu -o pipefail + + installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux) + + version=$(echo "$installation_script_url" | sed -r 's/^https:\/\/hubstaff\-production\.s3\.amazonaws\.com\/downloads\/HubstaffClient\/Builds\/Release\/([^\/]+)\/Hubstaff.+$/\1/') + + sha256=$(nix-prefetch-url "$installation_script_url") + + ${common-updater-scripts}/bin/update-source-version hubstaff "$version" "$sha256" "$installation_script_url" + ''; + meta = with lib; { description = "Time tracking software"; homepage = "https://hubstaff.com/"; diff --git a/nixpkgs/pkgs/applications/misc/hubstaff/revision.json b/nixpkgs/pkgs/applications/misc/hubstaff/revision.json deleted file mode 100644 index 9b0ffe67f0cd..000000000000 --- a/nixpkgs/pkgs/applications/misc/hubstaff/revision.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.15-28673d1c/Hubstaff-1.5.15-28673d1c.sh", - "version": "1.5.15-28673d1c", - "sha256": "0ging41l3a3sdj6bggh913h71gqmb8l3rplp4civpgclnfzv7fg2" -} diff --git a/nixpkgs/pkgs/applications/misc/hubstaff/update.sh b/nixpkgs/pkgs/applications/misc/hubstaff/update.sh deleted file mode 100755 index c4c1caf55db4..000000000000 --- a/nixpkgs/pkgs/applications/misc/hubstaff/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-prefetch-git curl - -SCRIPT_DIR=$(dirname "$(readlink -f "$BASH_SOURCE")") - -installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux) - -version=$(echo "$installation_script_url" | sed -r 's/^https:\/\/hubstaff\-production\.s3\.amazonaws\.com\/downloads\/HubstaffClient\/Builds\/Release\/([^\/]+)\/Hubstaff.+$/\1/') - -sha256=$(nix-prefetch-url "$installation_script_url") - -cat <<EOT > $SCRIPT_DIR/revision.json -{ - "url": "$installation_script_url", - "version": "$version", - "sha256": "$sha256" -} -EOT diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index b8ea6b83b907..9834e91309da 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.83.1"; + version = "0.84.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c9T3a6J78uLumBTy/DgE4gbxCmEXVGKd9JyF9dyrL6g="; + sha256 = "sha256-BRp4iboiaoB6zFwleFSJ7oVAd3o6OiR5BB4VRQilExc="; }; - vendorSha256 = "sha256-ddCyMmZ5RIZWzT2RYNnSW795oR7PIRudl3QTjsXtBGk="; + vendorSha256 = "sha256-jY/g92ON5OxjuZzPHJNduXYMgPU8/0ioAYvp4iqjGnU="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 9c559a364ef9..2d9a2ca59045 100644 --- a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.7.11"; + version = "1.8.5"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "11vjipvhfvf6wxldcg743anma005j8dbbngqk6sq9hlf677ahxii"; - x86_64-darwin = "1l7m86jlf1m066n6rwmh5fkpx2pj3wj5h9ncxdd24v0zll6ki8vs"; + x86_64-linux = "11csbr72i5kac2bk7wpa877lay2z1n58s0yildkfnjy552ihdxny"; + x86_64-darwin = "1n0ni3ixml99ag83bcn5wg6f0kldjhwkkddd9km37ykr8vxxl952"; }.${system} or throwSystem; }; diff --git a/nixpkgs/pkgs/applications/misc/jquake/default.nix b/nixpkgs/pkgs/applications/misc/jquake/default.nix new file mode 100644 index 000000000000..eccd8b4c1896 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/jquake/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchurl, copyDesktopItems, makeDesktopItem, unzip, jre8 }: + +stdenv.mkDerivation rec { + pname = "jquake"; + version = "1.6.1"; + + src = fetchurl { + url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip"; + sha256 = "0nw6xjc3i1b8rk15arc5d0ji2bycc40rz044qd03vzxvh0h8yvgl"; + }; + + nativeBuildInputs = [ unzip copyDesktopItems ]; + + sourceRoot = "."; + + postPatch = '' + # JQuake emits a lot of debug-like messages in console, but I + # don't think it's in our interest to void them by default. Log them at + # the appropriate level. + sed -i "/^java/ s/$/\ | logger -p user.debug/" JQuake.sh + + # By default, an 'errors.log' file is created in the current directory. + # cd into a temporary directory and let it be created there. + substituteInPlace JQuake.sh \ + --replace "java -jar " "exec ${jre8.outPath}/bin/java -jar $out/lib/" \ + --replace "[JAR FOLDER]" "\$(mktemp -p /tmp -d jquake-errlog-XXX)" + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + chmod +x JQuake.sh + + mkdir -p $out/{bin,lib} + mv JQuake.sh $out/bin/JQuake + mv {JQuake.jar,JQuake_lib} $out/lib + mv sounds $out/lib + + mkdir -p $out/share/licenses/jquake + mv LICENSE* $out/share/licenses/jquake + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "JQuake"; + desktopName = "JQuake"; + exec = "JQuake"; + comment = "Real-time earthquake map of Japan"; + }) + ]; + + meta = with lib; { + description = "Real-time earthquake map of Japan"; + homepage = "http://jquake.net"; + downloadPage = "https://jquake.net/?down"; + changelog = "https://jquake.net/?docu"; + maintainers = with maintainers; [ nessdoor ]; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/nixpkgs/pkgs/applications/misc/keepassx/community.nix index fe09345349e5..b4beab05acd1 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -1,8 +1,6 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake -, makeWrapper , qttools , darwin @@ -43,13 +41,13 @@ with lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.4"; + version = "2.6.6"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3"; + sha256 = "15rm3avdmc2x2n92zq6w1zbcranak4j6dds2sxmgdqi1ffc0a3ci"; }; NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [ @@ -92,10 +90,9 @@ stdenv.mkDerivation rec { runHook postCheck ''; - nativeBuildInputs = [ cmake wrapQtAppsHook qttools pkg-config ]; + nativeBuildInputs = [ asciidoctor cmake wrapQtAppsHook qttools pkg-config ]; buildInputs = [ - asciidoctor curl glibcLocales libXi diff --git a/nixpkgs/pkgs/applications/misc/logseq/default.nix b/nixpkgs/pkgs/applications/misc/logseq/default.nix index 1900b92e3bbe..83356b9550a0 100644 --- a/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.1.3"; + version = "0.1.8"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "1akg3xjbh01nb7l06qpvz3xsjj64kf042xjnapn60jlgg5y34vbm"; + sha256 = "0q8lci72rzzc04wnfqry31zav07srw0iymjlq5mxygsq4h9bcq01"; name = "${pname}-${version}.AppImage"; }; diff --git a/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix b/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix new file mode 100644 index 000000000000..045f0db42fe8 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, lib, fetchurl }: +let + pname = "neo4j-desktop"; + version = "1.4.5"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; + sha256 = "sha256-TCkjYhvGhgqgrDEMvC4Ww/sDxRhHC70YgfDlCIFitMo"; + }; + + appimageContents = appimageTools.extract { inherit src; name = pname; }; +in appimageTools.wrapType2 { + inherit name src; + + extraPkgs = pkgs: with pkgs; [ libsecret ]; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A GUI front-end for Neo4j"; + homepage = "https://neo4j.com/"; + license = licenses.unfree; + maintainers = [ maintainers.bobvanderlinden ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix b/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix new file mode 100644 index 000000000000..5c4b508bb6bd --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix @@ -0,0 +1,48 @@ +{ lib, fetchFromGitHub +, buildGoModule, pkg-config, wrapGAppsHook, gobject-introspection +, gtk-layer-shell, gtk3, pango, gdk-pixbuf, atk +}: + +buildGoModule rec { + pname = "nwg-menu"; + version = "unstable-2021-06-12"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = "nwg-menu"; + rev = "b0746e26514a047ed9c6b975a71b7263aa39bd56"; + hash = "sha256-rxyf3CfpfWnRAlIR/pl+s7LGAZbZjdtNWPPK7BecdhQ="; + }; + + vendorSha256 = "sha256-nN5iBleK12SKY9PBiDA+tM4B8FiVGZLXbtJM2+YrEfA="; + + runVend = true; + + doCheck = false; + + buildInputs = [ atk gtk3 gdk-pixbuf gtk-layer-shell pango ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; + + prePatch = '' + for file in main.go tools.go; do + substituteInPlace $file --replace '/usr/share/nwg-menu' $out/share + done + ''; + + postInstall = '' + mkdir -p $out/share/ + cp menu-start.css $out/share/ + ''; + + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$out/share") + ''; + + meta = with lib; { + homepage = "https://github.com/nwg-piotr/nwg-menu"; + description = "MenuStart plugin for nwg-panel"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ berbiche ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/nixpkgs/pkgs/applications/misc/octoprint/default.nix index af42466d0ead..0c0dae0da42e 100644 --- a/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -33,6 +33,22 @@ let (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051") (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s") + # Requires websocket-client <1.0, >=0.57. Cannot do mkOverride b/c differing underscore/hyphen in pypi source name + ( + self: super: { + websocket-client = super.websocket-client.overridePythonAttrs ( + oldAttrs: rec { + version = "0.58.0"; + src = oldAttrs.src.override { + pname = "websocket_client"; + inherit version; + sha256 = "63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f"; + }; + } + ); + } + ) + # Octoprint needs zeroconf >=0.24 <0.25. While this should be done in # the mkOverride aboves, this package also has broken tests, so we need # a proper override. @@ -134,7 +150,7 @@ let tornado unidecode watchdog - websocket_client + websocket-client werkzeug wrapt zeroconf diff --git a/nixpkgs/pkgs/applications/misc/printrun/default.nix b/nixpkgs/pkgs/applications/misc/printrun/default.nix index 631609551306..7ae8662e2c19 100644 --- a/nixpkgs/pkgs/applications/misc/printrun/default.nix +++ b/nixpkgs/pkgs/applications/misc/printrun/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, glib, wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "printrun"; @@ -11,6 +11,8 @@ python3Packages.buildPythonApplication rec { sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81"; }; + nativeBuildInputs = [ glib wrapGAppsHook ]; + propagatedBuildInputs = with python3Packages; [ appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial ]; @@ -29,6 +31,14 @@ python3Packages.buildPythonApplication rec { done ''; + dontWrapGApps = true; + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software"; homepage = "https://github.com/kliment/Printrun"; diff --git a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 4175cb2b2220..2bf28aa892f5 100644 --- a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; - version = "2.2.54.2"; + version = "2.3.56.5"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -10,20 +10,19 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-ThmsxFXI1uReK+JwpHrIWzHpBdIOP77kDjv+QaK+Azk="; + sha256 = "sha256-Gg+LT1YKyUGNJE9XvWE1LSlIQ6Vq5GfVBTUw/A7Qx7E="; rev = version; + fetchSubmodules = true; }; + # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. + postInstall = null; + # See https://github.com/supermerill/SuperSlicer/issues/432 cmakeFlags = super.cmakeFlags ++ [ "-DSLIC3R_BUILD_TESTS=0" ]; - postInstall = '' - mkdir -p "$out/share/pixmaps/" - ln -s "$out/share/SuperSlicer/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" - ''; - desktopItems = [ (makeDesktopItem { name = appname; diff --git a/nixpkgs/pkgs/applications/misc/robo3t/default.nix b/nixpkgs/pkgs/applications/misc/robo3t/default.nix index 1b19d9ab9cc0..41f3475a645f 100644 --- a/nixpkgs/pkgs/applications/misc/robo3t/default.nix +++ b/nixpkgs/pkgs/applications/misc/robo3t/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, curl, zlib, glib, xorg, dbus, fontconfig, libGL, - freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: +{ lib +, stdenv +, fetchurl +, curl +, zlib +, glib +, xorg +, dbus +, fontconfig +, libGL +, freetype +, xkeyboard_config +, makeDesktopItem +, makeWrapper +}: let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; @@ -30,7 +43,7 @@ stdenv.mkDerivation rec { categories = "Development;IDE;"; }; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc @@ -51,6 +64,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + BASEDIR=$out/lib/robo3t mkdir -p $BASEDIR/bin @@ -72,13 +87,15 @@ stdenv.mkDerivation rec { makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb + + runHook postInstall ''; - meta = { + meta = with lib; { homepage = "https://robomongo.org/"; - description = "Query GUI for mongodb"; + description = "Query GUI for mongodb. Formerly called Robomongo"; platforms = [ "x86_64-linux" ]; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eperuffo ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ eperuffo ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/robomongo/default.nix b/nixpkgs/pkgs/applications/misc/robomongo/default.nix deleted file mode 100644 index af5285909c6c..000000000000 --- a/nixpkgs/pkgs/applications/misc/robomongo/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, - freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "robomongo"; - version = "0.9.0"; - - src = fetchurl { - url = "https://download.robomongo.org/${version}/linux/robomongo-${version}-linux-x86_64-0786489.tar.gz"; - sha256 = "1q8ahdz3afcw002p8dl2pybzkq4srk6bnikrz216yx1gswivdcad"; - }; - - icon = fetchurl { - url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png"; - sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2"; - }; - - desktopItem = makeDesktopItem { - name = "robomongo"; - exec = "robomongo"; - icon = icon; - comment = "Query GUI for mongodb"; - desktopName = "Robomongo"; - genericName = "MongoDB management tool"; - categories = "Development;IDE;mongodb;"; - }; - - nativeBuildInputs = [makeWrapper]; - - ldLibraryPath = lib.makeLibraryPath [ - stdenv.cc.cc - zlib - glib - xorg.libXi - xorg.libxcb - xorg.libXrender - xorg.libX11 - xorg.libSM - xorg.libICE - xorg.libXext - dbus - fontconfig - freetype - ]; - - installPhase = '' - BASEDIR=$out/lib/robomongo - - mkdir -p $BASEDIR/bin - cp bin/* $BASEDIR/bin - - mkdir -p $BASEDIR/lib - cp -r lib/* $BASEDIR/lib - - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications - - mkdir -p $out/share/icons - cp ${icon} $out/share/icons/robomongo.png - - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robomongo - - mkdir $out/bin - - makeWrapper $BASEDIR/bin/robomongo $out/bin/robomongo \ - --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ - --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb - ''; - - meta = { - homepage = "https://robomongo.org/"; - description = "Query GUI for mongodb"; - platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eperuffo ]; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/rofi/default.nix b/nixpkgs/pkgs/applications/misc/rofi/default.nix index 33a37e326127..d47d1fe26a61 100644 --- a/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; - maintainers = with maintainers; [ mbakke ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/nixpkgs/pkgs/applications/misc/skytemple/default.nix index a67d79f9bf90..0daaad2f2655 100644 --- a/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, wrapGAppsHook, python3Packages }: +{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -11,7 +11,15 @@ python3Packages.buildPythonApplication rec { sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9"; }; - buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; + buildInputs = [ + gobject-introspection + gtk3 + gtksourceview3 + # webkitgkt is used for rendering interactive statistics graph which + # can be seen by opening a ROM, entering Pokemon section, selecting + # any Pokemon, and clicking Stats and Moves tab. + webkitgtk + ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ natsort diff --git a/nixpkgs/pkgs/applications/misc/slides/default.nix b/nixpkgs/pkgs/applications/misc/slides/default.nix new file mode 100644 index 000000000000..ce5987d6c186 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/slides/default.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby }: + +buildGoModule rec { + pname = "slides"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "slides"; + rev = "v${version}"; + sha256 = "0vwpisyvsgmvrzp26hapghgqmm3fhrzrvdnmws00xc2q3fsij9qx"; + }; + + checkInputs = [ + bash + go + python3 + ruby + ]; + + vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f"; + + ldflags = [ + "-s" "-w" + "-X=main.Version=${version}" + ]; + + meta = with lib; { + description = "Terminal based presentation tool"; + homepage = "https://github.com/maaslalani/slides"; + license = licenses.mit; + maintainers = with maintainers; [ maaslalani ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index 62a6d4785f12..e20b95922f9a 100644 --- a/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "1.2.1"; + version = "2.2.6"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HASFaPqm/A1QQ4nkd2hgeyqWplwE1RTrWA937rJA5Oo="; + sha256 = "sha256-9g6rkSDjE7x/YprPX0dkzqgpjgED5qBpUUQoVv6fGkk="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; diff --git a/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/nixpkgs/pkgs/applications/misc/subsurface/default.nix index 19fdd4640e40..7420267aa7d2 100644 --- a/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -5,13 +5,13 @@ }: let - version = "4.9.10"; + version = "5.0.1"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "12ndhjplz3cwndwzhfc959dc0i6rm2qf3v2d8n9kba8nj63iblfs"; + sha256 = "01r836ckvrmgprjf4cqxn2n3w5w4pa2fjrhspjndsspic8nwlrwg"; fetchSubmodules = true; }); @@ -40,13 +40,13 @@ let googlemaps = stdenv.mkDerivation rec { pname = "googlemaps"; - version = "2018-06-02"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "54a357f9590d9cf011bf1713589f66bad65e00eb"; - sha256 = "159kslp6rj0qznzxijppwvv8jnswlfgf2pw4x8ladi8vp6bzxnzi"; + rev = "8f7def10c203fd3faa5ef96c5010a7294dca0759"; + sha256 = "1irz398g45hk6xizwzd07qcx1ln8f7l6bhjh15f56yc20waqpx1x"; }; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/applications/misc/survex/default.nix b/nixpkgs/pkgs/applications/misc/survex/default.nix new file mode 100644 index 000000000000..f6865f877d7d --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/survex/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchgit +, autoreconfHook +, pkg-config +, wxGTK30-gtk3 +, wxmac +, ffmpeg +, proj +, perl532 +, unscii +, python +, libGL +, libGLU +, xlibsWrapper +, docbook2x +, docbook5 +, Carbon +, Cocoa +}: + +let + perlenv = perl532.withPackages (perlPackages: with perlPackages; [ LocalePO ] ); +in +stdenv.mkDerivation rec { + pname = "survex"; + version = "1.2.44"; + + nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ]; + + buildInputs = [ + libGL libGLU ffmpeg proj + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + wxmac Carbon Cocoa + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + wxGTK30-gtk3 xlibsWrapper + ]; + + src = fetchgit { + url = "git://git.survex.com/survex"; + rev = version; + sha256 = "11gaqmabrf3av665jy3mr0m8hg76fmvnd0g3rghzmyh8d8v6xk34"; + }; + + enableParallelBuilding = true; + + # Docs rely on sgmltools-lite, a package that would be quite complex to + # provide as it is quite old. So this preConfigure hook effectively disables + # the doc generation. An example of packaging sgmltools-lite from Gentoo can + # be found here: + # https://gitweb.gentoo.org/repo/gentoo.git/tree/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild?id=0b8b716331049599ea3299981e3a9ea6e258c5e0 + + postPatch = '' + patchShebangs . + echo "" > doc/Makefile.am + # substituteInPlace doc/Makefile --replace "docbook2man" "docbook2man --sgml" # Will be needed once sgmltools-lite is packaged. + for perltool in './extract-msgs.pl' './gettexttomsg.pl' '$(srcdir)/gdtconvert' '$(srcdir)/gen_img2aven'; do + substituteInPlace src/Makefile.am \ + --replace "$perltool" "${perlenv}/bin/perl $perltool" + done + substituteInPlace lib/Makefile.am \ + --replace '$(srcdir)/make-pixel-font' '${perlenv}/bin/perl $(srcdir)/make-pixel-font' + substituteInPlace lib/make-pixel-font --replace /usr/share/unifont/unifont.hex ${unscii.extra}/share/fonts/misc/unifont.hex + ''; + + meta = with lib; { + description = "Free Software/Open Source software package for mapping caves"; + longDescription = '' + Survex is a Free Software/Open Source software package for mapping caves, + licensed under the GPL. It is designed to be portable and can be run on a + variety of platforms, including Linux/Unix, macOS, and Microsoft Windows. + ''; + homepage = "https://survex.com/"; + changelog = "https://github.com/ojwb/survex/blob/${version}/NEWS"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.matthewcroughan ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/ticker/default.nix b/nixpkgs/pkgs/applications/misc/ticker/default.nix index fd37a692d841..a3e2dc11c6f7 100644 --- a/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.0.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YVpspFBwao/7M2nTVMw+ANc0roL0vBO4DpNUb7Thp3Q="; + sha256 = "sha256-FavbBGmChWQ3xySPHlw5HisZwVaNe/NaxA6+InN8fL8="; }; - vendorSha256 = "sha256-nidOIjrTL4llV5GORebXOOPGeL6TxkurDY82cIc7+mU="; + vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU="; preBuild = '' buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}") diff --git a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index ebfaaa1db51d..6d9d9deefa20 100644 --- a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec { python-Levenshtein pyxdg requests - websocket_client + websocket-client ]; checkInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/misc/usql/default.nix b/nixpkgs/pkgs/applications/misc/usql/default.nix new file mode 100644 index 000000000000..7a83ec05c10a --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, unixODBC +, icu +}: + +buildGoModule rec { + pname = "usql"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "xo"; + repo = "usql"; + rev = "v${version}"; + sha256 = "sha256-fcKn4kHIRvMdgGFKDNQg49YxLc0Y5j/8VwKoDLiXbEU="; + }; + + vendorSha256 = "sha256-uAV8NLnqXjIDILfnbbkVr2BOIucQ8vX89KI5yIkVtus="; + + buildInputs = [ unixODBC icu ]; + + # These tags and flags are copied from build-release.sh + buildFlags = [ "-tags" ]; + buildFlagsArray = [ + "most" + "sqlite_app_armor" + "sqlite_fts5" + "sqlite_introspect" + "sqlite_json1" + "sqlite_stat4" + "sqlite_userauth" + "sqlite_vtable" + "sqlite_icu" + "no_adodb" + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/xo/usql/text.CommandVersion=${version}" + ]; + + # All the checks currently require docker instances to run the databases. + doCheck = false; + + meta = with lib; { + description = "Universal command-line interface for SQL databases"; + homepage = "https://github.com/xo/usql"; + license = licenses.mit; + maintainers = with maintainers; [ georgyo ]; + # usql does not build on ARM. + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; + +} diff --git a/nixpkgs/pkgs/applications/misc/variety/default.nix b/nixpkgs/pkgs/applications/misc/variety/default.nix index 2366d04b9ca1..5e7765a16fde 100644 --- a/nixpkgs/pkgs/applications/misc/variety/default.nix +++ b/nixpkgs/pkgs/applications/misc/variety/default.nix @@ -10,6 +10,7 @@ , hicolor-icon-theme , librsvg , wrapGAppsHook +, makeWrapper }: with python37Packages; @@ -27,10 +28,14 @@ buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook ]; - buildInputs = [ distutils_extra ]; + buildInputs = [ makeWrapper distutils_extra ]; doCheck = false; + postInstall = '' + wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ + ''; + prePatch = '' substituteInPlace variety_lib/varietyconfig.py \ --replace "__variety_data_directory__ = \"../data\"" "__variety_data_directory__ = \"$out/share/variety\"" @@ -76,7 +81,7 @@ buildPythonApplication rec { blur, as well as options to layer quotes and a clock onto the background. ''; license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres zfnmxt ]; + maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/veracrypt/default.nix b/nixpkgs/pkgs/applications/misc/veracrypt/default.nix index 5e5fda23d442..33d0da5c93a4 100644 --- a/nixpkgs/pkgs/applications/misc/veracrypt/default.nix +++ b/nixpkgs/pkgs/applications/misc/veracrypt/default.nix @@ -1,29 +1,39 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeself, yasm, fuse, wxGTK, lvm2 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, makeself +, yasm +, fuse +, wxGTK +, lvm2 +, substituteAll +, e2fsprogs +, exfat +, ntfs3g +, btrfs-progs +}: with lib; stdenv.mkDerivation rec { pname = "veracrypt"; - version = "1.24-Hotfix1"; + version = "1.24-Update7"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c"; + sha256 = "0i7h44zn2mjzgh416l7kfs0dk6qc7b1bxsaxqqqcvgrpl453n7bc"; }; - patches = [ - # https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86 - (fetchpatch { - url = "https://github.com/veracrypt/VeraCrypt/commit/afe6b2f45b15393026a1159e5f3d165ac7d0b94a.patch"; - sha256 = "1xm9cl6zinlr0vah5xr9bvh0y9gw4331zl7d2n5xvqrcdxw3ww1y"; - stripLen = 1; - }) - # https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86 - (fetchpatch { - url = "https://github.com/veracrypt/VeraCrypt/commit/3fa636d477119fff6e372074568edb42d038f508.patch"; - sha256 = "0qsccilip0ksnlzxina38a052gb533r4s422lxhrj3wv9zgpp7l3"; - stripLen = 1; + (substituteAll { + src = ./fix-paths.patch; + ext2 = "${e2fsprogs}/bin/mkfs.ext2"; + ext3 = "${e2fsprogs}/bin/mkfs.ext3"; + ext4 = "${e2fsprogs}/bin/mkfs.ext4"; + exfat = "${exfat}/bin/mkfs.exfat"; + ntfs = "${ntfs3g}/bin/mkfs.ntfs"; + btrfs = "${btrfs-progs}/bin/mkfs.btrfs"; }) ]; diff --git a/nixpkgs/pkgs/applications/misc/veracrypt/fix-paths.patch b/nixpkgs/pkgs/applications/misc/veracrypt/fix-paths.patch new file mode 100644 index 000000000000..56b4fc483804 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/veracrypt/fix-paths.patch @@ -0,0 +1,22 @@ +diff --color --unified --recursive --text a/Core/VolumeCreator.h b/Core/VolumeCreator.h +--- a/Core/VolumeCreator.h 2021-06-20 20:54:50.725210056 +0300 ++++ b/Core/VolumeCreator.h 2021-06-20 20:58:46.117742419 +0300 +@@ -77,12 +77,12 @@ + switch (fsType) + { + #if defined (TC_LINUX) +- case VolumeCreationOptions::FilesystemType::Ext2: return "mkfs.ext2"; +- case VolumeCreationOptions::FilesystemType::Ext3: return "mkfs.ext3"; +- case VolumeCreationOptions::FilesystemType::Ext4: return "mkfs.ext4"; +- case VolumeCreationOptions::FilesystemType::NTFS: return "mkfs.ntfs"; +- case VolumeCreationOptions::FilesystemType::exFAT: return "mkfs.exfat"; +- case VolumeCreationOptions::FilesystemType::Btrfs: return "mkfs.btrfs"; ++ case VolumeCreationOptions::FilesystemType::Ext2: return "@ext2@"; ++ case VolumeCreationOptions::FilesystemType::Ext3: return "@ext3@"; ++ case VolumeCreationOptions::FilesystemType::Ext4: return "@ext4@"; ++ case VolumeCreationOptions::FilesystemType::NTFS: return "@ntfs@"; ++ case VolumeCreationOptions::FilesystemType::exFAT: return "@exfat@"; ++ case VolumeCreationOptions::FilesystemType::Btrfs: return "@btrfs@"; + #elif defined (TC_MACOSX) + case VolumeCreationOptions::FilesystemType::MacOsExt: return "newfs_hfs"; + case VolumeCreationOptions::FilesystemType::exFAT: return "newfs_exfat"; diff --git a/nixpkgs/pkgs/applications/misc/visidata/default.nix b/nixpkgs/pkgs/applications/misc/visidata/default.nix index ad49a1b291e2..9663d09304f8 100644 --- a/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -1,17 +1,26 @@ -{ buildPythonApplication +{ stdenv , lib +, buildPythonApplication , fetchFromGitHub , dateutil -, pyyaml +, pandas +, requests +, lxml , openpyxl , xlrd , h5py -, fonttools -, lxml -, pandas +, psycopg2 , pyshp +, fonttools +, pyyaml +, pdfminer +, vobject +, tabulate +, wcwidth +, zstandard , setuptools -, withPcap ? true, dpkt ? null, dnslib ? null +, git +, withPcap ? true, dpkt, dnslib }: buildPythonApplication rec { pname = "visidata"; @@ -25,19 +34,62 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ + # from visidata/requirements.txt + # packages not (yet) present in nixpkgs are commented dateutil - pyyaml + pandas + requests + lxml openpyxl xlrd h5py - fonttools - lxml - pandas + psycopg2 pyshp + #mapbox-vector-tile + #pypng + fonttools + #sas7bdat + #xport + #savReaderWriter + pyyaml + #namestand + #datapackage + pdfminer + #tabula + vobject + tabulate + wcwidth + zstandard setuptools ] ++ lib.optionals withPcap [ dpkt dnslib ]; - doCheck = false; + checkInputs = [ + git + ]; + + # check phase uses the output bin, which is not possible when cross-compiling + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + + checkPhase = '' + # disable some tests which require access to the network + rm tests/load-http.vd # http + rm tests/graph-cursor-nosave.vd # http + rm tests/messenger-nosave.vd # dns + + # disable some tests which expect Python == 3.6 (not our current version) + # see https://github.com/saulpw/visidata/issues/1014 + rm tests/describe.vd + rm tests/describe-error.vd + rm tests/edit-type.vd + + # tests use git to compare outputs to references + git init -b "test-reference" + git config user.name "nobody"; git config user.email "no@where" + git add .; git commit -m "test reference" + + substituteInPlace dev/test.sh --replace "bin/vd" "$out/bin/vd" + bash dev/test.sh + ''; meta = { inherit version; diff --git a/nixpkgs/pkgs/applications/misc/xplr/default.nix b/nixpkgs/pkgs/applications/misc/xplr/default.nix index fbd48287e32a..5d3f2ee4df7e 100644 --- a/nixpkgs/pkgs/applications/misc/xplr/default.nix +++ b/nixpkgs/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.14.0"; + version = "0.14.2"; src = fetchCrate { inherit pname version; - sha256 = "1cyybqb91n91h6nig7rxxxw9c7krz80jdfl25bdr7mlbzymssn0q"; + sha256 = "1bgylz2x44rjxpd6dvd44pr57f18di0nj5sbqh4my8lkanr7isli"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "1bj1rgsmkbby4ma325fhpb911bwabhd5bihyv9j0dfvgm1ffdm8a"; + cargoSha256 = "07rlmz4rkgdcvr0dvbrz56s5vacxcvy09rgz70kr692xlpym4jvq"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; |