diff options
Diffstat (limited to 'pkgs/tools')
25 files changed, 110 insertions, 83 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 55ab34228261..6d6fee0a2d32 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://xpra.org/src/${name}.tar.xz"; - sha256 = "02wpnlx43dwacaahpm8db5kbnjw2msm3ycq71gib0n2zamd71ni6"; + sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index ea363ae8cc2a..60023d028a9f 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "upx-${version}"; - version = "3.94"; + version = "3.95"; src = fetchurl { - url = "https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz"; - sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1"; + url = "https://github.com/upx/upx/releases/download/v${version}/${name}-src.tar.xz"; + sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv"; }; CXXFLAGS = "-Wno-unused-command-line-argument"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index f356727e64bb..f7071e45232e 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lvm2, libuuid, gettext, readline -, utillinux, check, enableStatic ? false, hurd ? null }: +, utillinux, check, enableStatic ? false }: stdenv.mkDerivation rec { name = "parted-3.1"; @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2 - ++ stdenv.lib.optional (hurd != null) hurd; + ++ stdenv.lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 187e77533f52..183cfb2ddbe4 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3 -, docutils, which, python3Packages +{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils +, fuse3, glib +, which, python3Packages }: stdenv.mkDerivation rec { - version = "3.4.0"; + version = "3.5.0"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "1mbhjgw6797bln579pfwmn79gs8isnv57z431lbfw7j8xkh75awl"; + sha256 = "1mczf13ic5ycfhcxmxma50n5h32vygcll0d8m39vam237s95aqy6"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; buildInputs = [ fuse3 glib ]; + checkInputs = [ which python3Packages.pytest ]; NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.system == "i686-linux") @@ -25,9 +27,15 @@ stdenv.mkDerivation rec { ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ''; - checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]); - + #doCheck = true; checkPhase = '' + # The tests need fusermount: + mkdir bin && cp ${fuse3}/bin/fusermount3 bin/fusermount + export PATH=bin:$PATH + # Can't access /dev/fuse within the sandbox: "FUSE kernel module does not seem to be loaded" + substituteInPlace test/util.py --replace "/dev/fuse" "/dev/null" + # TODO: "fusermount executable not setuid, and we are not root" + # We should probably use a VM test instead python3 -m pytest test/ ''; diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index b912bab68260..f17f9e0d2de5 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, ncurses, readline }: +{ stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { name = "udftools-${version}"; - version = "1.0.0b3"; - src = fetchurl { - url = "mirror://sourceforge/linux-udf/udftools/${version}/${name}.tar.gz"; - sha256 = "180414z7jblby64556i8p24rcaas937zwnyp1zg073jdin3rw1y5"; + version = "2.0"; + src = fetchFromGitHub { + owner = "pali"; + repo = "udftools"; + rev = "${version}"; + sha256 = "0mz04h3rki6ljwfs15z83gf4vv816w7xgz923waiqgmfj9xpvx87"; }; buildInputs = [ ncurses readline ]; + nativeBuildInputs = [ autoreconfHook ]; hardeningDisable = [ "fortify" ]; @@ -21,6 +24,12 @@ stdenv.mkDerivation rec { sed -e '38i#include <string.h>' -i wrudf/wrudf-cdrw.c sed -e '12i#include <string.h>' -i wrudf/wrudf-cdr.c sed -e '37i#include <stdlib.h>' -i wrudf/ide-pc.c + + sed -e "s@\$(DESTDIR)/lib/udev/rules.d@$out/lib/udev/rules.d@" -i pktsetup/Makefile.am + ''; + + postFixup = '' + sed -i -e "s@/usr/sbin/pktsetup@$out/sbin/pktsetup@" $out/lib/udev/rules.d/80-pktsetup.rules ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index b8a2b3913955..6503dadf4573 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "0ms1hmv6qx15p47l07h7szwq0bgphhskc0xca2l641159h55r6dg"; + sha256 = "04ip0h1n7wavd7j7r7ppcy3v4987yv44mgw8qm8d56pcw67f9vwk"; fetchSubmodules = true; }; - cargoSha256 = "1dzm44kcx3plh74qr4wghl3wqwr62hcxzlcv7mhh0vvk3z36c8d4"; + cargoSha256 = "062vvpj514h85h9gm3jipp6z256cnnbxbjy7ja6bm7i6bpglyvvi"; nativeBuildInputs = [ cmake pkgconfig zlib ]; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 6ec9729438c8..8137379a4da6 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 = "7"; + version = "8"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "11n5svxhc2781ss7v15w40ac81mchhcvkszhb2r70zry7sa15li1"; + sha256 = "0rmcac9wx9lldl57m1cim1adf2fqkva1yi4v6934jgccqhlqvk58"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index c372b0d669c5..57877822b08d 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; # master - sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; + rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce"; # master + sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa"; }; } { @@ -13,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; # v0.0.2 - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; # v0.0.3 + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } ] diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 5941b8056b19..b0f20c1d3875 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "A small C library for x86 CPU detection and feature extraction"; license = licenses.bsd2; maintainers = with maintainers; [ orivej artuuge ]; - platforms = platforms.all; + platforms = platforms.x86; }; } diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 8a62ccffa490..f485cb95f5d7 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mandoc-${version}"; - version = "1.13.4"; + version = "1.14.4"; src = fetchurl { - url = "http://mdocml.bsd.lv/snapshots/mdocml-${version}.tar.gz"; - sha256 = "1vz0g5nvjbz1ckrg9cn6ivlnb13bcl1r6nc4yzb7300qvfnw2m8a"; + url = "https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz"; + sha256 = "24eb72103768987dcc63b53d27fdc085796330782f44b3b40c4660b1e1ee9b9c"; }; buildInputs = [ zlib ]; @@ -19,17 +19,23 @@ stdenv.mkDerivation rec { HAVE_MANPATH=1 LD_OHASH="-lutil" BUILD_DB=0 + CC=${stdenv.cc.targetPrefix}cc ''; + patches = [ + ./remove-broken-cc-check.patch + ]; + preConfigure = '' echo $configureLocal > configure.local ''; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = https://mandoc.bsd.lv/; description = "suite of tools compiling mdoc and man"; + downloadPage = "http://mandoc.bsd.lv/snapshots/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ ramkromberg ]; + maintainers = with maintainers; [ bb010g ramkromberg ]; }; } diff --git a/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch b/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch new file mode 100644 index 000000000000..580226d165bb --- /dev/null +++ b/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch @@ -0,0 +1,11 @@ +--- mandoc-1.14.4.org/configure 2018-08-08 15:51:51.000000000 +0100 ++++ mandoc-1.14.4/configure 2018-08-27 08:19:40.391912427 +0100 +@@ -40,7 +40,7 @@ + OSNAME= + UTF8_LOCALE= + +-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -` ++CC= + CFLAGS= + LDADD= + LDFLAGS= diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 643a3bafc66f..709246269f83 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline, perl, python2 -, utillinux, check, enableStatic ? false, hurd ? null }: +, utillinux, check, enableStatic ? false }: stdenv.mkDerivation rec { name = "parted-3.2"; @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2 - ++ stdenv.lib.optional (hurd != null) hurd; + ++ stdenv.lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 68d9df987d8c..bbbb19fc200b 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-1.10.2"; + name = "riemann-c-client-1.10.3"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; rev = "${name}"; - sha256 = "185wn6fqgrs16f9c0lkzw14477wmkgandz86h4miw7cgi7ki4l5i"; + sha256 = "0944l0wlx1m4x8b4dpjsq994614bxd7pi1c1va3qyk93hld9d3qc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index c4a8f3a623be..d0b7ebf3fc83 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.5.0"; + name = "yubico-piv-tool-1.6.1"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "1axa0lnky5gsc8yack6mpfbjh49z0czr1cv52gbgjnx2kcbpb0y1"; + sha256 = "10xgdc51xvszkxmsvqnbjs8ixxz7rfnfahh3wn8glllynmszbhwi"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 12f68af7d0a6..3920405fe4d1 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1676dqa4j7vd18fyxgl65yp3ip6aivchicy6qj8rwp3dilqkiv10"; + sha256 = "182iwfaz9ar18pqknrg60w89iinj91rn2651yaz2ap77h2a2psvf"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 0b6a7e622a86..d516a2b5ee87 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl +, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, jansson, wrapGAppsHook, gobjectIntrospection , libappindicator-gtk3, withGnome ? false }: @@ -15,12 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2"; }; - patches = [ - # https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/19 - ./libnm-gtk-mbpi.patch - ]; - mesonFlags = [ + "-Dlibnm_gtk=false" # It is deprecated "-Dselinux=false" "-Dappindicator=yes" "-Dgcr=${if withGnome then "true" else "false"}" @@ -35,7 +31,7 @@ in stdenv.mkDerivation rec { libappindicator-gtk3 ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser - nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; + nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 11b29081f9bb..16964e4db945 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/tmp" ]; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index a3dbeaf82651..a6fd3e7303df 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index d48d2e910f50..3cac1b5e63cf 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/var" "--sysconfdir=$(out)/etc" diff --git a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch b/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch deleted file mode 100644 index d7eef5749dba..000000000000 --- a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -137,7 +137,7 @@ - mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info') - config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_dep.get_pkgconfig_variable('database')) - else -- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_prefix, 'share', 'mobile-broadband-provider-info', 'serviceproviders.xml')) -+ config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 'mobile-broadband-provider-info', 'serviceproviders.xml')) - endif - - gio_dep = dependency('gio-2.0', version: '>= 2.38') ---- a/src/libnm-gtk/nm-mobile-providers.c -+++ b/src/libnm-gtk/nm-mobile-providers.c -@@ -30,10 +30,6 @@ - - #include "nm-mobile-providers.h" - --#ifndef MOBILE_BROADBAND_PROVIDER_INFO --#define MOBILE_BROADBAND_PROVIDER_INFO DATADIR"/mobile-broadband-provider-info/serviceproviders.xml" --#endif -- - #define ISO_3166_COUNTRY_CODES ISO_CODES_PREFIX"/share/xml/iso-codes/iso_3166.xml" - #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX"/share/locale" - -@@ -990,7 +986,7 @@ - if (!country_codes) - country_codes = ISO_3166_COUNTRY_CODES; - if (!service_providers) -- service_providers = MOBILE_BROADBAND_PROVIDER_INFO; -+ service_providers = MOBILE_BROADBAND_PROVIDER_INFO_DATABASE; - - countries = read_country_codes (country_codes, - cancellable, diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 8d3bd874718c..0d3a4174744f 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig libxml2 ]; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index fc10fc6364c9..d7f558574065 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; configureFlags = [ + "--without-libnm-glib" "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" "--with-nm-libexecdir=$(out)/libexec" "--with-nm-plugindir=$(out)/lib/NetworkManager" diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index d2b3a345d495..ef45defb7d5a 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -24,6 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig file ]; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" ]; diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix new file mode 100644 index 000000000000..c73f3fb524cd --- /dev/null +++ b/pkgs/tools/package-management/bunny/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitLab }: + +stdenv.mkDerivation rec { + name = "bunny-${version}"; + version = "1.1"; + + src = fetchFromGitLab { + owner = "tim241"; + repo = "bunny"; + rev = version; + sha256 = "0mxhj23fscbyqb9hfpmimgjn6nbx1lx3dl2msgwdy281zs25w8ki"; + }; + + dontBuild = true; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "A simple shell script wrapper around multiple package managers"; + homepage = https://gitlab.com/tim241/bunny; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ countingsort ]; + }; +} diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index c90c67c77372..a57cafb54e25 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; platforms = platforms.linux; + broken = true; # 2018-05-12 }; } |