From 9762e2c3bd28d01a12c8fb5ecd70c91b2a4f4877 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 25 Nov 2018 18:20:42 +0100 Subject: confuse: remove and replace with libconfuse - confuse is a duplicate of libconfuse - upstream name is libconfuse so keep this one - replace confuse with libconfuse in packages depending on it --- pkgs/applications/misc/tilda/default.nix | 12 ++++++------ pkgs/applications/window-managers/i3/status.nix | 4 ++-- pkgs/development/libraries/confuse/default.nix | 17 ----------------- pkgs/development/libraries/libftdi/1.x.nix | 6 +++--- pkgs/os-specific/linux/pommed-light/default.nix | 20 ++++++++++---------- pkgs/os-specific/linux/udisks-glue/default.nix | 6 +++--- pkgs/tools/X11/dispad/default.nix | 4 ++-- pkgs/tools/misc/bmon/default.nix | 4 ++-- pkgs/tools/misc/xburst-tools/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 10 files changed, 32 insertions(+), 51 deletions(-) delete mode 100644 pkgs/development/libraries/confuse/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index d5b927bb536..4172660182d 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchzip, pkgconfig , autoreconfHook, gettext, expat -, confuse, vte, gtk +, libconfuse, vte, gtk , makeWrapper }: stdenv.mkDerivation rec { @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "tilda-${version}"; version = "1.4.1"; - src = fetchurl { + src = fetchzip { url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; - sha256 = "0w2hry2bqcqrkik4l100b1a9jlsih6sq8zwhfpl8zzfq20i00lfs"; + sha256 = "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gettext confuse vte gtk makeWrapper ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + buildInputs = [ gettext libconfuse vte gtk ]; LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index ae6d8bd22b7..65180846c64 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, confuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig +{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ confuse yajl alsaLib libpulseaudio libnl ]; + buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ]; makeFlags = [ "all" "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix deleted file mode 100644 index 3257dfe5d37..00000000000 --- a/pkgs/development/libraries/confuse/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "confuse-${version}"; - version = "3.2.1"; - src = fetchurl { - url = "https://github.com/martinh/libconfuse/releases/download/v${version}/${name}.tar.xz"; - sha256 = "0pnjmlj9i0alp407qd7c0vq83sz7gpsjrbdgpcn4xvzjp9r35ii3"; - }; - - meta = { - homepage = http://www.nongnu.org/confuse/; - description = "Configuration file parser library"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index b59bf9a06ac..1b00ff4c0fb 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libusb1, confuse +{ stdenv, fetchurl, cmake, pkgconfig, libusb1, libconfuse , cppSupport ? true, boost ? null , pythonSupport ? true, python ? null, swig ? null , docSupport ? true, doxygen ? null @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with stdenv.lib; [ cmake confuse ] + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = with stdenv.lib; [ libconfuse ] ++ optionals cppSupport [ boost ] ++ optionals pythonSupport [ python swig ] ++ optionals docSupport [ doxygen ]; diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index 3ee5e312d23..06ea49034a0 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -1,8 +1,7 @@ -{ - stdenv -, fetchurl +{ stdenv +, fetchFromGitHub , pciutils -, confuse +, libconfuse , alsaLib , audiofile , pkgconfig @@ -15,10 +14,11 @@ stdenv.mkDerivation rec { version = "1.51lw"; name = "${pkgname}-${version}"; - src = fetchurl { - url = "https://github.com/bytbox/${pkgname}/archive/v${version}.tar.gz"; - - sha256 = "11wi17bh2br1hp8gmq40b1hm5drm6h969505f7432zam3cm8mc8q"; + src = fetchFromGitHub { + owner = "bytbox"; + repo = pkgname; + rev = "v${version}"; + sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy"; }; postPatch = '' @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { substituteInPlace pommed/cd_eject.c --replace /usr/bin/eject ${eject}/bin/eject ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pciutils - confuse + libconfuse alsaLib audiofile - pkgconfig zlib eject ]; diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 56e237a9fad..37af3c92ea5 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, confuse }: +{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: stdenv.mkDerivation { name = "udisks-glue-1.3.5"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig automake autoconf ]; - buildInputs = [ udisks1 dbus-glib glib confuse ]; + buildInputs = [ udisks1 dbus-glib glib libconfuse ]; preConfigure = "sh autogen.sh"; @@ -18,6 +18,6 @@ stdenv.mkDerivation { description = "A tool to associate udisks events to user-defined actions"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [pSub]; - license = stdenv.lib.licenses.free; + license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix index 853feb08002..1d119220e58 100644 --- a/pkgs/tools/X11/dispad/default.nix +++ b/pkgs/tools/X11/dispad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXi, confuse }: +{ stdenv, fetchFromGitHub, libX11, libXi, libconfuse }: stdenv.mkDerivation rec { name = "dispad-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0y0n9mf1hs3s706gkpmg1lh74m6vvkqc9rdbzgc6s2k7vdl2zp1y"; }; - buildInputs = [ libX11 libXi confuse ]; + buildInputs = [ libX11 libXi libconfuse ]; meta = with stdenv.lib; { description = "A small daemon for disabling trackpads while typing"; diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 9c7eafe351f..fc10538bbbb 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, confuse +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, libconfuse , libnl }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ncurses confuse libnl ]; + buildInputs = [ ncurses libconfuse libnl ]; meta = with stdenv.lib; { description = "Network bandwidth monitor"; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index ca642035a0b..aad5b35c79f 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig +{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, libconfuse, pkgconfig , gccCross ? null }: @@ -28,8 +28,8 @@ stdenv.mkDerivation { # Not to strip cross build binaries (this is for the gcc-cross-wrapper) dontCrossStrip = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb libusb1 autoconf automake confuse ] ++ + nativeBuildInputs = [ autoconf automake pkgconfig ]; + buildInputs = [ libusb libusb1 libconfuse ] ++ stdenv.lib.optional (gccCross != null) gccCross; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dbe7fc283a..59382e0e4fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9344,8 +9344,6 @@ with pkgs; commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; - confuse = callPackage ../development/libraries/confuse { }; - coredumper = callPackage ../development/libraries/coredumper { }; ctl = callPackage ../development/libraries/ctl { }; @@ -22672,7 +22670,7 @@ with pkgs; vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; - vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { + vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { llvmPackages = llvmPackages_6; }); -- cgit 1.4.1