mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity

Merge pull request #51036 from c0bw3b/cleanup/confuse

Browse source 
Remove confuse (duplicate) and pommed (obsolete)
This commit is contained in:
Renaud 2018-11-25 19:28:23 +01:00 committed by GitHub
parent c6a0bb9e59 47c2739059
commit c720866b7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 32 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/misc/tilda/default.nix
View file

@ -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

4
pkgs/applications/window-managers/i3/status.nix
View file

@ -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)" ];

17
pkgs/development/libraries/confuse/default.nix
View file

@ -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;
};
}

6
pkgs/development/libraries/libftdi/1.x.nix
View file

@ -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 ];

20
pkgs/os-specific/linux/pommed-light/default.nix
View file

@ -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
];

80
pkgs/os-specific/linux/pommed/default.nix
View file

@ -1,80 +0,0 @@
{
stdenv
, fetchurl
, pciutils
, confuse
, dbus, dbus-glib
, alsaLib
, audiofile
, pkgconfig
, gtk2
, gettext
, libXpm
}:
let
build_flags_patch = fetchurl {
url = http://patch-tracker.debian.org/patch/series/dl/pommed/1.39~dfsg-2/build_flags.patch;
sha256 = "109n5v0m91fqf8vqnpqg1zw8mk8fi9pkzqsfrmlavalg4xz49x9j";
};
in
stdenv.mkDerivation rec {
name = "pommed-1.39";
src = fetchurl {
url = "http://alioth.debian.org/frs/download.php/3583/${name}.tar.gz";
sha256 = "18lxywmikanjr5pk1jdqda88dxd2579fpyd332xn4njjhlgwy5fp";
};
patches = [ build_flags_patch ./find-eject-in-path.patch ];
buildInputs = [
pciutils
confuse
dbus
alsaLib
audiofile
dbus-glib
pkgconfig
gtk2
gettext
libXpm
];
installPhase = ''
mkdir -pv $out/bin $out/etc/init.d $out/etc/dbus-1/system.d \
$out/share/pommed $out/share/gpomme $out/share/applications \
$out/share/icons/hicolor/scalable/apps $out/share/pixmaps
install -v -m755 pommed/pommed wmpomme/wmpomme gpomme/gpomme $out/bin
install -v -m644 pommed/data/* $out/share/pommed
install -v -m644 pommed.conf.mactel $out/etc/pommed.conf
install -v -m644 pommed.init $out/etc/init.d
install -v -m644 dbus-policy.conf $out/etc/dbus-1/system.d/pommed.conf
cp -av gpomme/themes $out/share/gpomme
for lang in de es fr it ja; do
mkdir -pv $out/share/locale/"$lang"/LC_MESSAGES
install -v -m644 gpomme/po/"$lang".mo $out/share/locale/"$lang"/LC_MESSAGES/gpomme.mo
done
install -v -m644 gpomme/gpomme*.desktop $out/share/applications
for size in 128 16 192 22 24 32 36 48 64 72 96; do
mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps
install -v -m644 icons/gpomme_"$size"x"$size".png \
$out/share/icons/hicolor/"$size"x"$size"/apps
done
install -v -m644 icons/gpomme.svg $out/share/icons/hicolor/scalable/apps
install -v -m644 icons/gpomme_192x192.xpm $out/share/pixmaps/wmpomme.xpm
'';
meta = {
description = "A tool to handle hotkeys on Apple laptop keyboards";
homepage = http://www.technologeek.org/projects/pommed/index.html;
license = stdenv.lib.licenses.gpl2;
broken = true; # hash changed, and it's quite suspicious
};
}

12
pkgs/os-specific/linux/pommed/find-eject-in-path.patch
View file

@ -1,12 +0,0 @@
diff -Naur pommed-1.39-orig/pommed/cd_eject.c pommed-1.39/pommed/cd_eject.c
--- pommed-1.39-orig/pommed/cd_eject.c 2011-06-02 05:24:05.000000000 -0400
+++ pommed-1.39/pommed/cd_eject.c 2012-03-20 14:25:33.397712520 -0400
@@ -100,7 +100,7 @@
for (fd = 3; fd < max_fd; fd++)
close(fd);
- execve("/usr/bin/eject", eject_argv, eject_envp);
+ execvpe("eject", eject_argv, eject_envp);
logmsg(LOG_ERR, "Could not execute eject: %s", strerror(errno));
exit(1);

6
pkgs/os-specific/linux/udisks-glue/default.nix
View file

@ -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;
};
}

4
pkgs/tools/X11/dispad/default.nix
View file

@ -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";

4
pkgs/tools/misc/bmon/default.nix
View file

@ -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";

6
pkgs/tools/misc/xburst-tools/default.nix
View file

@ -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 = {

6
pkgs/top-level/all-packages.nix
View file

@ -9346,8 +9346,6 @@ with pkgs;
commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
confuse = callPackage ../development/libraries/confuse { };
coredumper = callPackage ../development/libraries/coredumper { };
ctl = callPackage ../development/libraries/ctl { };
@ -18573,8 +18571,6 @@ with pkgs;
poezio = python3Packages.poezio;
pommed = callPackage ../os-specific/linux/pommed {};
pommed_light = callPackage ../os-specific/linux/pommed-light {};
polymake = callPackage ../applications/science/math/polymake { };
@ -22674,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;
});