aboutsummaryrefslogtreecommitdiff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/ausweisapp2/default.nix4
-rw-r--r--pkgs/applications/misc/cura/default.nix11
-rw-r--r--pkgs/applications/misc/curaengine/default.nix4
-rw-r--r--pkgs/applications/misc/dasel/default.nix4
-rw-r--r--pkgs/applications/misc/electrum/default.nix6
-rw-r--r--pkgs/applications/misc/foxtrotgps/default.nix43
-rw-r--r--pkgs/applications/misc/foxtrotgps/gps-status-fix.patch14
-rw-r--r--pkgs/applications/misc/gphoto2/default.nix37
-rw-r--r--pkgs/applications/misc/pdfarranger/default.nix10
-rw-r--r--pkgs/applications/misc/qlandkartegt/default.nix4
-rw-r--r--pkgs/applications/misc/simplenote/default.nix4
-rw-r--r--pkgs/applications/misc/syncthingtray/default.nix4
12 files changed, 109 insertions, 36 deletions
diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix
index 911a30ccf611..dc46edc070fd 100644
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
- version = "1.20.2";
+ version = "1.22.0";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
- sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb";
+ sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index c0aa0a481bdc..46143747f6d9 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,26 +1,27 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase,
+ qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }:
mkDerivation rec {
pname = "cura";
- version = "4.7.1";
+ version = "4.8.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = version;
- sha256 = "19an168iad3cb5w8i71c0wbr79qnz5qnpxqx1j6dgh64qz6ffn2r";
+ sha256 = "060fqzspipm93ks0inrj7yrj5wmvkdfv8xaxrv22590yb9f95s9m";
};
materials = fetchFromGitHub {
owner = "Ultimaker";
repo = "fdm_materials";
rev = version;
- sha256 = "1w6i0dlff8b30q987x3y0zv8847fc8ppfcr9vi982msmv284c89z";
+ sha256 = "0hi9w1fsnazlr0vvxdr3alsdb8m1vjjfp5zhmlz4kyyxhsy3bc33";
};
buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
propagatedBuildInputs = with python3.pkgs; [
- libsavitar numpy-stl pyserial requests uranium zeroconf
+ libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d
sentry-sdk trimesh
] ++ plugins;
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 5cc5db3115fb..8993c01a6bd2 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "curaengine";
- version = "4.7.1";
+ version = "4.8.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
- sha256 = "177fk6j4gn3ssi8j1qxj8p4486f7jkz328vc75agxnh7vhd4mwsm";
+ sha256 = "083l327ry6hv3yaa1p8dx1hx7fm12b0lh5nlbshxjyym0vi15rw2";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index ca1a87dd2dd9..d76cf9b106e7 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -16,6 +16,10 @@ buildGoModule rec {
vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";
+ buildFlagsArray = ''
+ -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version}
+ '';
+
meta = with stdenv.lib; {
description = "Query and update data structures from the command line";
longDescription = ''
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 40ecd61304f1..df6c99768e84 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -19,7 +19,7 @@
}:
let
- version = "4.0.5";
+ version = "4.0.6";
# electrum is not compatible with dnspython 2.0.0 yet
# use the latest 1.x release instead
@@ -43,7 +43,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
- sha256 = "0fdsgxzgsxvx6hhjag894nzzdfq989bx1d4anljzcz2ppy4ivpxg";
+ sha256 = "0mdbg2sq56nv0hx0rrcbgrv1lv89nqc6cqigivgk665hhjm4v5kq";
extraPostFetch = ''
mv $out ./all
@@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "06ml9lwa5k2dp56sm5s7dsl6qirqmgim7rn853cqcq9n45z41437";
+ sha256 = "0sp8p720g3rqnh52ddhaw2v4hjgpxcwbackw9qc1g9xac1q0942d";
};
postUnpack = ''
diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix
index dc3f1922c214..9ac701014906 100644
--- a/pkgs/applications/misc/foxtrotgps/default.nix
+++ b/pkgs/applications/misc/foxtrotgps/default.nix
@@ -1,16 +1,32 @@
-{ fetchurl, stdenv, pkg-config, wrapGAppsHook, curl, gnome2, gpsd, gtk2
+{ stdenv, fetchbzr, autoreconfHook, texinfo, help2man, imagemagick, pkg-config
+, curl, gnome2, gpsd, gtk2, wrapGAppsHook
, intltool, libexif, python3Packages, sqlite }:
-stdenv.mkDerivation rec {
+let
+ srcs = {
+ foxtrot = fetchbzr {
+ url = "lp:foxtrotgps";
+ rev = "326";
+ sha256 = "191pgcy5rng8djy22a5z9s8gssc73f9p5hm4ig52ra189cb48d8k";
+ };
+ screenshots = fetchbzr {
+ url = "lp:foxtrotgps/screenshots";
+ rev = "2";
+ sha256 = "1sgysn3dhfhrv7rj7wf8f2119vmhc1s1zzsp4r3nlrr45d20wmsv";
+ };
+ };
+in stdenv.mkDerivation rec {
pname = "foxtrotgps";
- version = "1.2.2";
+ version = "1.2.2+326";
- src = fetchurl {
- url = "https://www.foxtrotgps.org/releases/foxtrotgps-${version}.tar.xz";
- sha256 = "0grn35j5kwc286dxx18fv32qa330xmalqliwy6zirxmj6dffvrkg";
- };
+ # Pull directly from bzr because gpsd API version 9 is not supported on latest release
+ src = srcs.foxtrot;
+
+ patches = [
+ ./gps-status-fix.patch
+ ];
- nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+ nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man imagemagick wrapGAppsHook ];
buildInputs = [
curl.dev
@@ -22,7 +38,16 @@ stdenv.mkDerivation rec {
sqlite.dev
(python3Packages.python.withPackages (pythonPackages: with python3Packages;
[ beautifulsoup4 feedparser sqlalchemy ]))
- ];
+ ];
+
+ postUnpack = ''
+ cp -R ${srcs.screenshots} $sourceRoot/doc/screenshots
+ chmod -R u+w $sourceRoot/doc/screenshots
+ '';
+
+ preConfigure = ''
+ intltoolize --automake --copy --force
+ '';
meta = with stdenv.lib; {
description = "GPS/GIS application optimized for small screens";
diff --git a/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch b/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch
new file mode 100644
index 000000000000..e9b3624a174b
--- /dev/null
+++ b/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch
@@ -0,0 +1,14 @@
+--- foxtrot/src/gps_functions.c.orig 2020-12-04 15:02:22.290163204 -0600
++++ foxtrot/src/gps_functions.c 2020-12-04 15:04:54.470648534 -0600
+@@ -762,7 +762,11 @@
+ {
+ gpsdata->fix.time = (time_t) 0;
+ }
++#if GPSD_API_MAJOR_VERSION >= 9
++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
++#else
+ gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
++#endif
+ if (gpsdata->valid)
+ {
+ gpsdata->seen_valid = TRUE;
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index cdfbe3f6dc1f..7bda292a4cba 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -1,17 +1,38 @@
-{ stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt, gettext
-, libjpeg, readline, libtool
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, gettext
+, libexif
+, libgphoto2
+, libjpeg
+, libtool
+, popt
+, readline
}:
stdenv.mkDerivation rec {
- name = "gphoto2-2.5.26";
+ pname = "gphoto2";
+ version = "2.5.26";
- src = fetchurl {
- url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
- sha256 = "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn";
+ src = fetchFromGitHub {
+ owner = "gphoto";
+ repo = "gphoto2";
+ rev = "v${version}";
+ sha256 = "1w01j3qvjl2nlfs38rnsmjvn3r0r2xf7prxz1i6yarbpj3fzwqqc";
};
- nativeBuildInputs = [ pkgconfig gettext libtool ];
- buildInputs = [ libgphoto2 libexif popt libjpeg readline ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkgconfig
+ gettext
+ libtool
+ ];
+
+ buildInputs = [
+ libexif
+ libgphoto2
+ libjpeg
+ popt
+ readline
+ ];
meta = with stdenv.lib; {
description = "A ready to use set of digital camera software applications";
diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix
index b8f7c4641d20..8c8413b2ce60 100644
--- a/pkgs/applications/misc/pdfarranger/default.nix
+++ b/pkgs/applications/misc/pdfarranger/default.nix
@@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec {
pname = "pdfarranger";
- version = "1.6.0";
+ version = "1.6.2";
src = fetchFromGitHub {
- owner = "jeromerobert";
+ owner = pname;
repo = pname;
rev = version;
- sha256 = "03siz4ar6flyvrrgh7hr7sslc6n9x5d9i13lc5rm2qnssd0qdich";
+ sha256 = "wJ6ImWpszfgErfLh7YgHirVKFIt0ij8A/CdYJmkNBP0=";
};
nativeBuildInputs = [
@@ -33,6 +33,10 @@ python3Packages.buildPythonApplication rec {
# incompatible with wrapGAppsHook
strictDeps = false;
+ dontWrapGApps = true;
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
doCheck = false; # no tests
diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix
index d780125fbbfa..9ae65a962ddc 100644
--- a/pkgs/applications/misc/qlandkartegt/default.nix
+++ b/pkgs/applications/misc/qlandkartegt/default.nix
@@ -33,6 +33,10 @@ mkDerivation rec {
sha256 = "16hql8ignzw4n1hlp4icbvaddqcadh2rjns0bvis720535112sc8";
})
(fetchpatch {
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-timespec.patch?h=qlandkartegt";
+ sha256 = "1yzdwfsgjn7q04r9f7s5qk50y25hdl384dxrmpfmkm97fmpgyr7w";
+ })
+ (fetchpatch {
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-ver_str.patch?h=qlandkartegt";
sha256 = "13fg05gqrjfa9j00lrqz1b06xf6r5j01kl6l06vkn0hz1jzxss5m";
})
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 9aaeca14a209..fa0a47fdcb5e 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -17,10 +17,10 @@ let
pname = "simplenote";
- version = "2.1.0";
+ version = "2.2.0";
sha256 = {
- x86_64-linux = "0lg48nq493anpnm20vw72y242nxa1g903bxzp4pngzxyi986jddz";
+ x86_64-linux = "123b0fh14068s2z3k6s5mmh46xwlz02qfnpmj838zlm5hckjmifv";
}.${system} or throwSystem;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index beccfe5477bb..bbe629ecb14f 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -20,14 +20,14 @@
}:
mkDerivation rec {
- version = "1.0.1";
+ version = "1.1.0";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
- sha256 = "1dln5gh3p8nz9qmg07cw2s0lpzp3rfhyrwdhczj89g27bwk0lr4k";
+ sha256 = "0nzkzx870hzil2kny1irp4w2kxz5gmpchr2qxb7q4f9cnih92n0j";
};
buildInputs = [ qtbase cpp-utilities qtutilities ]
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:41:31 +0000