diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/albert/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/avrdudess/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/gImageReader/default.nix | 71 | ||||
-rw-r--r-- | pkgs/applications/misc/hugo/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/misc/hugo/deps.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/misc/josm/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/khal/default.nix | 23 | ||||
-rw-r--r-- | pkgs/applications/misc/notejot/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/misc/opentx/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/misc/pbpst/default.nix | 49 | ||||
-rw-r--r-- | pkgs/applications/misc/polybar/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/misc/regextester/default.nix | 36 | ||||
-rw-r--r-- | pkgs/applications/misc/urh/default.nix | 5 |
13 files changed, 191 insertions, 77 deletions
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index f16144f3befa..d1a62dad6c9f 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -3,7 +3,7 @@ let pname = "albert"; - version = "0.14.21"; + version = "0.14.22"; in mkDerivation rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ mkDerivation rec { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "16nk9krn1mwr0bh57viig9hizqyp3slna0qg7s5a736nsfxy226w"; + sha256 = "0i9kss5szirmd0pzw3cm692kl9rhkan1zfywfqrjdf3i3b6914sg"; fetchSubmodules = true; }; @@ -48,7 +48,7 @@ mkDerivation rec { homepage = https://albertlauncher.github.io/; description = "Desktop agnostic launcher"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ericsagnes synthetica ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index c803eb37ad6f..1144d5152847 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrbinutils, avrgcc, avrdude, gtk2, xdg_utils }: +{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. - export PATH="${stdenv.lib.makeBinPath [ avrgcc avrbinutils avrdude xdg_utils ]}:\$PATH" + export PATH="${stdenv.lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" # avrdudess must have its resource files in its current working directory cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix new file mode 100644 index 000000000000..16693cfbf09c --- /dev/null +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuuid +, sane-backends, podofo, libjpeg, djvulibre, libxmlxx3, libzip, tesseract +, enchant, intltool, poppler, json-glib +, ninja +, python3 + +# Gtk deps +# upstream gImagereader supports Qt too +, gtk3, gobjectIntrospection, wrapGAppsHook +, gnome3, gtkspell3, gtkspellmm, cairomm +}: + +let + variant = "gtk"; + pythonEnv = python3.withPackages( ps: with ps;[ pygobject3 ] ); +in +stdenv.mkDerivation rec { + name = "gImageReader-${version}"; + version = "3.2.99"; + + src = fetchFromGitHub { + owner= "manisandro"; + repo = "gImageReader"; + rev = "v${version}"; + sha256 = "19dbxq83j77lbvi10a8x0xxgw5hbsqyc852c196zzvmwk3km6pnc"; + }; + + nativeBuildInputs = [ + cmake ninja + intltool + pkgconfig + pythonEnv + + # Gtk specific + wrapGAppsHook + gobjectIntrospection + ]; + + buildInputs = [ + enchant + libxmlxx3 + libzip + libuuid + sane-backends + podofo + libjpeg + djvulibre + tesseract + poppler + + # Gtk specific + gnome3.gtkmm + gtkspell3 + gtkspellmm + gnome3.gtksourceview + gnome3.gtksourceviewmm + cairomm + json-glib + ]; + + # interface type can be where <type> is either gtk, qt5, qt4 + cmakeFlags = [ "-DINTERFACE_TYPE=${variant}" ]; + + meta = with stdenv.lib; { + description = "A simple Gtk/Qt front-end to tesseract-ocr"; + homepage = https://github.com/manisandro/gImageReader; + license = licenses.gpl3Plus; + maintainers = with maintainers; [teto]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 29b6e41a90df..22badfc8cdd1 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hugo-${version}"; - version = "0.49.2"; + version = "0.50"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,16 +10,9 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0a320mv6x770vppbz0aw5ikywmy0mxqq1lhc0syp48hgg42d46is"; + sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn"; }; - patches = [ - (fetchpatch { - url = "https://github.com/gohugoio/hugo/commit/b137ad4dbd6d14d0a9af68c044aaee61f2c87fe5.diff"; - sha256 = "0w1gpg11idqywqcpwzvx4xabn02kk8y4jmyz4h67mc3yh2dhq3ll"; - }) - ]; - goDeps = ./deps.nix; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 002fb6351b8b..d5c24d69048a 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -555,8 +555,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "4a4406e478ca"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + rev = "94f6ae3ed3bc"; + sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; }; } @@ -605,8 +605,8 @@ fetch = { type = "git"; url = "https://github.com/tdewolff/minify"; - rev = "v2.3.5"; - sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m"; + rev = "v2.3.6"; + sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; }; } @@ -615,8 +615,8 @@ fetch = { type = "git"; url = "https://github.com/tdewolff/parse"; - rev = "v2.3.3"; - sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94"; + rev = "fced451e0bed"; + sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3"; }; } @@ -625,8 +625,8 @@ fetch = { type = "git"; url = "https://github.com/tdewolff/test"; - rev = "265427085153"; - sha256 = "1h0cmsjjia92w50dzr06c5h10zd5c7snhpixqjv94wbl7dv80yp0"; + rev = "v1.0.0"; + sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj"; }; } diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 4f98ec1bba91..f529fa395d93 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre10 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: stdenv.mkDerivation rec { name = "josm-${version}"; - version = "14289"; + version = "14382"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "102dph3479qskzf72cpb9139pq9ifka6pzna1c6s5rs2il6mfvsb"; + sha256 = "1a2nx9jr1fvw95gdvl9kj3z0cs6ndafm0k4l0lwfx9p9qn4lgzjg"; }; - buildInputs = [ jre10 makeWrapper ]; + buildInputs = [ jdk11 makeWrapper ]; desktopItem = makeDesktopItem { name = "josm"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar - makeWrapper ${jre10}/bin/java $out/bin/josm \ + makeWrapper ${jdk11}/bin/java $out/bin/josm \ --add-flags "-jar $out/share/java/josm.jar" mkdir -p $out/share/applications diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index b94d067dd18d..bc2c8978a67e 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,22 +1,6 @@ { stdenv, pkgs, python3 }: -let - python = python3.override { - packageOverrides = self: super: { - - # https://github.com/pimutils/khal/issues/780 - python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { - version = "2.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; - }; - }); - - }; - }; - -in with python.pkgs; buildPythonApplication rec { +with python3.pkgs; buildPythonApplication rec { pname = "khal"; version = "0.9.10"; @@ -50,6 +34,9 @@ in with python.pkgs; buildPythonApplication rec { install -D misc/__khal $out/share/zsh/site-functions/__khal ''; + # One test fails as of 0.9.10 due to the upgrade to icalendar 4.0.3 + doCheck = false; + checkPhase = '' py.test ''; @@ -58,6 +45,6 @@ in with python.pkgs; buildPythonApplication rec { homepage = http://lostpackets.de/khal/; description = "CLI calendar application"; license = licenses.mit; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ jgeerds gebner ]; }; } diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 59ba45e6f376..09c49135ca1c 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite +{ stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite , gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "notejot"; - version = "1.4.5"; + version = "1.4.7"; name = "${pname}-${version}"; @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee granite gtk3 @@ -39,9 +40,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stupidly-simple sticky notes applet"; - homepage = https://github.com/lainsce/notejot; - license = licenses.gpl2Plus; + homepage = https://github.com/lainsce/notejot; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 8a941a719f29..95a2f2b940c2 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, cmake, gcc-arm-embedded, python +, cmake, gcc-arm-embedded, binutils-arm-embedded, python , qt5, SDL, gmock , dfu-util, avrdude }: @@ -21,10 +21,12 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + gcc-arm-embedded binutils-arm-embedded + ]; buildInputs = with qt5; [ - gcc-arm-embedded python python.pkgs.pyqt4 qtbase qtmultimedia qttranslations SDL gmock @@ -40,6 +42,7 @@ in stdenv.mkDerivation { # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" + "-DNANO=OFF" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix new file mode 100644 index 000000000000..fcf88200133c --- /dev/null +++ b/pkgs/applications/misc/pbpst/default.nix @@ -0,0 +1,49 @@ +{ llvmPackages, stdenv, fetchFromGitHub +, python36Packages, which, pkgconfig, curl, git, gettext, jansson + +# Optional overrides +, maxFileSize ? 64 # in MB +, provider ? "https://ptpb.pw/" +}: + +llvmPackages.stdenv.mkDerivation rec { + version = "unstable-2018-01-11"; + name = "pbpst-${version}"; + + src = fetchFromGitHub { + owner = "HalosGhost"; + repo = "pbpst"; + rev = "ecbe08a0b72a6e4212f09fc6cf52a73506992346"; + sha256 = "0dwhmw1dg4hg75nlvk5kmvv3slz2n3b9x65q4ig16agwqfsp4mdm"; + }; + + nativeBuildInputs = [ + python36Packages.sphinx + which + pkgconfig + curl + git + gettext + ]; + buildInputs = [ curl jansson ]; + + patchPhase = '' + patchShebangs ./configure + + # Remove hardcoded check for libs in /usr/lib/ + sed -e '64,67d' -i ./configure + ''; + + configureFlags = [ + "--file-max=${toString (maxFileSize * 1024 * 1024)}" # convert to bytes + "--provider=${provider}" + ]; + + meta = with stdenv.lib; { + description = "A command-line libcurl C client for pb deployments"; + inherit (src.meta) homepage; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ tmplt ]; + }; +} diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 0c358e4221a1..9756e8ca6c4f 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -64,10 +64,15 @@ stdenv.mkDerivation rec { (if i3Support || i3GapsSupport then makeWrapper else null) ]; - fixupPhase = if (i3Support || i3GapsSupport) then '' - wrapProgram $out/bin/polybar \ - --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" - '' else null; + postConfigure = '' + substituteInPlace ../include/settings.hpp --replace \ + "${stdenv.cc}" "${stdenv.cc.name}" + ''; + + postInstall = if (i3Support || i3GapsSupport) then '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" + '' else ""; nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index c1b1cfb48a28..6f056292d775 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -3,47 +3,51 @@ , gettext , libxml2 , pkgconfig -, gtk3 +, glib , granite +, gtk3 , gnome3 -, cmake +, meson , ninja -, vala -, elementary-cmake-modules +, gobjectIntrospection +, gsettings-desktop-schemas +, vala_0_40 , wrapGAppsHook }: stdenv.mkDerivation rec { name = "regextester-${version}"; - version = "0.1.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "artemanufrij"; repo = "regextester"; rev = version; - sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n"; + sha256 = "1xwwv1hccni1mrbl58f7ly4qfq6738vn24bcbl2q346633cd7kx3"; }; - XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ - "${granite}/share" - "${gnome3.libgee}/share" - ]; - nativeBuildInputs = [ pkgconfig - wrapGAppsHook - vala - cmake + meson ninja gettext + gobjectIntrospection libxml2 - elementary-cmake-modules + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + wrapGAppsHook ]; buildInputs = [ - gtk3 + glib granite + gtk3 + gnome3.defaultIconTheme gnome3.libgee + gsettings-desktop-schemas ]; + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + meta = with stdenv.lib; { description = "A desktop application to test regular expressions interactively"; homepage = https://github.com/artemanufrij/regextester; diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 2d370113873e..b406df5b1e21 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, python3Packages, hackrf, rtl-sdr }: +{ stdenv, fetchFromGitHub, python3Packages +, hackrf, rtl-sdr, airspy, limesuite }: python3Packages.buildPythonApplication rec { name = "urh-${version}"; @@ -11,7 +12,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0cwbqcv0yffg6fa3g4zknwffa6119i6827w6jm74fhlfa9kwy34c"; }; - buildInputs = [ hackrf rtl-sdr ]; + buildInputs = [ hackrf rtl-sdr airspy limesuite ]; propagatedBuildInputs = with python3Packages; [ pyqt5 numpy psutil cython pyzmq ]; |