diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:03:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:53:38 +0200 |
| commit | 6c2fbfbd7720446821be2a506cefcd1e0ff3b42d (patch) | |
| tree | ef852f77f02c1636e2ee215623d6a20e87174b9e /pkgs/development/tools/misc | |
| parent | 81df0354290389128077e00edfd2368eeeea0c24 (diff) | |
| parent | 3d932ba135f9fe7eb649269543276dffa7aa563a (diff) | |
| download | nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.gz nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.bz2 nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.lz nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.xz nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.zst nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/tools/misc')
4 files changed, 36 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index d2ddcabc0b1..8170fc46f34 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autogen-${version}"; - version = "5.18.6"; + version = "5.18.7"; src = fetchurl { - url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz"; - sha256 = "0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs"; + url = "mirror://gnu/autogen/autogen-${version}.tar.xz"; + sha256 = "01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7"; }; outputs = [ "dev" "bin" "lib" "out" "man" "info" ]; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index e1a3a8223f2..783607860de 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -2,7 +2,7 @@ , pep8, python, makeWrapper, gnome3, pygobject3, libwnck3 }: let - version = "${major}.10"; + version = "${major}.11"; major = "0.3"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; - sha256 = "88f0df5fcb862387ff3d1793873c5eb368c3e4db0bbd82ea65f748cbf70a6359"; + sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2"; }; buildInputs = [ diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix new file mode 100644 index 00000000000..91b343b20b4 --- /dev/null +++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, libusb1, usb-modeswitch }: + +let + version = "20160112"; +in + +stdenv.mkDerivation rec { + name = "usb-modeswitch-data-${version}"; + + src = fetchurl { + url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + sha256 = "19yzqv0592b9mwgdi7apzw881q70ajyx5d56zr1z5ldi915a8yfn"; + }; + + # make clean: we always build from source. It should be necessary on x86_64 only + prePatch = '' + sed -i 's@usb_modeswitch@${usb-modeswitch}/bin/usb_modeswitch@g' 40-usb_modeswitch.rules + sed -i "1 i\DESTDIR=$out" Makefile + ''; + + buildInputs = [ pkgconfig libusb1 usb-modeswitch ]; + + meta = { + description = "device database and the rules file for 'multi-mode' USB devices"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index cc28b011829..9aad2edfa4e 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: let - version = "2.2.1"; + version = "2.3.0"; in stdenv.mkDerivation rec { @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 ]; meta = { + description = "a mode switching tool for controlling 'multi-mode' USB devices"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; |