diff options
| -rw-r--r-- | nixos/modules/services/networking/dnscrypt-proxy.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/rdfind/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/ppp/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
6 files changed, 43 insertions, 22 deletions
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index d1b5fbedfa6f..5cc33f35adb2 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -88,7 +88,12 @@ in security.apparmor.profiles = mkIf apparmorEnabled [ (pkgs.writeText "apparmor-dnscrypt-proxy" '' - ${dnscrypt-proxy}/sbin/dnscrypt-proxy { + ${dnscrypt-proxy}/bin/dnscrypt-proxy { + network inet stream, + network inet6 stream, + network inet dgram, + network inet6 dgram, + capability ipc_lock, capability net_bind_service, capability net_admin, @@ -126,7 +131,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${dnscrypt-proxy}/sbin/dnscrypt-proxy ${toString daemonArgs}"; + ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}"; }; }; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix new file mode 100644 index 000000000000..5106af489177 --- /dev/null +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, nettle }: + +stdenv.mkDerivation rec { + name = "rdfind-${version}"; + version = "1.3.4"; + + src = fetchurl { + url = "http://rdfind.pauldreik.se/${name}.tar.gz"; + sha256 = "0zfc5whh6j5xfbxr6wvznk62qs1mkd3r7jcq72wjgnck43vv7w55"; + }; + + buildInputs = [ nettle ]; + + meta = { + homepage = http://rdfind.pauldreik.se/; + description = "Removes or hardlinks duplicate files very swiftly"; + license = with stdenv.lib.licenses; gpl2; + maintainers = with stdenv.lib.maintainers; [ wmertens ]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index c8ffd677c930..3e1fa21fd562 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -20,7 +20,7 @@ let canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.02-git-1de3a4"; + version = "2.02-git-2ae9457"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; - rev = "32cd33bd19348afb77ab849846e0b6d6157ea308"; - sha256 = "1fsc1sa5ymdkf11bshlh8fwqv7j7c4pfzjdf6ivllpanp02ryv4l"; + rev = "2ae9457e6eb4c352051fb32bc6fc931a22528ab2"; + sha256 = "1ik60qgkymg0xdns5az1hbxasspah2vzxg334rpbk2yy3h3nx5ln"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index b7f42b019c43..43349178211f 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, substituteAll, libpcap }: stdenv.mkDerivation rec { - version = "2.4.5"; + version = "2.4.7"; name = "ppp-${version}"; src = fetchurl { url = "mirror://samba/ppp/${name}.tar.gz"; - sha256 = "019m00q85nrgdpjlhb9021a3iw3pr4a0913gp4h9k7r9r7z7lca3"; + sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02"; }; patches = @@ -15,24 +15,17 @@ stdenv.mkDerivation rec { inherit libpcap; glibc = stdenv.cc.libc; }) + # Without nonpriv.patch, pppd --version doesn't work when not run as + # root. ./nonpriv.patch ]; - postPatch = '' - # enable ipv6 - substituteInPlace pppd/Makefile.linux \ - --replace "#HAVE_INET6=y" "HAVE_INET6=y" - rm -v include/linux/if_pppol2tp.h - ''; - buildInputs = [ libpcap ]; - postInstall = "chmod -v -R +rw $out"; - meta = { - homepage = http://ppp.samba.org/; + homepage = https://ppp.samba.org/; description = "Point-to-point implementation for Linux and Solaris"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ stdenv.lib.maintainers.falsifian ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e773805ec433..a8572f4a71c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2426,6 +2426,8 @@ let rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; + rdfind = callPackage ../tools/filesystems/rdfind { }; + rdmd = callPackage ../development/compilers/rdmd { }; rhash = callPackage ../tools/security/rhash { }; @@ -2479,7 +2481,7 @@ let rzip = callPackage ../tools/compression/rzip { }; s3backer = callPackage ../tools/filesystems/s3backer { }; - + s3fs = callPackage ../tools/filesystems/s3fs { }; s3cmd = callPackage ../tools/networking/s3cmd { }; @@ -8303,7 +8305,7 @@ let zookeeper = callPackage ../servers/zookeeper { }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; - + xquartz = callPackage ../servers/x11/xquartz { }; quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 466e934cb45f..90be2d6dd4a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4247,13 +4247,13 @@ let }; flexget = buildPythonPackage rec { - version = "1.2.234"; + version = "1.2.278"; name = "FlexGet-${version}"; disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz"; - md5 = "0897b6db25e8a28e809d131a8ad017e4"; + md5 = "9c8e41d9e59d53cf2c720661b2880719"; }; doCheck = false; |