diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7a3aa7b8f00..5cf709241d0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1432,6 +1432,16 @@
}
];
};
+ dadada = {
+ name = "dadada";
+ email = "dadada@dadada.li";
+ github = "dadada";
+ githubId = 7216772;
+ keys = [{
+ longkeyid = "ed25519/0xEEB8D1CE62C4DFEA";
+ fingerprint = "D68C 8469 5C08 7E0F 733A 28D0 EEB8 D1CE 62C4 DFEA";
+ }];
+ };
dalance = {
email = "dalance@gmail.com";
github = "dalance";
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 1b7ca76c2f0..8bd353a3430 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -190,6 +190,13 @@
+
+
+ has been added.
+ If you previously had blueman installed via please
+ migrate to using the NixOS module, as this would result in an insufficiently configured blueman.
+
+
@@ -563,6 +570,27 @@
earlier version of NixOS.
+
+
+ Due to the short lifetime of non-LTS kernel releases package attributes like linux_5_1,
+ linux_5_2 and linux_5_3 have been removed to discourage dependence
+ on specific non-LTS kernel versions in stable NixOS releases.
+
+ Going forward, versioned attributes like linux_4_9 will exist for LTS versions only.
+ Please use linux_latest or linux_testing if you depend on non-LTS
+ releases. Keep in mind that linux_latest and linux_testing will
+ change versions under the hood during the lifetime of a stable release and might include breaking changes.
+
+
+
+
+ Because of the systemd upgrade,
+ some network interfaces might change their name. For details see
+
+ upstream docs or
+ our ticket.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index ab0951e831c..33eba8002ba 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -85,7 +85,19 @@
-
+
+ The dynamicHosts option has been removed from the
+ networkd
+ module. Allowing (multiple) regular users to override host entries
+ affecting the whole system opens up a huge attack vector.
+ There seem to be very rare cases where this might be useful.
+ Consider setting system-wide host entries using
+ networking.hosts, provide
+ them via the DNS server in your network, or use
+ environment.etc
+ to add a file into /etc/NetworkManager/dnsmasq.d
+ reconfiguring hostsdir.
+
diff --git a/nixos/modules/services/desktops/system-config-printer.nix b/nixos/modules/services/desktops/system-config-printer.nix
index 8a80be266b2..09c68c587b4 100644
--- a/nixos/modules/services/desktops/system-config-printer.nix
+++ b/nixos/modules/services/desktops/system-config-printer.nix
@@ -33,6 +33,9 @@ with lib;
pkgs.system-config-printer
];
+ # for $out/bin/install-printer-driver
+ services.packagekit.enable = true;
+
};
}
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 05a78d1c448..918bf891b10 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -17,9 +17,6 @@ let
networkmanager-vpnc
] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant;
- dynamicHostsEnabled =
- cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {};
-
delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [];
enableIwd = cfg.wifi.backend == "iwd";
@@ -335,55 +332,20 @@ in {
so you don't need to to that yourself.
'';
};
-
- dynamicHosts = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enabling this option requires the
- option to be
- set to dnsmasq. If enabled, the directories
- defined by the
-
- option will be set up when the service starts. The dnsmasq instance
- managed by NetworkManager will then watch those directories for
- hosts files (see the --hostsdir option of
- dnsmasq). This way a non-privileged user can add or override DNS
- entries on the local system (depending on what hosts directories
- that are configured)..
- '';
- };
- hostsDirs = mkOption {
- type = with types; attrsOf (submodule {
- options = {
- user = mkOption {
- type = types.str;
- default = "root";
- description = ''
- The user that will own the hosts directory.
- '';
- };
- group = mkOption {
- type = types.str;
- default = "root";
- description = ''
- The group that will own the hosts directory.
- '';
- };
- };
- });
- default = {};
- description = ''
- Defines a set of directories (relative to
- /run/NetworkManager/hostdirs) that dnsmasq will
- watch for hosts files.
- '';
- };
- };
};
};
+ imports = [
+ (mkRemovedOptionModule ["networking" "networkmanager" "dynamicHosts"] ''
+ This option was removed because allowing (multiple) regular users to
+ override host entries affecting the whole system opens up a huge attack
+ vector. There seem to be very rare cases where this might be useful.
+ Consider setting system-wide host entries using networking.hosts, provide
+ them via the DNS server in your network, or use environment.etc
+ to add a file into /etc/NetworkManager/dnsmasq.d reconfiguring hostsdir.
+ '')
+ ];
+
###### implementation
@@ -396,12 +358,6 @@ in {
Except if you mark some interfaces as unmanaged by NetworkManager.
'';
}
- { assertion = !dynamicHostsEnabled || (dynamicHostsEnabled && cfg.dns == "dnsmasq");
- message = ''
- To use networking.networkmanager.dynamicHosts you also need to set
- `networking.networkmanager.dns = "dnsmasq"`
- '';
- }
];
environment.etc = with pkgs; [
@@ -435,12 +391,6 @@ in {
target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
mode = "0544";
}) cfg.dispatcherScripts
- ++ optional dynamicHostsEnabled
- { target = "NetworkManager/dnsmasq.d/dyndns.conf";
- text = concatMapStrings (n: ''
- hostsdir=/run/NetworkManager/hostsdirs/${n}
- '') (attrNames cfg.dynamicHosts.hostsDirs);
- }
++ optional cfg.enableStrongSwan
{ source = "${pkgs.networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name";
target = "NetworkManager/VPN/nm-strongswan-service.name";
@@ -496,21 +446,6 @@ in {
systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
- systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
- wantedBy = [ "NetworkManager.service" ];
- before = [ "NetworkManager.service" ];
- partOf = [ "NetworkManager.service" ];
- script = concatStrings (mapAttrsToList (n: d: ''
- mkdir -p "/run/NetworkManager/hostsdirs/${n}"
- chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}"
- chmod 0775 "/run/NetworkManager/hostsdirs/${n}"
- '') cfg.dynamicHosts.hostsDirs);
- serviceConfig = {
- Type = "oneshot";
- RemainAfterExit = true;
- };
- };
-
systemd.services.NetworkManager-dispatcher = {
wantedBy = [ "network.target" ];
restartTriggers = [ configFile ];
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index b0374d949fc..99304d0e48a 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -31,70 +31,8 @@ let
extraForeignModules = filter isAttrs extraModules;
extraApacheModules = filter isString extraModules;
-
- makeServerInfo = cfg: {
- # Canonical name must not include a trailing slash.
- canonicalNames =
- let defaultPort = (head (defaultListen cfg)).port; in
- map (port:
- (if cfg.enableSSL then "https" else "http") + "://" +
- cfg.hostName +
- (if port != defaultPort then ":${toString port}" else "")
- ) (map (x: x.port) (getListen cfg));
-
- # Admin address: inherit from the main server if not specified for
- # a virtual host.
- adminAddr = if cfg.adminAddr != null then cfg.adminAddr else mainCfg.adminAddr;
-
- vhostConfig = cfg;
- serverConfig = mainCfg;
- fullConfig = config; # machine config
- };
-
-
allHosts = [mainCfg] ++ mainCfg.virtualHosts;
-
- callSubservices = serverInfo: defs:
- let f = svc:
- let
- svcFunction =
- if svc ? function then svc.function
- # instead of using serviceType="mediawiki"; you can copy mediawiki.nix to any location outside nixpkgs, modify it at will, and use serviceExpression=./mediawiki.nix;
- else if svc ? serviceExpression then import (toString svc.serviceExpression)
- else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix");
- config = (evalModules
- { modules = [ { options = res.options; config = svc.config or svc; } ];
- check = false;
- }).config;
- defaults = {
- extraConfig = "";
- extraModules = [];
- extraModulesPre = [];
- extraPath = [];
- extraServerPath = [];
- globalEnvVars = [];
- robotsEntries = "";
- startupScript = "";
- enablePHP = false;
- enablePerl = false;
- phpOptions = "";
- options = {};
- documentRoot = null;
- };
- res = defaults // svcFunction { inherit config lib pkgs serverInfo php; };
- in res;
- in map f defs;
-
-
- # !!! callSubservices is expensive
- subservicesFor = cfg: callSubservices (makeServerInfo cfg) cfg.extraSubservices;
-
- mainSubservices = subservicesFor mainCfg;
-
- allSubservices = mainSubservices ++ concatMap subservicesFor mainCfg.virtualHosts;
-
-
enableSSL = any (vhost: vhost.enableSSL) allHosts;
@@ -188,13 +126,18 @@ let
perServerConf = isMainServer: cfg: let
- serverInfo = makeServerInfo cfg;
-
- subservices = callSubservices serverInfo cfg.extraSubservices;
+ # Canonical name must not include a trailing slash.
+ canonicalNames =
+ let defaultPort = (head (defaultListen cfg)).port; in
+ map (port:
+ (if cfg.enableSSL then "https" else "http") + "://" +
+ cfg.hostName +
+ (if port != defaultPort then ":${toString port}" else "")
+ ) (map (x: x.port) (getListen cfg));
maybeDocumentRoot = fold (svc: acc:
if acc == null then svc.documentRoot else assert svc.documentRoot == null; acc
- ) null ([ cfg ] ++ subservices);
+ ) null ([ cfg ]);
documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else
pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out";
@@ -209,15 +152,11 @@ let
'';
- robotsTxt =
- concatStringsSep "\n" (filter (x: x != "") (
- # If this is a vhost, the include the entries for the main server as well.
- (if isMainServer then [] else [mainCfg.robotsEntries] ++ map (svc: svc.robotsEntries) mainSubservices)
- ++ [cfg.robotsEntries]
- ++ (map (svc: svc.robotsEntries) subservices)));
+ # If this is a vhost, the include the entries for the main server as well.
+ robotsTxt = concatStringsSep "\n" (filter (x: x != "") ([ cfg.robotsEntries ] ++ lib.optional (!isMainServer) mainCfg.robotsEntries));
in ''
- ${concatStringsSep "\n" (map (n: "ServerName ${n}") serverInfo.canonicalNames)}
+ ${concatStringsSep "\n" (map (n: "ServerName ${n}") canonicalNames)}
${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases}
@@ -292,8 +231,6 @@ let
in concatMapStrings makeDirConf cfg.servedDirs
}
- ${concatMapStrings (svc: svc.extraConfig) subservices}
-
${cfg.extraConfig}
'';
@@ -328,13 +265,10 @@ let
${let
load = {name, path}: "LoadModule ${name}_module ${path}\n";
- allModules =
- concatMap (svc: svc.extraModulesPre) allSubservices
- ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
+ allModules = map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; }
- ++ optional enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; }
- ++ optional enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }
- ++ concatMap (svc: svc.extraModules) allSubservices
+ ++ optional mainCfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; }
+ ++ optional mainCfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }
++ extraForeignModules;
in concatMapStrings load (unique allModules)
}
@@ -385,17 +319,10 @@ let
}
'';
-
- enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices;
-
- enablePerl = mainCfg.enablePerl || any (svc: svc.enablePerl) allSubservices;
-
-
# Generate the PHP configuration file. Should probably be factored
# out into a separate module.
phpIni = pkgs.runCommand "php.ini"
- { options = concatStringsSep "\n"
- ([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices));
+ { options = mainCfg.phpOptions;
preferLocalBuild = true;
}
''
@@ -408,6 +335,10 @@ in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "httpd" "extraSubservices" ] "Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.")
+ ];
+
###### interface
options = {
@@ -637,8 +568,6 @@ in
message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
];
- warnings = map (cfg: "apache-httpd's extraSubservices option is deprecated. Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") (lib.filter (cfg: cfg.extraSubservices != []) allHosts);
-
users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton
{ name = "wwwrun";
group = mainCfg.group;
@@ -651,7 +580,7 @@ in
gid = config.ids.gids.wwwrun;
});
- environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
+ environment.systemPackages = [httpd];
services.httpd.phpOptions =
''
@@ -674,13 +603,11 @@ in
path =
[ httpd pkgs.coreutils pkgs.gnugrep ]
- ++ optional enablePHP pkgs.system-sendmail # Needed for PHP's mail() function.
- ++ concatMap (svc: svc.extraServerPath) allSubservices;
+ ++ optional mainCfg.enablePHP pkgs.system-sendmail; # Needed for PHP's mail() function.
environment =
- optionalAttrs enablePHP { PHPRC = phpIni; }
- // optionalAttrs mainCfg.enableMellon { LD_LIBRARY_PATH = "${pkgs.xmlsec}/lib"; }
- // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
+ optionalAttrs mainCfg.enablePHP { PHPRC = phpIni; }
+ // optionalAttrs mainCfg.enableMellon { LD_LIBRARY_PATH = "${pkgs.xmlsec}/lib"; };
preStart =
''
@@ -698,12 +625,6 @@ in
for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do
${pkgs.utillinux}/bin/ipcrm -s $i
done
-
- # Run the startup hooks for the subservices.
- for i in ${toString (map (svn: svn.startupScript) allSubservices)}; do
- echo Running Apache startup hook $i...
- $i
- done
'';
serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf}";
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index 9d747549c27..c36207d5460 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -133,12 +133,6 @@ with lib;
'';
};
- extraSubservices = mkOption {
- type = types.listOf types.unspecified;
- default = [];
- description = "Extra subservices to enable in the webserver.";
- };
-
enableUserDir = mkOption {
type = types.bool;
default = false;
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index f6eee17f834..dc1118f47e0 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -4,13 +4,13 @@ let
pythonPackages = python3Packages;
in pythonPackages.buildPythonApplication rec {
pname = "picard";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "release-${version}";
- sha256 = "1g7pbicf65hswbqmhrwlba9jm4r2vnggy7vy75z4256y7qcpwdfd";
+ sha256 = "1iibkvwpj862wcrl0fmyi6qhcgx4q5ay63yr0zyg0bkqgcka0gpr";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ];
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index cd07a57cba7..5bdfc39e0aa 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
- version = "0.20.2";
+ version = "0.20.3";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
- sha256 = "1hii6wjz6095jpy5kw7z6i3fn2jf1dvsppf162xx2c08n9vmz3s3";
+ sha256 = "1m0k685czpywmkzhzfa09jc0hvmh7rk5rywwlq2chxz50pzm2m3a";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 838e57343c4..374dfb411e7 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -85,6 +85,15 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
stripDebugList = [ "share" ];
});
+ # https://github.com/syl20bnr/evil-escape/pull/86
+ evil-escape = super.evil-escape.overrideAttrs (attrs: {
+ postPatch = ''
+ substituteInPlace evil-escape.el \
+ --replace ' ;;; evil' ';;; evil'
+ '';
+ packageRequires = with self; [ evil ];
+ });
+
evil-magit = super.evil-magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index e0bc882c422..5d4a60b4c6b 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -43,7 +43,7 @@ let
description = "Tool for building, changing, and versioning infrastructure";
homepage = https://www.terraform.io/;
license = licenses.mpl20;
- maintainers = with maintainers; [ zimbatm peterhoeg kalbasit ];
+ maintainers = with maintainers; [ zimbatm peterhoeg kalbasit marsam ];
};
} // attrs');
@@ -97,8 +97,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic {
- version = "0.12.10";
- sha256 = "0bmqcmzjsrpvvnd9pn40f774c8jy6j810qz0njxqh60yh27f5rhx";
+ version = "0.12.12";
+ sha256 = "04qvzbm33ngkbkh45jbcv06c9s1lkgjk39sxvfxw7y6ygxzsrqq5";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch b/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch
new file mode 100644
index 00000000000..d4e8c95fea2
--- /dev/null
+++ b/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch
@@ -0,0 +1,19 @@
+*** suricata-5.0.0/ebpf/Makefile.in 2019-10-16 22:39:13.174649416 +0200
+--- suricata-5.0.0/ebpf/Makefile.in.fixed 2019-10-16 22:38:41.822201802 +0200
+***************
+*** 527,533 ****
+ @BUILD_EBPF_TRUE@$(BPF_TARGETS): %.bpf: %.c
+ # From C-code to LLVM-IR format suffix .ll (clang -S -emit-llvm)
+ @BUILD_EBPF_TRUE@ ${CLANG} -Wall $(BPF_CFLAGS) -O2 \
+! @BUILD_EBPF_TRUE@ -I/usr/include/$(build_cpu)-$(build_os)/ \
+ @BUILD_EBPF_TRUE@ -D__KERNEL__ -D__ASM_SYSREG_H \
+ @BUILD_EBPF_TRUE@ -target bpf -S -emit-llvm $< -o ${@:.bpf=.ll}
+ # From LLVM-IR to BPF-bytecode in ELF-obj file
+--- 527,533 ----
+ @BUILD_EBPF_TRUE@$(BPF_TARGETS): %.bpf: %.c
+ # From C-code to LLVM-IR format suffix .ll (clang -S -emit-llvm)
+ @BUILD_EBPF_TRUE@ ${CLANG} -Wall $(BPF_CFLAGS) -O2 \
+! @BUILD_EBPF_TRUE@ -idirafter ../bpf_stubs_workaround \
+ @BUILD_EBPF_TRUE@ -D__KERNEL__ -D__ASM_SYSREG_H \
+ @BUILD_EBPF_TRUE@ -target bpf -S -emit-llvm $< -o ${@:.bpf=.ll}
+ # From LLVM-IR to BPF-bytecode in ELF-obj file
diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix
index 62f755c4d7c..7f2a9d71fe5 100644
--- a/pkgs/applications/networking/ids/suricata/default.nix
+++ b/pkgs/applications/networking/ids/suricata/default.nix
@@ -1,14 +1,18 @@
{ stdenv
, lib
, fetchurl
+, clang
+, llvm
, pkgconfig
, makeWrapper
, file
-, geoip
, hyperscan
, jansson
+, libbpf
, libcap_ng
+, libelf
, libevent
+, libmaxminddb
, libnet
, libnetfilter_log
, libnetfilter_queue
@@ -30,24 +34,30 @@
in
stdenv.mkDerivation rec {
pname = "suricata";
- version = "4.1.5";
+ version = "5.0.0";
src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
- sha256 = "0jy738rs3ds1gbn8hv26ck23z9k6pjrjxdpavkyn7znpbi9zdrff";
+ sha256 = "0qwav4qpvx3i5khkyvdvx42n8b9mza8c4cpxvrf7m4lnf51cqgba";
};
nativeBuildInputs = [
+ clang
+ llvm
makeWrapper
pkgconfig
- ];
+ ]
+ ++ lib.optionals rustSupport [ rustc cargo ]
+ ;
buildInputs = [
- geoip
jansson
+ libbpf
libcap_ng
+ libelf
libevent
libmagic
+ libmaxminddb
libnet
libnetfilter_log
libnetfilter_queue
@@ -62,17 +72,29 @@ stdenv.mkDerivation rec {
python
zlib
]
- ++ lib.optional hyperscanSupport [ hyperscan ]
- ++ lib.optional redisSupport [ redis hiredis ]
- ++ lib.optional rustSupport [ rustc cargo ]
+ ++ lib.optional hyperscanSupport hyperscan
+ ++ lib.optionals redisSupport [ redis hiredis ]
;
enableParallelBuilding = true;
+ patches = lib.optional stdenv.is64bit ./bpf_stubs_workaround.patch;
+
+ postPatch = ''
+ substituteInPlace ./configure \
+ --replace "/usr/bin/file" "${file}/bin/file"
+ substituteInPlace ./libhtp/configure \
+ --replace "/usr/bin/file" "${file}/bin/file"
+
+ mkdir -p bpf_stubs_workaround/gnu
+ touch bpf_stubs_workaround/gnu/stubs-32.h
+ '';
+
configureFlags = [
"--disable-gccmarch-native"
- "--enable-afl"
"--enable-af-packet"
+ "--enable-ebpf"
+ "--enable-ebpf-build"
"--enable-gccprotect"
"--enable-geoip"
"--enable-luajit"
@@ -97,6 +119,13 @@ stdenv.mkDerivation rec {
"--enable-rust-experimental"
];
+ postConfigure = ''
+ # Avoid unintended clousure growth.
+ sed -i 's|/nix/store/\(.\{8\}\)[^-]*-|/nix/store/\1...-|g' ./src/build-info.h
+ '';
+
+ hardeningDisable = [ "stackprotector" ];
+
installFlags = [
"e_localstatedir=\${TMPDIR}"
"e_logdir=\${TMPDIR}"
@@ -115,6 +144,8 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out/bin/suricatasc" \
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out")
+ substituteInPlace "$out/etc/suricata/suricata.yaml" \
+ --replace "/etc/suricata" "$out/etc/suricata"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
index 7019c309feb..2fb30e5ae6a 100644
--- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
+++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
@@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "mlarchive2maildir";
- version = "0.0.6";
+ version = "0.0.8";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "025mv890zsk25cral9cas3qgqdsszh5025khz473zs36innjd0mw";
+ sha256 = "1din3yay2sas85178v0xr0hbm2396y4dalkcqql1ny9vdm94h6sp";
};
nativeBuildInputs = with python3.pkgs; [ setuptools_scm ];
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index cec4e72e2ad..3ee934e8b29 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
-, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome }:
+, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome
+, pulseaudio }:
let
sha256 = {
@@ -37,7 +38,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
gnome2.gtkglext libGLU_combined freetype fontconfig
- pangox_compat polkit polkit_gnome
+ pangox_compat polkit polkit_gnome pulseaudio
] ++ (with xorg; [
libxcb libX11 libXdamage libXext libXfixes libXi libXmu
libXrandr libXtst libXt libICE libSM libXrender
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index bc26541f4d7..7475692b962 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "rclone";
- version = "1.49.4";
+ version = "1.49.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "04fa85ch85dxm2nq7vqria34zn6fbgvky7p1i59j1wib753jpxyp";
+ sha256 = "0firfb2300grfp5fnqaifhp346m4d0x8r1xshs9d8r6jxb160n03";
};
goPackagePath = "github.com/rclone/rclone";
diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
index 6449e966959..31295114375 100644
--- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix
+++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
@@ -1,22 +1,22 @@
{stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
let
- strippedName = "betaflight-configurator";
+ pname = "betaflight-configurator";
desktopItem = makeDesktopItem {
- name = strippedName;
- exec = strippedName;
- icon = "${strippedName}-icon.png";
+ name = pname;
+ exec = pname;
+ icon = pname;
comment = "Betaflight configuration tool";
desktopName = "Betaflight Configurator";
genericName = "Flight controller configuration tool";
};
in
stdenv.mkDerivation rec {
- name = "${strippedName}-${version}";
- version = "10.5.1";
+ inherit pname;
+ version = "10.6.0";
src = fetchurl {
- url = "https://github.com/betaflight/betaflight-configurator/releases/download/${version}/${strippedName}_${version}_linux64.zip";
- sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc";
+ url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip";
+ sha256 = "09hayzhwangh8b81r038p320vbg0xxlyzrdp9pcmfyxp6s00xslw";
};
nativeBuildInputs = [ wrapGAppsHook ];
@@ -25,14 +25,13 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin \
- $out/opt/${strippedName} \
- $out/share/icons
+ $out/opt/${pname}
- cp -r . $out/opt/${strippedName}/
- cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png
+ cp -r . $out/opt/${pname}/
+ install -m 444 -D icon/bf_icon_128.png $out/share/icons/hicolor/128x128/apps/${pname}.png
cp -r ${desktopItem}/share/applications $out/share/
- makeWrapper ${nwjs}/bin/nw $out/bin/${strippedName} --add-flags $out/opt/${strippedName}
+ makeWrapper ${nwjs}/bin/nw $out/bin/${pname} --add-flags $out/opt/${pname}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index f9fea3f3146..cbf7f4db8c4 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchgit, git, SDL2, udev, doxygen
-, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
-, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech
+{ lib, mkDerivation, fetchgit, SDL2
+, qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2
+, qtgraphicaleffects, qtspeech, qmake
, makeWrapper
, gst_all_1, pkgconfig
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "qgroundcontrol";
- version = "3.3.0";
+ version = "3.5.5";
qtInputs = [
- qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg
- qtquick1 qtquickcontrols qtgraphicaleffects qtspeech
+ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
+ qtgraphicaleffects qtspeech
];
gstInputs = with gst_all_1; [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
enableParallelBuilding = true;
- buildInputs = [ SDL2 udev doxygen git ] ++ gstInputs ++ qtInputs;
+ buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
preConfigure = ''
@@ -58,17 +58,16 @@ stdenv.mkDerivation rec {
# TODO: package mavlink so we can build from a normal source tarball
src = fetchgit {
url = "https://github.com/mavlink/qgroundcontrol.git";
- rev = "refs/tags/v${version}";
- sha256 = "0abjm0wywp24qlgg9w8g35ijprjg5csq4fgba9caaiwvmpfbhmpw";
+ rev = "v${version}";
+ sha256 = "05zy6w9lwwh254wa8c6wysa67kk0flywcvipii9b1rmy47slflhs";
fetchSubmodules = true;
};
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
- homepage = http://qgroundcontrol.org/;
+ homepage = "http://qgroundcontrol.org/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ pxc ];
- broken = true;
};
}
diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix
index ab794992e45..a248bb9d494 100644
--- a/pkgs/data/fonts/ricty/default.nix
+++ b/pkgs/data/fonts/ricty/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "4.1.1";
src = fetchurl {
- url = "https://www.rs.tus.ac.jp/yyusa/ricty/ricty_generator-${version}.sh";
+ url = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty/ricty_generator-${version}.sh";
sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6";
};
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A high-quality Japanese font based on Inconsolata and Migu 1M";
- homepage = https://www.rs.tus.ac.jp/yyusa/ricty.html;
+ homepage = http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html;
license = licenses.unfree;
maintainers = [ maintainers.mikoim ];
};
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index d836ddeea38..43db6b39c67 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "lxqt-globalkeys";
- version = "0.14.1";
+ version = "0.14.3";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0q7hfbs4dhsgyzch2msq2hsfzzfgbc611ki9x1x132n7zqk76pmp";
+ sha256 = "1ij9abjnqbnkcb7qqk3x7y4amr6l7kkmwhdpc0x2qk4yikn5ijdg";
};
nativeBuildInputs = [
@@ -27,7 +27,7 @@ mkDerivation rec {
];
meta = with lib; {
- description = "Daemon used to register global keyboard shortcuts";
+ description = "LXQt service for global keyboard shortcuts registration";
homepage = https://github.com/lxqt/lxqt-globalkeys;
license = licenses.lgpl21;
platforms = with platforms; unix;
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index 942c9257c25..cb8e5b2569c 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "qps";
- version = "1.10.20";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1g8j4cjy5x33jzjkx6vwyl5qbf9i2z2w01ipgk7nrik5drf9crbf";
+ sha256 = "03rl59yk3b24j0y0k8dpdpb3yi4f1l642zn5pp5br3s2vwx1vzkg";
};
nativeBuildInputs = [ cmake lxqt-build-tools ];
@@ -17,10 +17,10 @@ mkDerivation rec {
buildInputs = [ qtbase qtx11extras qttools ];
meta = with lib; {
- description = "The Qt process manager";
+ description = "Qt based process manager";
homepage = https://github.com/lxqt/qps;
license = licenses.gpl2;
+ platforms = with platforms; linux; # does not build on darwin
maintainers = with maintainers; [ romildo ];
- platforms = with platforms; unix;
};
}
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 787a9352e22..03e6fa82b9d 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -2,8 +2,8 @@
, python, libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, targetPackages
, bootstrapVersion ? false
-, version ? "1.16.0"
-, ldcSha256 ? "00kk6pijn1ay2kkrp6b5ismawxr10azwij89k1rkszavqq6rsva2"
+, version ? "1.17.0"
+, ldcSha256 ? "1aag5jfrng6p4ms0fs90hjbv9bcj3hj8h52r68c3cm6racdajbva"
}:
let
diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix
index f953c170ab5..a37d4756cbd 100644
--- a/pkgs/development/libraries/libabw/default.nix
+++ b/pkgs/development/libraries/libabw/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libabw";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchurl {
url = "https://dev-www.libreoffice.org/src/libabw/${pname}-${version}.tar.xz";
- sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb";
+ sha256 = "1vbfrmnvib3cym0yyyabnd8xpx4f7wp20vnn09s6dln347fajqz7";
};
# Boost 1.59 compatability fix
diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix
index 81122a6eb52..9abd3b7ccc1 100644
--- a/pkgs/development/libraries/libcutl/default.nix
+++ b/pkgs/development/libraries/libcutl/default.nix
@@ -1,23 +1,29 @@
{ stdenv, fetchurl, xercesc }:
-let
- major = "1.9";
- minor = "0";
-in
-with stdenv; with lib;
-mkDerivation rec {
- name = "libcutl-${major}.${minor}";
- meta = {
- description = "A collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks" ;
+stdenv.mkDerivation rec {
+ pname = "libcutl";
+ version = "1.10.0";
+
+ meta = with stdenv.lib; {
+ description = "C++ utility library from Code Synthesis";
+ longDescription = ''
+ libcutl is a C++ utility library.
+ It contains a collection of generic and independent components such as
+ meta-programming tests, smart pointers, containers, compiler building blocks, etc.
+ '';
+ homepage = "https://codesynthesis.com/projects/libcutl/";
+ changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}";
platforms = platforms.all;
maintainers = with maintainers; [ ];
license = licenses.mit;
};
+ majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]*+)\.*" "${version}" );
src = fetchurl {
- url = "https://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2";
- sha1 = "0e8d255145afbc339a3284ef85a43f4baf3fec43";
+ url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2";
+ sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j";
};
buildInputs = [ xercesc ];
+ enableParallelBuilding = true;
}
diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix
index 4014dc8dd76..a6715bdc18d 100644
--- a/pkgs/development/libraries/libwhereami/default.nix
+++ b/pkgs/development/libraries/libwhereami/default.nix
@@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
description = "Library to report hypervisor information from inside a VM";
license = licenses.asl20;
maintainers = [ maintainers.womfoo ];
- platforms = platforms.linux;
- badPlatforms = platforms.arm;
+ platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; # fails on aarch64
};
}
diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/pkgs/development/ocaml-modules/duff/default.nix
new file mode 100644
index 00000000000..1c6b59961ef
--- /dev/null
+++ b/pkgs/development/ocaml-modules/duff/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchurl, buildDunePackage
+, cstruct, fmt
+, bos, cmdliner, fpath, logs
+, alcotest
+}:
+
+buildDunePackage rec {
+ pname = "duff";
+ version = "0.2";
+ src = fetchurl {
+ url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz";
+ sha256 = "0bi081w4349cqc1n9jsjh1lrcqlnv3nycmvh9fniscv8lz1c0gjq";
+ };
+
+ buildInputs = [ bos cmdliner fpath logs ] ++ lib.optional doCheck alcotest;
+ propagatedBuildInputs = [ cstruct fmt ];
+
+ doCheck = true;
+
+ meta = {
+ description = "Pure OCaml implementation of libXdiff (Rabin’s fingerprint)";
+ homepage = "https://github.com/mirage/duff";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.vbgl ];
+ };
+}
diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix
new file mode 100644
index 00000000000..e23c3621c2e
--- /dev/null
+++ b/pkgs/development/python-modules/managesieve/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestrunner
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "managesieve";
+ version = "0.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ee70e298e9b68eb81f93d52a1320a034fdc182f3927fdd551836fc93b0ed2c5f";
+ };
+
+ checkInputs = [ pytestrunner pytest ];
+
+ meta = with lib; {
+ description = "ManageSieve client library for remotely managing Sieve scripts";
+ homepage = "https://managesieve.readthedocs.io/";
+ # PSFL for the python module, GPLv3 for sieveshell
+ license = with licenses; [ gpl3 psfl ];
+ maintainers = with maintainers; [ dadada ];
+ };
+}
diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix
new file mode 100644
index 00000000000..cef6173af3d
--- /dev/null
+++ b/pkgs/development/python-modules/phik/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, pytest
+, pytest-pylint
+, nbconvert
+, jupyter_client
+, numpy
+, scipy
+, pandas
+, matplotlib
+, numba
+}:
+
+buildPythonPackage rec {
+ pname = "phik";
+ version = "0.9.8";
+ format = "wheel";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ inherit pname version format;
+ python = "py3";
+ sha256 = "c398452c5c1eea153905666b289c6a153712cf3d58811fa41e2bbbd27a65d678";
+ };
+
+ checkInputs = [
+ pytest
+ pytest-pylint
+ nbconvert
+ jupyter_client
+ ];
+
+ propagatedBuildInputs = [
+ numpy
+ scipy
+ pandas
+ matplotlib
+ numba
+ ];
+
+ postInstall = ''
+ rm -r $out/bin
+ '';
+
+ meta = with lib; {
+ description = "Phi_K correlation analyzer library";
+ longDescription = "Phi_K is a new and practical correlation coefficient based on several refinements to Pearson’s hypothesis test of independence of two variables.";
+ homepage = https://phik.readthedocs.io/en/latest/;
+ maintainers = with maintainers; [ melsigl ];
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix
new file mode 100644
index 00000000000..6c2201d1f1d
--- /dev/null
+++ b/pkgs/development/python-modules/praw/6.3.nix
@@ -0,0 +1,53 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, betamax
+, betamax-serializers
+, betamax-matchers
+, mock
+, six
+, pytestrunner
+, prawcore
+, pytest
+, requests-toolbelt
+, update_checker
+, websocket_client
+}:
+
+buildPythonPackage rec {
+ pname = "praw";
+ version = "6.3.1";
+
+ src = fetchFromGitHub {
+ owner = "praw-dev";
+ repo = "praw";
+ rev = "v${version}";
+ sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky";
+ };
+
+ nativeBuildInputs = [
+ pytestrunner
+ ];
+
+ propagatedBuildInputs = [
+ mock
+ prawcore
+ update_checker
+ websocket_client
+ ];
+
+ checkInputs = [
+ betamax
+ betamax-serializers
+ betamax-matchers
+ mock
+ pytest
+ requests-toolbelt
+ six
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Python Reddit API wrapper";
+ homepage = "https://praw.readthedocs.org/";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index 2a3d85c2b35..14166b4f43c 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "praw";
- version = "6.3.1";
+ version = "6.4.0";
src = fetchFromGitHub {
owner = "praw-dev";
repo = "praw";
rev = "v${version}";
- sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky";
+ sha256 = "0j92wqyppif2k80zhzq30b04r8ljwjviply400kn4rjn54hxd4hb";
};
nativeBuildInputs = [
@@ -48,7 +48,6 @@ buildPythonPackage rec {
description = "Python Reddit API wrapper";
homepage = "https://praw.readthedocs.org/";
license = licenses.bsd2;
- platforms = platforms.all;
maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 3fdf6e9e3d0..8f55bf95127 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "8.24";
+ version = "8.25";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
- sha256 = "01h1xv6lqf1fhmzbghdj2dbygdspcb6dxk0fil16s2ggs3w62fmm";
+ sha256 = "04asn3cqh0f78c4b0968ic2fxgijf47paw3zgh9dh96x1165yhkf";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix
index 678988480ec..6b51e2c482c 100644
--- a/pkgs/development/tools/avro-tools/default.nix
+++ b/pkgs/development/tools/avro-tools/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "avro-tools";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchurl {
url =
"https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
- sha256 = "164mcz7ljd2ikwsq9ba98galcjar4g4n6ag7kkh466nwrpbmd2zi";
+ sha256 = "0d73qbfx59pa4mgsjwgl5dvc4895rm90pdwr4sbd77biscjad94s";
};
dontUnpack = true;
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index 6c0532eac48..15303c2c87f 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
- version = "1.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
- sha256 = "0516rx3qx6nxavy0a1qxjx2rcvdfb2ggig0q4n7fkmrxbnwxh2c9";
+ sha256 = "1pv113sk7hfxp4m2rcriqqp6mbbzcfdr0yrx4g1yiam93rx34yb7";
};
- modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl";
+ modSha256 = "0gs8y618izqi0gfa46jqh79yj8lzsmc6yj95fakhp2f5i8v1xrmx";
meta = with stdenv.lib; {
description = "A user-friendly launcher for Bazel";
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index 5f3a090fef7..41fc0940b9d 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "buck";
- version = "2019.09.12.01";
+ version = "2019.10.17.01";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
- sha256 = "02rid0r0swxa6n6hl89lcll7hgxn1wjh2kjzxcj4arm7d34243bw";
+ sha256 = "1irgp8yq1z11bq3b83yxvj35wqqq7y7b8q4d4y0hc05ac19ja0vj";
};
patches = [ ./pex-mtime.patch ];
diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix
index b312b888e90..e939ddb1334 100644
--- a/pkgs/development/tools/chit/default.nix
+++ b/pkgs/development/tools/chit/default.nix
@@ -6,16 +6,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "chit";
- version = "0.1.14";
+ version = "0.1.15";
src = fetchFromGitHub {
owner = "peterheesterman";
repo = pname;
rev = version;
- sha256 = "1rzy15xwlf87c8kpy9pwvir6s9z3qc8d9iz4pk0gfdj2il3vmjwv";
+ sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz";
};
- cargoSha256 = "1jqnnf4jgjpm1i310hda15423nxfw9frgpmc2kbrs66qcsj7avaw";
+ cargoSha256 = "0k6z69a09ps55w2rdgnf92yscw6rlbcpb4q9yf3rsav15pgpqvw8";
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ];
buildInputs = []
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 07d2357a50b..e60181e9bc4 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -1,29 +1,29 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, tree }:
buildGoModule rec {
pname = "kustomize";
- version = "3.1.0";
- # rev is the 3.1.0 commit, mainly for kustomize version command output
- rev = "95f3303493fdea243ae83b767978092396169baf";
+ version = "3.3.1";
+ # rev is the 3.3.1 commit, mainly for kustomize version command output
+ rev = "f2ac5a2d0df13c047fb20cbc12ef1a3b41ce2dad";
- goPackagePath = "sigs.k8s.io/kustomize";
- subPackages = [ "cmd/kustomize" ];
-
- buildFlagsArray = let t = "${goPackagePath}/v3/pkg/commands/misc"; in ''
+ buildFlagsArray = let t = "sigs.k8s.io/kustomize/v3/provenance"; in ''
-ldflags=
- -s -X ${t}.kustomizeVersion=${version}
+ -s -X ${t}.version=${version}
-X ${t}.gitCommit=${rev}
-X ${t}.buildDate=unknown
'';
src = fetchFromGitHub {
- sha256 = "0kigcirkjvnj3xi1p28p9yp3s0lff24q5qcvf8ahjwvpbwka14sh";
- rev = "v${version}";
- repo = pname;
owner = "kubernetes-sigs";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0yxxz0b56r18w178y32s619zy8ci6l93c6vlzx11hhxhbw43f6v6";
};
- modSha256 = "0w8sp73pmj2wqrg7x7z8diglyfq6c6gn9mmck0k1gk90nv7s8rf1";
+ # avoid finding test and development commands
+ sourceRoot = "source/kustomize";
+
+ modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g";
meta = with lib; {
description = "Customization of kubernetes YAML configurations";
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 144e1d71a11..970c641fe49 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "ashleygwilliams";
repo = "cargo-generate";
rev = "v${version}";
- sha256 = "0n6na6xq4bvs9hc7vc86qqmlrkv824qdmja27b21l2wz3l77r4jb";
+ sha256 = "09276jrb0a735v6p06wz94kbk8bblwpca13vpvy8n0jjmqack2xb";
};
- cargoSha256 = "00fgzh1s63rr1vs3ahra604m81fc4imx3s09brw2y0n46syhwypi";
+ cargoSha256 = "1gbxfmhwzpxm0gs3zwzs010j0ndi5aw6xsvvngg0h1lpwg9ypnbr";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index 117ebcc1ac1..3241e6dd387 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -1,28 +1,30 @@
{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
-stdenv.mkDerivation {
- version = "unstable-2019-07-28";
+stdenv.mkDerivation rec {
+ version = "0.5.0";
pname = "devilutionx";
src = fetchFromGitHub {
owner = "diasurgical";
repo = "devilutionX";
- rev = "b2f358874705598ec139f290b21e340c73d250f6";
- sha256 = "0s812km118qq5pzlzvzfndvag0mp6yzvm69ykc97frdiq608zw4f";
+ rev = version;
+ sha256 = "010hxj129zmsynvizk89vm2y29dcxsfi585czh3f03wfr38rxa6b";
};
NIX_CFLAGS_COMPILE = "-I${SDL2_ttf}/include/SDL2";
- # compilation will fail due to -Werror=format-security
- hardeningDisable = [ "format" ];
-
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ];
installPhase = ''
runHook preInstall
+ '' + (if stdenv.isDarwin then ''
+ mkdir -p $out/Applications
+ mv devilutionx.app $out/Applications
+ '' else ''
mkdir -p $out/bin
cp devilutionx $out/bin
+ '') + ''
runHook postInstall
'';
@@ -30,6 +32,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://github.com/diasurgical/devilutionX";
description = "Diablo build for modern operating systems";
+ longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game.";
license = licenses.unlicense;
maintainers = [ maintainers.karolchmist ];
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 91e1ae36f70..93e9ba614f8 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -29,11 +29,11 @@ let
in
stdenv.mkDerivation rec {
pname = "musl";
- version = "1.1.22";
+ version = "1.1.24";
src = fetchurl {
url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz";
- sha256 = "1qr9xqdzziy5bsyyqlh6k8yz056ll55d5yvc0gbhz61ginj422cb";
+ sha256 = "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k";
};
enableParallelBuilding = true;
@@ -110,11 +110,11 @@ stdenv.mkDerivation rec {
passthru.linuxHeaders = linuxHeaders;
- meta = {
+ meta = with lib; {
description = "An efficient, small, quality libc implementation";
homepage = "http://www.musl-libc.org";
- license = lib.licenses.mit;
- platforms = lib.platforms.linux;
- maintainers = [ lib.maintainers.thoughtpolice ];
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ thoughtpolice dtzWill ];
};
}
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 13b5a19a751..7ac7bc8e918 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -58,7 +58,7 @@ in
};
bird2 = generic {
- version = "2.0.6";
- sha256 = "1ankpxvmn12kzgv5vh7awnkj34jzjciy5baq3smkj079db74r4wh";
+ version = "2.0.7";
+ sha256 = "0rhhbfmfw2d93rvhglv03rdzxsq2disw6s1wm8d6bgdxmrc2n7b3";
};
}
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 0f551f489a6..40a116f5665 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
stdenv.mkDerivation rec {
pname = "bind";
- version = "9.14.6";
+ version = "9.14.7";
src = fetchurl {
url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
- sha256 = "1zpd47ckn5lf4qbscfkj7krngwn2gwsp961v5401h3lhxm0a0rw9";
+ sha256 = "07998nx0yv3xy8c62b1ira9qygsgvpljwcgb47ypzxq8b57gb86f";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 13ea1b07265..fd873011488 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -1,12 +1,14 @@
{ lib, fetchPypi, buildPythonPackage }:
buildPythonPackage rec {
+ # the frontend version corresponding to a specific home-assistant version can be found here
+ # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20190514.0";
+ version = "20190919.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ba8cfa01b00ff2ee94a91cd83197b4d213e9b9df151daaef11dd0a56d34c5414";
+ sha256 = "1xdw8fj4njc3sf15mlyiwigrwf89xsz4r2dsv6zs5fnl512r439a";
};
# no Python tests implemented
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 0e17cc40efe..461ab1e297e 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mod_wsgi";
- version = "4.6.7";
+ version = "4.6.8";
src = fetchurl {
url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
- sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2";
+ sha256 = "0xym7i3iaxqi23dayacv2llhi0klxcb4ldll5cjxv6lg9v5r88x2";
};
buildInputs = [ apacheHttpd python ncurses ];
diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix
index 1afe1e8b946..9b39723f843 100644
--- a/pkgs/servers/misc/airsonic/default.nix
+++ b/pkgs/servers/misc/airsonic/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "airsonic";
- version = "10.4.0";
+ version = "10.4.1";
src = fetchurl {
url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war";
- sha256 = "1m4l10hp5m010ljsvn2ba4bbh8i26d04xffw81gfgjw08gya2hh8";
+ sha256 = "18vm59x8pcgsyf3kl8ndvdszwf62df9vsqzv5jgbzayb3s0yjghx";
};
buildCommand = ''
diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index 4d8ead30add..b4400215dd0 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
name = "rt-perl-deps";
paths = (with perlPackages; [
ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI
- CSSMinifierXP CSSSquish ConvertColor CryptEksblowfish
+ CSSMinifierXS CSSSquish ConvertColor CryptEksblowfish
CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID
DataICal DataPagePageset DateExtract DateManip
DateTimeFormatNatural DevelGlobalDestruction EmailAddress
diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index 9dc3eb86e79..8cc21158e8a 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/pkgs/tools/misc/birdfont/default.nix
@@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "birdfont";
- version = "2.27.0";
+ version = "2.28.0";
src = fetchurl {
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
- sha256 = "0dr2cnvq30wak0j2k8089is7fvhw0ppwkfrrw1m649s2b95wav3q";
+ sha256 = "19i7wzngi695dp4w0235wmfcnagdw3i40mzf89sddr1mqzvipfrz";
};
nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ];
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 1b949108c54..e9ee91de677 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,47 +1,56 @@
-{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
+{ stdenv, fetchFromGitHub, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
, docbook_xml_dtd_412, docbook_xsl
, libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify
-, gobject-introspection, libsecret
+, gobject-introspection, libsecret, packagekit
, cups-filters
-, pythonPackages
+, python3Packages, autoreconfHook, bash
}:
stdenv.mkDerivation rec {
pname = "system-config-printer";
- version = "1.5.11";
+ version = "1.5.12";
- src = fetchurl {
- url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q";
+ src = fetchFromGitHub {
+ owner = "openPrinting";
+ repo = pname;
+ rev = version;
+ sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf";
};
+ prePatch = ''
+ # for automake
+ touch README ChangeLog
+ # for tests
+ substituteInPlace Makefile.am --replace /bin/bash ${bash}/bin/bash
+ '';
+
patches = [ ./detect_serverbindir.patch ];
buildInputs = [
glib udev libusb1 cups
- pythonPackages.python
- libnotify gobject-introspection gdk-pixbuf pango atk
+ python3Packages.python
+ libnotify gobject-introspection gdk-pixbuf pango atk packagekit
libsecret
];
nativeBuildInputs = [
intltool pkgconfig
xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils
- pythonPackages.wrapPython
- wrapGAppsHook
+ python3Packages.wrapPython
+ wrapGAppsHook autoreconfHook
];
- pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
+ pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
configureFlags = [
"--with-udev-rules"
- "--with-udevdir=$(out)/etc/udev"
- "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+ "--with-udevdir=${placeholder "out"}/etc/udev"
+ "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
];
stripDebugList = [ "bin" "lib" "etc/udev" ];
- doCheck = false; # generates shebangs in check phase, too lazy to fix
+ doCheck = true;
postInstall =
''
@@ -54,20 +63,14 @@ stdenv.mkDerivation rec {
find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do
patchPythonScript "$f"
done
-
- # The below line will be unneeded when the next upstream release arrives.
- sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
-
- # Manually expand literal "$(out)", which have failed to expand
- sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \
- -i "$out/etc/systemd/system/configure-printer@.service"
+ patchPythonScript $out/etc/udev/udev-add-printer
substituteInPlace $out/etc/udev/rules.d/70-printers.rules \
--replace "udev-configure-printer" "$out/etc/udev/udev-configure-printer"
'';
meta = {
- homepage = http://cyberelk.net/tim/software/system-config-printer/;
+ homepage = "https://github.com/openprinting/system-config-printer";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2;
};
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index dc921dc495a..569a6d118e7 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "nss-pam-ldapd";
- version = "0.9.10";
+ version = "0.9.11";
src = fetchurl {
url = "https://arthurdejong.org/nss-pam-ldapd/${pname}-${version}.tar.gz";
- sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0";
+ sha256 = "1dna3r0q6sjhhlkhcp8x2zkslrd4y7701kk6fl5r940sdph1pmyh";
};
nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ];
diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index f96501ddf77..fbef98df82d 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -16,11 +16,11 @@ let
pname = "bitwarden";
version = {
- x86_64-linux = "1.16.4";
+ x86_64-linux = "1.16.6";
}.${system} or "";
sha256 = {
- x86_64-linux = "1g9ljxjqs7mx509lkfd7db7xvm9srzypbgv0qfzrr2flqbsfl06m";
+ x86_64-linux = "074hqm4gjljc82nhn7h6wsd74567390018fi3v38g7jh7aph10jj";
}.${system} or "";
meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix
index 76b9f24224c..51dde99bcf1 100644
--- a/pkgs/tools/security/bitwarden_rs/vault.nix
+++ b/pkgs/tools/security/bitwarden_rs/vault.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault";
- version = "2.11.0";
+ version = "2.12.0";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
- sha256 = "06f0rcpqhz5qjm01jbxx2czhnj9ng29rgsrilm5r5xx31s9dnhg7";
+ sha256 = "064dxfplqn67grpx03ryzshwmr7s00w4mll0hk0anddviwvd8r1n";
};
buildCommand = ''
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index ee9cdf36129..ad90a52a5bd 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,29 +2,30 @@
stdenv.mkDerivation rec {
pname = "facter";
- version = "3.13.2";
+ version = "3.14.5";
src = fetchFromGitHub {
- sha256 = "1yaj1qlyzsaffzpm4zmzm53mc6bhpzka8wc3dfk909nzykxg34zf";
+ sha256 = "0xzzhlsfw8yd3ac4kvr3za0rlkgfw28dzxzi5i1qbhzljivvipm5";
rev = version;
- repo = "facter";
+ repo = pname;
owner = "puppetlabs";
};
CXXFLAGS = "-fpermissive -Wno-error=catch-value";
NIX_LDFLAGS = "-lblkid";
- cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];
+ cmakeFlags = [
+ "-DFACTER_RUBY=${ruby}/lib/libruby.so"
+ "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby"
+ ];
- # since we cant expand $out in cmakeFlags
- preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\"";
-
- buildInputs = [ boost cmake cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = https://github.com/puppetlabs/facter;
+ homepage = "https://github.com/puppetlabs/facter";
description = "A system inventory tool";
license = licenses.asl20;
maintainers = [ maintainers.womfoo ];
diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix
new file mode 100644
index 00000000000..b7855bc7532
--- /dev/null
+++ b/pkgs/tools/text/tab/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromBitbucket, python2 }:
+
+stdenv.mkDerivation rec {
+ version = "7.2";
+ pname = "tab";
+
+ src = fetchFromBitbucket {
+ owner = "tkatchev";
+ repo = pname;
+ rev = version;
+ sha256 = "1bm15lw0vp901dj2vsqx6yixmn7ls3brrzh1w6zgd1ksjzlm5aax";
+ };
+
+ nativeBuildInputs = [ python2 ];
+
+ doCheck = true;
+
+ checkTarget = "test";
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm555 -t $out/bin tab
+ install -Dm444 -t $out/share/doc/tab docs/*.html
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Programming language/shell calculator";
+ homepage = https://tkatchev.bitbucket.io/tab/;
+ license = licenses.boost;
+ maintainers = with maintainers; [ mstarzyk ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a391fbdf440..626d0ea1c8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5589,6 +5589,8 @@ in
plex = callPackage ../servers/plex { };
plexRaw = callPackage ../servers/plex/raw.nix { };
+ tab = callPackage ../tools/text/tab { };
+
tautulli = callPackage ../servers/tautulli { python = python2; };
ploticus = callPackage ../tools/graphics/ploticus {
@@ -6250,7 +6252,9 @@ in
sshguard = callPackage ../tools/security/sshguard {};
- suricata = callPackage ../applications/networking/ids/suricata { };
+ suricata = callPackage ../applications/networking/ids/suricata {
+ python = python3;
+ };
softhsm = callPackage ../tools/security/softhsm {
inherit (darwin) libobjc;
@@ -6424,7 +6428,6 @@ in
system-config-printer = callPackage ../tools/misc/system-config-printer {
libxml2 = libxml2Python;
- pythonPackages = python3Packages;
};
stricat = callPackage ../tools/security/stricat { };
@@ -25204,4 +25207,6 @@ in
keycard-cli = callPackage ../tools/security/keycard-cli {};
+ sieveshell = with python3.pkgs; toPythonApplication managesieve;
+
}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ffe6a215e9d..d463a404649 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -219,6 +219,8 @@ let
dtoa = callPackage ../development/ocaml-modules/dtoa { };
+ duff = callPackage ../development/ocaml-modules/duff { };
+
dune = callPackage ../development/tools/ocaml/dune { };
earley = callPackage ../development/ocaml-modules/earley { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b1ccdec9bcf..bc7deb91327 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3451,6 +3451,23 @@ let
};
};
+ CryptScryptKDF = buildPerlModule {
+ pname = "Crypt-ScryptKDF";
+ version = "0.010";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-ScryptKDF-0.010.tar.gz";
+ sha256 = "7d16ee95cce3eb54c174673a7299f4c086fba3ac85f847d0e134feed5f776017";
+ };
+ propagatedBuildInputs = [ CryptOpenSSLRandom ];
+ perlPreHook = "export LD=$CC";
+ meta = {
+ description = "Scrypt password based key derivation function";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ homepage = "https://github.com/DCIT/perl-Crypt-ScryptKDF";
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
CryptSmbHash = buildPerlPackage {
pname = "Crypt-SmbHash";
version = "0.12";
@@ -3582,7 +3599,7 @@ let
propagatedBuildInputs = [ Clone ];
};
- CSSMinifierXP = buildPerlModule {
+ CSSMinifierXS = buildPerlModule {
pname = "CSS-Minifier-XS";
version = "0.09";
src = fetchurl {
@@ -10921,6 +10938,22 @@ let
buildInputs = [ ProcWaitStat ];
};
+ MIMEEncWords = buildPerlPackage {
+ pname = "MIME-EncWords";
+ version = "1.014.3";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-EncWords-1.014.3.tar.gz";
+ sha256 = "e9afb548611d4e7e6c50b7f06bbd2b1bb2808e37a810deefb537c67af5485238";
+ };
+ propagatedBuildInputs = [ MIMECharset ];
+ meta = {
+ homepage = "https://metacpan.org/pod/MIME::EncWords";
+ description = "Deal with RFC 2047 encoded words (improved)";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
MIMELite = buildPerlPackage {
pname = "MIME-Lite";
version = "3.030";
@@ -11460,6 +11493,38 @@ let
};
};
+ MojoliciousPluginMail = buildPerlModule {
+ pname = "Mojolicious-Plugin-Mail";
+ version = "1.5";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/SH/SHARIFULN/Mojolicious-Plugin-Mail-1.5.tar.gz";
+ sha256 = "56f0d341ebc3a7acf3919f5add43e98216ea1285aa0d87e7fb00c02bb0eff146";
+ };
+ propagatedBuildInputs = [ MIMEEncWords MIMELite Mojolicious ];
+ meta = {
+ homepage = "https://github.com/sharifulin/Mojolicious-Plugin-Mail";
+ description = "Mojolicious Plugin for send mail";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
+ MojoliciousPluginOpenAPI = buildPerlPackage {
+ pname = "Mojolicious-Plugin-OpenAPI";
+ version = "2.17";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.17.tar.gz";
+ sha256 = "c20f8b07fb8582fdbf0b540f4cfc5fe95f262743522a160526024342a7f0a1f0";
+ };
+ propagatedBuildInputs = [ JSONValidator ];
+ meta = {
+ homepage = "https://github.com/jhthorsen/mojolicious-plugin-openapi";
+ description = "OpenAPI / Swagger plugin for Mojolicious";
+ license = stdenv.lib.licenses.artistic2;
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
MojoliciousPluginStatus = buildPerlPackage {
pname = "Mojolicious-Plugin-Status";
version = "1.0";
@@ -12848,6 +12913,7 @@ let
sha256 = "1aiy7adirk3wpwlczd8sldi9k1dray0jrg1lbcrcw97zwcrkciam";
};
buildInputs = [ TestNoWarnings ];
+ perlPreHook = "export LD=$CC";
meta = {
description = "Internationalizing Domain Names in Applications (IDNA)";
};
@@ -15722,6 +15788,7 @@ let
};
buildInputs = [ LWP TestSharedFork TestTCP ];
propagatedBuildInputs = [ ParallelPrefork Plack ServerStarter ];
+ doCheck = !stdenv.isDarwin;
meta = {
description = "A simple, high-performance PSGI/Plack HTTP server";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 193ea459621..e577d40486f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -848,6 +848,8 @@ in {
phonopy = callPackage ../development/python-modules/phonopy { };
+ phik = callPackage ../development/python-modules/phik {};
+
piccata = callPackage ../development/python-modules/piccata {};
pims = callPackage ../development/python-modules/pims { };
@@ -4324,7 +4326,8 @@ in {
ppft = callPackage ../development/python-modules/ppft { };
- praw = callPackage ../development/python-modules/praw { };
+ praw = if isPy3k then callPackage ../development/python-modules/praw { }
+ else callPackage ../development/python-modules/praw/6.3.nix { };
prawcore = callPackage ../development/python-modules/prawcore { };
@@ -6338,6 +6341,9 @@ in {
pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { };
hcloud = callPackage ../development/python-modules/hcloud { };
+
+ managesieve = callPackage ../development/python-modules/managesieve { };
+
});
in fix' (extends overrides packages)