diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/albert/default.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/misc/direwolf/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/get_iplayer/default.nix | 15 | ||||
-rw-r--r-- | pkgs/applications/misc/guake/default.nix | 77 | ||||
-rw-r--r-- | pkgs/applications/misc/ipmiview/default.nix | 34 | ||||
-rw-r--r-- | pkgs/applications/misc/kdbplus/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/ocropus/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/misc/quicksynergy/default.nix | 35 | ||||
-rw-r--r-- | pkgs/applications/misc/redshift/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/scim/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/slic3r/fix-no-display.patch | 59 | ||||
-rw-r--r-- | pkgs/applications/misc/solaar/default.nix | 43 | ||||
-rw-r--r-- | pkgs/applications/misc/termite/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/yakuake/default.nix | 10 |
14 files changed, 248 insertions, 90 deletions
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix new file mode 100644 index 00000000000..b6c0feede6c --- /dev/null +++ b/pkgs/applications/misc/albert/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, qtbase, qtx11extras, makeQtWrapper, muparser, cmake }: + +stdenv.mkDerivation rec { + name = "albert-${version}"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "manuelschneid3r"; + repo = "albert"; + rev = "v${version}"; + sha256 = "0lzj1gbcc5sp2x1c0d3s21y55kcnnn4dmy8d205mrgnyavjrak7n"; + }; + + buildInputs = [ cmake qtbase qtx11extras muparser makeQtWrapper ]; + + fixupPhase = '' + wrapQtProgram $out/bin/albert + ''; + + meta = { + homepage = https://github.com/manuelSchneid3r/albert; + description = "Desktop agnostic launcher"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.ericsagnes ]; + }; +} diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index fc8d0ec36c8..51a48db34e9 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, alsaLib }: +{ stdenv, fetchFromGitHub, unzip, alsaLib }: let version = "1.2"; in @@ -6,9 +6,11 @@ stdenv.mkDerivation rec { name = "direwolf-${version}"; inherit version; - src = fetchurl { - url = "http://home.comcast.net/~wb2osz/Version%201.2/direwolf-${version}-src.zip"; - sha256 = "0csl6harx7gmjmamxy0ylzhbamppphffisk8j33dc6g08k6rc77f"; + src = fetchFromGitHub { + owner = "wb2osz"; + repo = "direwolf"; + rev = "8b81a32"; + sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs"; }; buildInputs = [ diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index d3dfd000c10..e6ca8d207e8 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,23 +1,28 @@ {stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}: buildPerlPackage { - name = "get_iplayer-2.86"; + name = "get_iplayer-2.94"; buildInputs = [makeWrapper perl]; - propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP]; + propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLSimple]; preConfigure = "touch Makefile.PL"; doCheck = false; + patchPhase = '' + sed -e 's|^update_script|#update_script|' \ + -e '/WARNING.*updater/d' \ + -i get_iplayer + ''; + installPhase = '' mkdir -p $out/bin cp get_iplayer $out/bin - sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg.bin}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB ''; src = fetchurl { - url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.86.tar.gz; - sha256 = "0zhcw0ikxrrz1jayx7jjgxmdf7gzk4pmzfvpraxmv64xwzgc1sc1"; + url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.94.tar.gz; + sha256 = "16p0bw879fl8cs6rp37g1hgrcai771z6rcqk2nvm49kk39dx1zi4"; }; } diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix new file mode 100644 index 00000000000..4f6733e7d8d --- /dev/null +++ b/pkgs/applications/misc/guake/default.nix @@ -0,0 +1,77 @@ +/* Beware! +After starting Guake it will give the error message "Guake can not init! Gconf Error. Have you installed guake.schemas properly?", +which will have to be resolved manually, because I have not found a way to automate this, without being impure. + +If you have Guake installed, you can use `nix-build -A gnome3.guake` to get the path to the build directory in the nix store, +which then can be used in the following command to install the schemas file of Guake: +gconftool-2 --install-schema-file /path/returned/by/nix-build/share/gconf/schemas/guake.schemas + +It can be removed again by the following command: +gconftool-2 --recursive-unset /apps/guake +*/ +{ stdenv, fetchurl, lib +, pkgconfig, libtool, intltool, makeWrapper +, dbus, gtk2, gconf, python2, python2Packages, libutempter, vte, keybinder, gnome2, gnome3 }: + +with lib; + +let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ]; + pySubDir = "lib/${python2.libPrefix}/site-packages"; + pyPath = makeSearchPath pySubDir (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); + in stdenv.mkDerivation rec { + name = "guake-${version}"; + version = "0.8.3"; + + src = fetchurl { + url = "https://github.com/Guake/guake/archive/${version}.tar.gz"; + sha256 = "1lbmdz3i9a97840h8239s360hd37nmhy3hs6kancxbzl1512ak1y"; + }; + + nativeBuildInputs = [ pkgconfig libtool intltool makeWrapper ]; + + buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]); + + patchPhase = '' + patchShebangs . + ''; + + configureScript = "./autogen.sh"; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-schemas-install" + ]; + + installFlags = [ + # Configuring the installation to not install gconf schemas is not always supported, + # therefore gconftool-2 has this variable, which will make gconftool-2 not update any of the databases. + "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + postInstall = '' + mkdir -p $out/share/gconf/schemas + cp data/guake.schemas $out/share/gconf/schemas + ''; + + postFixup = '' + for bin in $out/bin/{guake,guake-prefs}; do + substituteInPlace $bin \ + --replace '/usr/bin/env python2' ${python2}/bin/python2 + wrapProgram $bin \ + --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \ + --prefix PYTHONPATH : "$out/${pySubDir}:${pyPath}:$PYTHONPATH" + done + ''; + + meta = { + description = "Drop-down terminal for GNOME"; + homepage = http://guake-project.org; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.msteen ]; + }; +} diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix new file mode 100644 index 00000000000..6a111d48cee --- /dev/null +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "IPMIView-${version}"; + version = "20151223"; + + src = fetchurl { + url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_V2.11.0_bundleJRE_Linux_x64_${version}.tar.gz"; + sha256 = "1rv9j0id7i2ipm25n60bpfdm1gj44xg2aj8rnx4s6id3ln90q121"; + }; + + buildInputs = [ patchelf makeWrapper ]; + + buildPhase = with xorg; '' + patchelf --set-rpath "${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" ./jre/lib/amd64/xawt/libmawt.so + patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so + patchelf --set-rpath "${libXcursor}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws + patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java + ''; + + installPhase = '' + mkdir -p $out/bin + cp -R . $out/ + echo "$out/jre/bin/java -jar $out/IPMIView20.jar" > $out/bin/IPMIView + chmod +x $out/bin/IPMIView + ''; + + meta = with stdenv.lib; { + license = licenses.unfree; + }; + } + diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index ffde422c18b..bf1b77534ce 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -8,17 +8,17 @@ let in stdenv.mkDerivation rec { name = "kdbplus-${version}"; - version = "3.2"; + version = "3.3"; src = requireFile { message = '' Nix can't download kdb+ for you automatically. Go to http://kx.com and download the free, 32-bit version for Linux. Then run "nix-prefetch-url file:///linux.zip" in the - directory where you saved it. Note you need version 3.2. + directory where you saved it. Note you need version 3.3. ''; name = "linux.zip"; - sha256 = "0ah1kfvxnrck1kg8j7rpzgj6amji62zbm4ya6q55l54gm3qq6q0r"; + sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940"; }; dontStrip = true; diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index b53a928931b..0e6b13f9a28 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -2,11 +2,11 @@ let getmodel = name: sha256: { + inherit name; src = fetchurl { url = "http://www.tmbdev.net/ocropy/${name}"; inherit sha256; }; - inherit name; }; models = [ @@ -16,10 +16,10 @@ let "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b") ]; - version = "20150316"; in -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonPackage rec { name = "ocropus-${version}"; + version = "20150316"; src = fetchFromGitHub { sha256 = "0m5bm2ah3p29c13vp7hz7rm058qnlm840zd8xv20byijhlz0447g"; @@ -49,7 +49,6 @@ pythonPackages.buildPythonPackage { ''; meta = with stdenv.lib; { - inherit version; description = "Open source document analysis and OCR system"; license = licenses.asl20; homepage = https://github.com/tmbdev/ocropy/; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix new file mode 100644 index 00000000000..90737a344ca --- /dev/null +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, pkgconfig, gtk2, synergy}: + +stdenv.mkDerivation rec { + name = "quicksynergy-${version}"; + version = "0.9.0"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz"; + sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix"; + }; + buildInputs = [ + pkgconfig + gtk2 + synergy + ]; + preBuild = " + sed -i 's@/usr/bin@${synergy.out}/bin@' src/synergy_config.c + "; + meta = { + description = "GUI application to share mouse and keyboard between computers"; + longDescription = " + QuickSynergy is a graphical interface (GUI) for easily configuring + Synergy2, an application that allows the user to share his mouse and + keyboard between two or more computers. + + Without the need for any external hardware, Synergy2 uses the TCP-IP + protocol to share the resources, even between machines with diferent + operating systems, such as Mac OS, Linux and Windows. + + Remember to open port 24800 (used by synergys program) if you want to + host mouse and keyboard."; + homepage = https://code.google.com/p/quicksynergy/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.spinus ]; + }; +} diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index abe25afda5f..e62deb9a348 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -7,13 +7,14 @@ }: let - version = "1.11"; mkFlag = flag: name: if flag then "--enable-${name}" else "--disable-${name}"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "redshift-${version}"; + version = "1.11"; + src = fetchurl { sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh"; url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; @@ -51,7 +52,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "Gradually change screen color temperature"; longDescription = '' The color temperature is set according to the position of the diff --git a/pkgs/applications/misc/scim/default.nix b/pkgs/applications/misc/scim/default.nix index 98594157211..0014784abd1 100644 --- a/pkgs/applications/misc/scim/default.nix +++ b/pkgs/applications/misc/scim/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "scim-${version}"; src = fetchurl { - url = "https://github.com/andmarti1424/scim/archive/v${version}.tar.gz"; + url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz"; sha256 = "00rjz344acw0bxv78x1w9jz8snl9lb9qhr9z22phxinidnd3vaaz"; }; diff --git a/pkgs/applications/misc/slic3r/fix-no-display.patch b/pkgs/applications/misc/slic3r/fix-no-display.patch deleted file mode 100644 index b5aeca3a416..00000000000 --- a/pkgs/applications/misc/slic3r/fix-no-display.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/Build.PL b/Build.PL -index 8b21c15..fd3aff0 100644 ---- a/Build.PL -+++ b/Build.PL -@@ -33,9 +33,6 @@ my $sudo = grep { $_ eq '--sudo' } @ARGV; - my $gui = grep { $_ eq '--gui' } @ARGV; - my $xs_only = grep { $_ eq '--xs' } @ARGV; - if ($gui) { -- %prereqs = qw( -- Wx 0.9918 -- ); - %recommends = qw( - Growl::GNTP 0.15 - Wx::GLCanvas 0 -diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm -index 842ff44..ea0af64 100644 ---- a/lib/Slic3r/GUI.pm -+++ b/lib/Slic3r/GUI.pm -@@ -26,7 +26,7 @@ use Slic3r::GUI::OptionsGroup::Field; - use Slic3r::GUI::SimpleTab; - use Slic3r::GUI::Tab; - --our $have_OpenGL = eval "use Slic3r::GUI::PreviewCanvas; 1"; -+our $have_OpenGL = 0; - - use Wx 0.9901 qw(:bitmap :dialog :icon :id :misc :systemsettings :toplevelwindow - :filedialog); -diff --git a/lib/Slic3r/GUI/Plater/2DToolpaths.pm b/lib/Slic3r/GUI/Plater/2DToolpaths.pm -index 8e48a72..7bed973 100644 ---- a/lib/Slic3r/GUI/Plater/2DToolpaths.pm -+++ b/lib/Slic3r/GUI/Plater/2DToolpaths.pm -@@ -90,18 +90,20 @@ sub set_z { - package Slic3r::GUI::Plater::2DToolpaths::Canvas; - - use Wx::Event qw(EVT_PAINT EVT_SIZE EVT_ERASE_BACKGROUND EVT_IDLE EVT_MOUSEWHEEL EVT_MOUSE_EVENTS); --use OpenGL qw(:glconstants :glfunctions :glufunctions); --use base qw(Wx::GLCanvas Class::Accessor); --use Wx::GLCanvas qw(:all); - use List::Util qw(min first); - use Slic3r::Geometry qw(scale unscale epsilon); - - __PACKAGE__->mk_accessors(qw(print z layers color init dirty bb)); - --# make OpenGL::Array thread-safe --{ -- no warnings 'redefine'; -- *OpenGL::Array::CLONE_SKIP = sub { 1 }; -+if ($Slic3r::GUI::have_OpenGL) { -+ use OpenGL qw(:glconstants :glfunctions :glufunctions); -+ use Wx::GLCanvas qw(:all); -+ use base qw(Wx::GLCanvas Class::Accessor); -+ # make OpenGL::Array thread-safe -+ { -+ no warnings 'redefine'; -+ *OpenGL::Array::CLONE_SKIP = sub { 1 }; -+ } - } - - sub new { diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix new file mode 100644 index 00000000000..db0798f64cf --- /dev/null +++ b/pkgs/applications/misc/solaar/default.nix @@ -0,0 +1,43 @@ +{fetchurl, stdenv, makeWrapper, gtk3, python3Packages}: +let + version = "0.9.2"; +in +stdenv.mkDerivation { + name = "solaar-${version}"; + src = fetchurl { + sha256 = "0954grz2adggfzcj4df4mpr4d7qyl7w8rb4j2s0f9ymawl92i05j"; + url = "https://github.com/pwr/Solaar/archive/${version}.tar.gz"; + }; + + buildInputs = [gtk3 python3Packages.pygobject3 python3Packages.pyudev]; + enableParallelBuilding = true; + installPhase = '' + mkdir -p "$out"; + ''; + postInstall = '' + wrapProgram "$out/bin/solaar" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + wrapProgram "$out/bin/solaar-cli" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + ''; + meta = with stdenv.lib; { + description = "Linux devices manager for the Logitech Unifying Receiver"; + longDescription = '' + Solaar is a Linux device manager for Logitech’s Unifying Receiver + peripherals. It is able to pair/unpair devices to the receiver, and for + most devices read battery status. + + It comes in two flavors, command-line and GUI. Both are able to list the + devices paired to a Unifying Receiver, show detailed info for each + device, and also pair/unpair supported devices with the receiver. + + To be able to use it, make sure you have access to /dev/hidraw* files. + ''; + license = licenses.gpl2; + homepage = https://pwr.github.io/Solaar/; + platforms = platforms.linux; + maintainers = [maintainers.spinus]; + }; +} diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index ba3d3db3267..d37f2c947c9 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk, ncurses }: +{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses }: stdenv.mkDerivation rec { name = "termite-${version}"; @@ -10,11 +10,9 @@ stdenv.mkDerivation rec { sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2"; }; - makeFlags = "VERSION=v${version}"; + makeFlags = [ "VERSION=v${version}" "PREFIX=$(out)" ]; - buildInputs = [pkgconfig vte gtk ncurses]; - - installFlags = "PREFIX=$(out)"; + buildInputs = [ pkgconfig vte gtk3 ncurses ]; meta = with stdenv.lib; { description = "A simple VTE-based terminal"; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 10b63d1db51..e48201b914c 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -3,23 +3,21 @@ let pname = "yakuake"; - version = "2.9.8"; + version = "2.9.9"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "0a9x3nmala8nl4xl3h7rcd76f5j7b7r74jc5cfbayc6jgkjdynd3"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; + sha256 = "0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce"; }; buildInputs = [ kdelibs ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - patchPhase = '' - substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\"" - ''; + propagatedUserEnvPkgs = [ konsole ]; meta = { homepage = http://yakuake.kde.org; |