diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
commit | 595a72589f038e4512ca12232009c97a47fba044 (patch) | |
tree | 079cdeab0e7722d19292fb7532adc42d77533d1f /pkgs/tools/misc | |
parent | f9e17ca3f68b040bd0cf68c26104e4a5c9bc7b4f (diff) | |
parent | 62dc989963c67fe5564b30a2b4bf21ba49446eee (diff) | |
download | nixlib-595a72589f038e4512ca12232009c97a47fba044.tar nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.gz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.bz2 nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.lz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.xz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.zst nixlib-595a72589f038e4512ca12232009c97a47fba044.zip |
Merge master into staging
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/autorandr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/lf/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/mpdscribble/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/multitail/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/neofetch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/pspg/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/misc/smenu/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/vdirsyncer/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/vimer/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/yad/default.nix | 4 |
10 files changed, 42 insertions, 14 deletions
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index db2e1fc622fa..9a51553ae43a 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.4"; + version = "1.5"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "08i71r221ilc8k1c59w89g3iq5m7zwhnjjzapavhqxlr8y9dcpf5"; + sha256 = "01pij2r73f190qk7q3cgf5cmk0w59g9l9v4vah5vf4ddn7nnk7yq"; }; meta = { diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 0a7073f4d489..8ef5bd1c07cf 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "1"; + version = "2"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0mq83m7mvavd0dzhk8g6ffldy57i22n0846yzqnlz733chiy3anz"; + sha256 = "0g9fy6x3wc5hda886ci79wj7rnjwvaidbwhsrckqgiqymbzvrdb8"; }; goPackagePath = "github.com/gokcehan/lf"; @@ -24,7 +24,7 @@ buildGoPackage rec { runHook preBuild runHook renameImports cd go/src/${goPackagePath} - go install -ldflags="-s -w -X main.gVersion=${version}" + go install -ldflags="-s -w -X main.gVersion=r${version}" runHook postBuild ''; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 56684848ebaa..47eec54e127e 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index bd446395bc78..82155eb51c7f 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.vanheusden.com/multitail/; description = "tail on Steroids"; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index de4a22ee9e47..097eb2408f85 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "1f1hvd635wv81qg802jdi0yggi4631w9nlznipaxkvk4y1zpdq5j"; + sha256 = "10h4f7n6bllbq459nm9wppvk65n81zzv556njfqplzw3mpdrbiyx"; }; dontBuild = true; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix new file mode 100644 index 000000000000..b9543dc143cf --- /dev/null +++ b/pkgs/tools/misc/pspg/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig }: + +stdenv.mkDerivation rec { + name = "pspg-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "okbob"; + repo = "pspg"; + rev = "${version}"; + sha256 = "1swrg4bg7i4xpdrsg8dsfldbxaffni04x8i1s0g6h691qcin675v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnugrep ncurses ]; + + preBuild = '' + makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/okbob/pspg; + description = "Postgres Pager"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.jlesquembre ]; + }; +} diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 061a6c58d237..3db0ee9af267 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { your selection will be sent to standard output. ''; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index ad5b259eb77a..9d1e4096776a 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index a655aa9502e5..7ccc6e9dc271 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in an existing instance of GVim or MacVim. ''; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 31b8d673a988..2c5a2b808a57 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -2,11 +2,11 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "yad-0.37.0"; + name = "yad-0.40.0"; src = fetchurl { url = "http://sourceforge.net/projects/yad-dialog/files/${name}.tar.xz"; - sha256 = "0fhqsgml1axaa9avd0hbam5wm77c2c7q1bz4hs7fvyvdnljazvwi"; + sha256 = "1x0fsv8nfkm8lchdawnf3zw79jaqbnvhv87sk5r8g86knv8vgl62"; }; configureFlags = [ |