diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 0cd3c3f4f2f0..db5d2d44e1b0 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -131,6 +131,14 @@
services.dragonflydb.
+
+
+ HBase
+ cluster, a distributed, scalable, big data store.
+ Available as
+ services.hadoop.hbase.
+
+
infnoise,
@@ -257,6 +265,14 @@
with Google Chrome and the Google Cast extension.
+
+
+ services.hbase has been renamed to
+ services.hbase-standalone. For production
+ HBase clusters, use services.hadoop.hbase
+ instead.
+
+
PHP 7.4 is no longer supported due to upstream not supporting
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 617096a9fcf3..37d53841b76b 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -58,6 +58,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable).
+- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable).
+
- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle.
Available as [services.infnoise](options.html#opt-services.infnoise.enable).
@@ -100,6 +102,9 @@ In addition to numerous new and upgraded packages, this release has the followin
as it requires `qt4`, which reached its end-of-life 2015 and will no longer be supported by nixpkgs.
[According to Barco](https://www.barco.com/de/support/knowledge-base/4380-can-i-use-linux-os-with-clickshare-base-units) many of their base unit models can be used with Google Chrome and the Google Cast extension.
+- `services.hbase` has been renamed to `services.hbase-standalone`.
+ For production HBase clusters, use `services.hadoop.hbase` instead.
+
- PHP 7.4 is no longer supported due to upstream not supporting this
version for the entire lifecycle of the 22.11 release.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2ae463190fb5..2c3e40ec465a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -357,7 +357,7 @@
./services/databases/dgraph.nix
./services/databases/firebird.nix
./services/databases/foundationdb.nix
- ./services/databases/hbase.nix
+ ./services/databases/hbase-standalone.nix
./services/databases/influxdb.nix
./services/databases/influxdb2.nix
./services/databases/memcached.nix
diff --git a/nixos/modules/services/cluster/hadoop/conf.nix b/nixos/modules/services/cluster/hadoop/conf.nix
index e3c26a0d5505..388eaafcc362 100644
--- a/nixos/modules/services/cluster/hadoop/conf.nix
+++ b/nixos/modules/services/cluster/hadoop/conf.nix
@@ -33,6 +33,7 @@ pkgs.runCommand "hadoop-conf" {} (with cfg; ''
mkdir -p $out/
cp ${siteXml "core-site.xml" (coreSite // coreSiteInternal)}/* $out/
cp ${siteXml "hdfs-site.xml" (hdfsSiteDefault // hdfsSite // hdfsSiteInternal)}/* $out/
+ cp ${siteXml "hbase-site.xml" (hbaseSiteDefault // hbaseSite // hbaseSiteInternal)}/* $out/
cp ${siteXml "mapred-site.xml" (mapredSiteDefault // mapredSite)}/* $out/
cp ${siteXml "yarn-site.xml" (yarnSiteDefault // yarnSite // yarnSiteInternal)}/* $out/
cp ${siteXml "httpfs-site.xml" httpfsSite}/* $out/
@@ -40,5 +41,5 @@ pkgs.runCommand "hadoop-conf" {} (with cfg; ''
cp ${pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions}/* $out/
cp ${pkgs.writeTextDir "hadoop-env.sh" hadoopEnv}/* $out/
cp ${log4jProperties} $out/log4j.properties
- ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") extraConfDirs}
+ ${lib.concatMapStringsSep "\n" (dir: "cp -f -r ${dir}/* $out/") extraConfDirs}
'')
diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix
index a4fdea81037c..a3a28eb7184a 100644
--- a/nixos/modules/services/cluster/hadoop/default.nix
+++ b/nixos/modules/services/cluster/hadoop/default.nix
@@ -5,7 +5,7 @@ let
in
with lib;
{
- imports = [ ./yarn.nix ./hdfs.nix ];
+ imports = [ ./yarn.nix ./hdfs.nix ./hbase.nix ];
options.services.hadoop = {
coreSite = mkOption {
diff --git a/nixos/modules/services/cluster/hadoop/hbase.nix b/nixos/modules/services/cluster/hadoop/hbase.nix
new file mode 100644
index 000000000000..246775dc8987
--- /dev/null
+++ b/nixos/modules/services/cluster/hadoop/hbase.nix
@@ -0,0 +1,196 @@
+{ config, lib, pkgs, ...}:
+
+with lib;
+let
+ cfg = config.services.hadoop;
+ hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/";
+ mkIfNotNull = x: mkIf (x != null) x;
+in
+{
+ options.services.hadoop = {
+
+ gatewayRole.enableHbaseCli = mkEnableOption "HBase CLI tools";
+
+ hbaseSiteDefault = mkOption {
+ default = {
+ "hbase.regionserver.ipc.address" = "0.0.0.0";
+ "hbase.master.ipc.address" = "0.0.0.0";
+ "hbase.master.info.bindAddress" = "0.0.0.0";
+ "hbase.regionserver.info.bindAddress" = "0.0.0.0";
+
+ "hbase.cluster.distributed" = "true";
+ };
+ type = types.attrsOf types.anything;
+ description = ''
+ Default options for hbase-site.xml
+ '';
+ };
+ hbaseSite = mkOption {
+ default = {};
+ type = with types; attrsOf anything;
+ example = literalExpression ''
+ '';
+ description = ''
+ Additional options and overrides for hbase-site.xml
+
+ '';
+ };
+ hbaseSiteInternal = mkOption {
+ default = {};
+ type = with types; attrsOf anything;
+ internal = true;
+ description = ''
+ Internal option to add configs to hbase-site.xml based on module options
+ '';
+ };
+
+ hbase = {
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.hbase;
+ defaultText = literalExpression "pkgs.hbase";
+ description = "HBase package";
+ };
+
+ rootdir = mkOption {
+ description = ''
+ This option will set "hbase.rootdir" in hbase-site.xml and determine
+ the directory shared by region servers and into which HBase persists.
+ The URL should be 'fully-qualified' to include the filesystem scheme.
+ If a core-site.xml is provided, the FS scheme defaults to the value
+ of "fs.defaultFS".
+
+ Filesystems other than HDFS (like S3, QFS, Swift) are also supported.
+ '';
+ type = types.str;
+ example = "hdfs://nameservice1/hbase";
+ default = "/hbase";
+ };
+ zookeeperQuorum = mkOption {
+ description = ''
+ This option will set "hbase.zookeeper.quorum" in hbase-site.xml.
+ Comma separated list of servers in the ZooKeeper ensemble.
+ '';
+ type = with types; nullOr commas;
+ example = "zk1.internal,zk2.internal,zk3.internal";
+ default = null;
+ };
+ master = {
+ enable = mkEnableOption "HBase Master";
+ initHDFS = mkEnableOption "initialization of the hbase directory on HDFS";
+
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Open firewall ports for HBase master.
+ '';
+ };
+ };
+ regionServer = {
+ enable = mkEnableOption "HBase RegionServer";
+
+ overrideHosts = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix
+ Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records
+ or /etc/hosts entries.
+
+ '';
+ };
+
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Open firewall ports for HBase master.
+ '';
+ };
+ };
+ };
+ };
+
+ config = mkMerge [
+ (mkIf cfg.hbase.master.enable {
+ services.hadoop.gatewayRole = {
+ enable = true;
+ enableHbaseCli = mkDefault true;
+ };
+
+ systemd.services.hbase-master = {
+ description = "HBase master";
+ wantedBy = [ "multi-user.target" ];
+
+ preStart = mkIf cfg.hbase.master.initHDFS ''
+ HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfsadmin -safemode wait
+ HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -mkdir -p ${cfg.hbase.rootdir}
+ HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -chown hbase ${cfg.hbase.rootdir}
+ '';
+
+ serviceConfig = {
+ User = "hbase";
+ SyslogIdentifier = "hbase-master";
+ ExecStart = "${cfg.hbase.package}/bin/hbase --config ${hadoopConf} " +
+ "master start";
+ Restart = "always";
+ };
+ };
+
+ services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir;
+
+ networking.firewall.allowedTCPPorts = (mkIf cfg.hbase.master.openFirewall [
+ 16000 16010
+ ]);
+
+ })
+
+ (mkIf cfg.hbase.regionServer.enable {
+ services.hadoop.gatewayRole = {
+ enable = true;
+ enableHbaseCli = mkDefault true;
+ };
+
+ systemd.services.hbase-regionserver = {
+ description = "HBase RegionServer";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ User = "hbase";
+ SyslogIdentifier = "hbase-regionserver";
+ ExecStart = "${cfg.hbase.package}/bin/hbase --config /etc/hadoop-conf/ " +
+ "regionserver start";
+ Restart = "always";
+ };
+ };
+
+ services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir;
+
+ networking = {
+ firewall.allowedTCPPorts = (mkIf cfg.hbase.regionServer.openFirewall [
+ 16020 16030
+ ]);
+ hosts = mkIf cfg.hbase.regionServer.overrideHosts {
+ "127.0.0.2" = mkForce [ ];
+ "::1" = mkForce [ ];
+ };
+ };
+ })
+
+ (mkIf cfg.gatewayRole.enable {
+
+ environment.systemPackages = mkIf cfg.gatewayRole.enableHbaseCli [ cfg.hbase.package ];
+
+ services.hadoop.hbaseSiteInternal = with cfg.hbase; {
+ "hbase.zookeeper.quorum" = mkIfNotNull zookeeperQuorum;
+ };
+
+ users.users.hbase = {
+ description = "Hadoop HBase user";
+ group = "hadoop";
+ isSystemUser = true;
+ };
+ })
+ ];
+}
diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix
index 6c185b9cd245..75a97e535479 100644
--- a/nixos/modules/services/cluster/hadoop/hdfs.nix
+++ b/nixos/modules/services/cluster/hadoop/hdfs.nix
@@ -158,8 +158,8 @@ in
50010 # datanode.address
50020 # datanode.ipc.address
];
- extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = let d = cfg.hdfs.datanode.dataDirs; in
- if (d!= null) then (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs) else d;
+ extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = mkIf (cfg.hdfs.datanode.dataDirs!= null)
+ (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs);
})
(hadoopServiceConfig {
diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix
index 0a03fe6dab69..be0b9c13cd35 100644
--- a/nixos/modules/services/cluster/hadoop/yarn.nix
+++ b/nixos/modules/services/cluster/hadoop/yarn.nix
@@ -178,18 +178,18 @@ in
services.hadoop.gatewayRole.enable = true;
- services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; {
- "yarn.nodemanager.local-dirs" = localDir;
+ services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; mkMerge [ ({
+ "yarn.nodemanager.local-dirs" = mkIf (localDir!= null) (concatStringsSep "," localDir);
"yarn.scheduler.maximum-allocation-vcores" = resource.maximumAllocationVCores;
"yarn.scheduler.maximum-allocation-mb" = resource.maximumAllocationMB;
"yarn.nodemanager.resource.cpu-vcores" = resource.cpuVCores;
"yarn.nodemanager.resource.memory-mb" = resource.memoryMB;
- } // mkIf useCGroups {
+ }) (mkIf useCGroups {
"yarn.nodemanager.linux-container-executor.cgroups.hierarchy" = "/hadoop-yarn";
"yarn.nodemanager.linux-container-executor.resources-handler.class" = "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler";
"yarn.nodemanager.linux-container-executor.cgroups.mount" = "true";
"yarn.nodemanager.linux-container-executor.cgroups.mount-path" = "/run/wrappers/yarn-nodemanager/cgroup";
- };
+ })];
networking.firewall.allowedTCPPortRanges = [
(mkIf (cfg.yarn.nodemanager.openFirewall) {from = 1024; to = 65535;})
diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase-standalone.nix
similarity index 88%
rename from nixos/modules/services/databases/hbase.nix
rename to nixos/modules/services/databases/hbase-standalone.nix
index 5cc5d97e7984..ca891fe8a5cd 100644
--- a/nixos/modules/services/databases/hbase.nix
+++ b/nixos/modules/services/databases/hbase-standalone.nix
@@ -3,8 +3,8 @@
with lib;
let
- cfg = config.services.hbase;
- opt = options.services.hbase;
+ cfg = config.services.hbase-standalone;
+ opt = options.services.hbase-standalone;
buildProperty = configAttr:
(builtins.concatStringsSep "\n"
@@ -32,19 +32,19 @@ let
in {
+ imports = [
+ (mkRenamedOptionModule [ "services" "hbase" ] [ "services" "hbase-standalone" ])
+ ];
+
###### interface
options = {
+ services.hbase-standalone = {
- services.hbase = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = lib.mdDoc ''
- Whether to run HBase.
- '';
- };
+ enable = mkEnableOption ''
+ HBase master in standalone mode with embedded regionserver and zookeper.
+ Do not use this configuration for production nor for evaluating HBase performance.
+ '';
package = mkOption {
type = types.package;
@@ -108,12 +108,11 @@ in {
};
};
-
};
###### implementation
- config = mkIf config.services.hbase.enable {
+ config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"
diff --git a/nixos/tests/hadoop/default.nix b/nixos/tests/hadoop/default.nix
index d2a97cbeffb8..479690adc064 100644
--- a/nixos/tests/hadoop/default.nix
+++ b/nixos/tests/hadoop/default.nix
@@ -4,4 +4,5 @@
all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop.nix { inherit package; };
hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hdfs.nix { inherit package; };
yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./yarn.nix { inherit package; };
+ hbase = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hbase.nix { inherit package; };
}
diff --git a/nixos/tests/hadoop/hbase.nix b/nixos/tests/hadoop/hbase.nix
new file mode 100644
index 000000000000..d9d2dac0f658
--- /dev/null
+++ b/nixos/tests/hadoop/hbase.nix
@@ -0,0 +1,84 @@
+# Test a minimal hbase cluster
+{ pkgs, ... }:
+import ../make-test-python.nix ({ hadoop ? pkgs.hadoop, hbase ? pkgs.hbase, ... }:
+with pkgs.lib;
+{
+ name = "hadoop-hbase";
+
+ nodes = let
+ coreSite = {
+ "fs.defaultFS" = "hdfs://namenode:8020";
+ };
+ defOpts = {
+ enable = true;
+ openFirewall = true;
+ };
+ zookeeperQuorum = "zookeeper";
+ in {
+ zookeeper = { ... }: {
+ services.zookeeper.enable = true;
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ namenode = { ... }: {
+ services.hadoop = {
+ hdfs = {
+ namenode = defOpts // { formatOnInit = true; };
+ };
+ inherit coreSite;
+ };
+ };
+ datanode = { ... }: {
+ virtualisation.diskSize = 8192;
+ services.hadoop = {
+ hdfs.datanode = defOpts;
+ inherit coreSite;
+ };
+ };
+
+ master = { ... }:{
+ services.hadoop = {
+ inherit coreSite;
+ hbase = {
+ inherit zookeeperQuorum;
+ master = defOpts // { initHDFS = true; };
+ };
+ };
+ };
+ regionserver = { ... }:{
+ services.hadoop = {
+ inherit coreSite;
+ hbase = {
+ inherit zookeeperQuorum;
+ regionServer = defOpts;
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ # wait for HDFS cluster
+ namenode.wait_for_unit("hdfs-namenode")
+ namenode.wait_for_unit("network.target")
+ namenode.wait_for_open_port(8020)
+ namenode.wait_for_open_port(9870)
+ datanode.wait_for_unit("hdfs-datanode")
+ datanode.wait_for_unit("network.target")
+ datanode.wait_for_open_port(9864)
+ datanode.wait_for_open_port(9866)
+ datanode.wait_for_open_port(9867)
+
+ # wait for ZK
+ zookeeper.wait_for_unit("zookeeper")
+ zookeeper.wait_for_open_port(2181)
+
+ # wait for HBase to start up
+ master.wait_for_unit("hbase-master")
+ regionserver.wait_for_unit("hbase-regionserver")
+
+ assert "1 active master, 0 backup masters, 1 servers" in master.succeed("echo status | HADOOP_USER_NAME=hbase hbase shell -n")
+ regionserver.wait_until_succeeds("echo \"create 't1','f1'\" | HADOOP_USER_NAME=hbase hbase shell -n")
+ assert "NAME => 'f1'" in regionserver.succeed("echo \"describe 't1'\" | HADOOP_USER_NAME=hbase hbase shell -n")
+ '';
+})
diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix
index 1bf8e3831f67..08c8ff857d8c 100644
--- a/nixos/tests/hadoop/yarn.nix
+++ b/nixos/tests/hadoop/yarn.nix
@@ -19,7 +19,7 @@ import ../make-test-python.nix ({ package, ... }: {
enable = true;
openFirewall = true;
};
- yarnSite = options.services.hadoop.yarnSite.default // {
+ yarnSite = {
"yarn.resourcemanager.hostname" = "resourcemanager";
"yarn.nodemanager.log-dirs" = "/tmp/userlogs";
};
diff --git a/nixos/tests/hbase.nix b/nixos/tests/hbase.nix
index a449d24dd6fd..7d8e32f81603 100644
--- a/nixos/tests/hbase.nix
+++ b/nixos/tests/hbase.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.hbase, ... }:
{
- name = "hbase";
+ name = "hbase-standalone";
meta = with lib.maintainers; {
maintainers = [ illustris ];
@@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.hbase, ... }:
nodes = {
hbase = { pkgs, ... }: {
- services.hbase = {
+ services.hbase-standalone = {
enable = true;
inherit package;
# Needed for standalone mode in hbase 2+
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 37bb05d90387..b4961384080e 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "kid3";
- version = "3.9.1";
+ version = "3.9.2";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-N/HDwfJn7Py4y/GZcIDbeoMEqG+SuRGO23ITZMot8cc=";
+ sha256 = "sha256-R4Xv+PmzKZQF1tFtSQTFjaisGug2EKM6mPVoGutNnok=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/nsxiv/default.nix b/pkgs/applications/graphics/nsxiv/default.nix
index c1ebbd57c0d6..019aaf86dc3b 100644
--- a/pkgs/applications/graphics/nsxiv/default.nix
+++ b/pkgs/applications/graphics/nsxiv/default.nix
@@ -1,43 +1,58 @@
{ lib
, stdenv
-, fetchFromGitHub
+, fetchFromGitea
+, fetchpatch
, giflib
, imlib2
, libXft
, libexif
, libwebp
+, libinotify-kqueue
, conf ? null
}:
stdenv.mkDerivation rec {
pname = "nsxiv";
- version = "29";
+ version = "30";
- src = fetchFromGitHub {
+ src = fetchFromGitea {
+ domain = "codeberg.org";
owner = "nsxiv";
- repo = pname;
+ repo = "nsxiv";
rev = "v${version}";
- hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE=";
+ hash = "sha256-swzTdQ6ow1At4bKRORqz6fb0Ej92yU9rlI/OgcinPu4=";
};
+ patches = [
+ # Fix build failure when _SC_PHYS_PAGES is not defined
+ (fetchpatch {
+ url = "https://codeberg.org/nsxiv/nsxiv/commit/1a50bff9f300f84e93a6e7035657e6029e7e8183.patch";
+ hash = "sha256-PpUqGVWaJ06EVu3tBKVzOh8HYvT6wAG3bvY6wUD+dTM=";
+ })
+ ];
+
buildInputs = [
giflib
imlib2
libXft
libexif
libwebp
- ];
+ ] ++ lib.optional stdenv.isDarwin libinotify-kqueue;
preBuild = lib.optionalString (conf!=null) ''
cp ${(builtins.toFile "config.def.h" conf)} config.def.h
'';
- makeFlags = [
- "PREFIX=${placeholder "out"}"
- ];
+ NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify";
+
+ makeFlags = [ "CC:=$(CC)" ];
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ installTargets = [ "install-all" ];
meta = with lib; {
- homepage = "https://nsxiv.github.io/nsxiv/";
+ homepage = "https://nsxiv.codeberg.page/";
description = "New Suckless X Image Viewer";
longDescription = ''
nsxiv is a fork of now unmaintained sxiv with the purpose of being a
@@ -54,8 +69,7 @@ stdenv.mkDerivation rec {
- Display image name/path in X title
'';
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ AndersonTorres ];
+ maintainers = with maintainers; [ AndersonTorres sikmir ];
platforms = platforms.unix;
- broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 1b8cba11c7ba..1d9b10bfc39b 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -26,13 +26,13 @@ with lib;
assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
let
- common = { pname, versions, untarDir ? "${pname}-${version}", hash, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }:
+ common = { pname, platformAttrs, untarDir ? "${pname}-${version}", jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }:
stdenv.mkDerivation rec {
inherit pname jdk libPatches untarDir openssl;
- version = versions.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
+ version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}");
src = fetchurl {
url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz";
- hash = hash.${stdenv.system};
+ inherit (platformAttrs.${stdenv.system}) hash;
};
doCheck = true;
@@ -51,7 +51,8 @@ let
makeWrapper "$n" "$out/bin/$(basename $n)"\
--set-default JAVA_HOME ${jdk.home}\
--set-default HADOOP_HOME $out/lib/${untarDir}\
- --set-default HADOOP_CONF_DIR /etc/hadoop-conf/\
+ --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\
+ --set-default HADOOP_CONF_DIR $out/lib/${untarDir}/etc/hadoop/\
--prefix PATH : "${makeBinPath [ bash coreutils which]}"\
--prefix JAVA_LIBRARY_PATH : "${makeLibraryPath buildInputs}"
done
@@ -62,7 +63,7 @@ let
passthru = { inherit tests; };
- meta = {
+ meta = recursiveUpdate {
homepage = "https://hadoop.apache.org/";
description = "Framework for distributed processing of large data sets across clusters of computers";
license = licenses.asl20;
@@ -80,8 +81,8 @@ let
computers, each of which may be prone to failures.
'';
maintainers = with maintainers; [ illustris ];
- platforms = attrNames hash;
- };
+ platforms = attrNames platformAttrs;
+ } (attrByPath [ stdenv.system "meta" ] {} platformAttrs);
};
in
{
@@ -89,19 +90,20 @@ in
# https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions
hadoop_3_3 = common rec {
pname = "hadoop";
- versions = rec {
- x86_64-linux = "3.3.3";
- x86_64-darwin = x86_64-linux;
- aarch64-linux = "3.3.1";
- aarch64-darwin = aarch64-linux;
- };
- untarDir = "${pname}-${version}";
- hash = rec {
- x86_64-linux = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q=";
- x86_64-darwin = x86_64-linux;
- aarch64-linux = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI=";
- aarch64-darwin = aarch64-linux;
+ platformAttrs = rec {
+ x86_64-linux = {
+ version = "3.3.3";
+ hash = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q=";
+ };
+ x86_64-darwin = x86_64-linux;
+ aarch64-linux = {
+ version = "3.3.1";
+ hash = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI=";
+ meta.knownVulnerabilities = [ "CVE-2021-37404" "CVE-2021-33036" ];
+ };
+ aarch64-darwin = aarch64-linux;
};
+ untarDir = "${pname}-${platformAttrs.${stdenv.system}.version}";
jdk = jdk11_headless;
inherit openssl;
# TODO: Package and add Intel Storage Acceleration Library
@@ -122,8 +124,10 @@ in
};
hadoop_3_2 = common rec {
pname = "hadoop";
- versions.x86_64-linux = "3.2.3";
- hash.x86_64-linux = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU=";
+ platformAttrs.x86_64-linux = {
+ version = "3.2.3";
+ hash = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU=";
+ };
jdk = jdk8_headless;
# not using native libs because of broken openssl_1_0_2 dependency
# can be manually overriden
@@ -131,8 +135,10 @@ in
};
hadoop2 = common rec {
pname = "hadoop";
- versions.x86_64-linux = "2.10.2";
- hash.x86_64-linux = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo=";
+ platformAttrs.x86_64-linux = {
+ version = "2.10.2";
+ hash = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo=";
+ };
jdk = jdk8_headless;
tests = nixosTests.hadoop2;
};
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
index 09de0219c7e8..64fa0f35e543 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm-diff";
- version = "3.1.3";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "databus23";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-h26EOjKNrlcrs2DAYj0NmDRgNRKozjfw5DtxUgHNTa4=";
+ sha256 = "sha256-evFdMM2AilKQPdSCUzKo6RuC4OC4zfjj+JzFvtkSrdk=";
};
- vendorSha256 = "sha256-+n/QBuZqtdgUkaBG7iqSuBfljn+AdEzDoIo5SI8ErQA=";
+ vendorSha256 = "sha256-9i4ryBpaK7mMbsOpIaaZWBRjewD1MtTpf4zJ0yU0KMg=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''
@@ -27,7 +27,7 @@ buildGoModule rec {
meta = with lib; {
description = "A Helm plugin that shows a diff";
- inherit (src.meta) homepage;
+ homepage = "https://github.com/databus23/helm-diff";
license = licenses.asl20;
maintainers = with maintainers; [ yurrriq ];
};
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
index 05ded10444ba..d72b152cc5bf 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The Helm downloader plugin that provides GIT protocol support";
- inherit (src.meta) homepage;
+ homepage = "https://github.com/aslafy-z/helm-git";
license = licenses.mit;
maintainers = with maintainers; [ flokli ];
};
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
index b6a47ec9dd5c..bbfff3fd5f34 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
meta = with lib; {
description = "A Helm plugin that shows a diff";
- inherit (src.meta) homepage;
+ homepage = "https://github.com/hypnoglow/helm-s3";
license = licenses.mit;
maintainers = with maintainers; [ yurrriq ];
};
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index a16472413f31..7d9135045f17 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A Helm plugin that helps manage secrets";
- inherit (src.meta) homepage;
+ homepage = "https://github.com/jkroepke/helm-secrets";
license = licenses.asl20;
maintainers = with maintainers; [ yurrriq ];
- platforms = platforms.all;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 40e49ff3296a..7ac58abd530c 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "filezilla";
- version = "3.60.1";
+ version = "3.60.2";
src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
- hash = "sha256-gflsY2OMrxg44MY+WHT2AZISCWXYJSlKiUoit9QgZq8=";
+ hash = "sha256-5AfbrRaZU/+VFFK8vxONlTo6MCNfirsD0nHHEsx+V5I=";
};
configureFlags = [
diff --git a/pkgs/applications/networking/gopher/geomyidae/default.nix b/pkgs/applications/networking/gopher/geomyidae/default.nix
index c9aa26ad9874..197cdaca00c4 100644
--- a/pkgs/applications/networking/gopher/geomyidae/default.nix
+++ b/pkgs/applications/networking/gopher/geomyidae/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "geomyidae";
- version = "0.50.1";
+ version = "0.51";
src = fetchurl {
url = "gopher://bitreich.org/9/scm/geomyidae/tag/geomyidae-v${version}.tar.gz";
- sha512 = "2a71b12f51c2ef8d6e791089f9eea49eb90a36be45b874d4234eba1e673186be945711be1f92508190f5c0a6f502f132c4b7cb82caf805a39a3f31903032ac47";
+ sha512 = "3lGAa7BCrspGBcQqjduBkIACpf3u/CkeSCBnaJ3rrz3OIidn4o4dNwZNe7u8swaJxN2dhDSKKeVT3RnFQUaXdg==";
};
buildInputs = [ libressl ];
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 980ff7e9b548..df97777409cd 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -1,6 +1,7 @@
{ lib
, copyDesktopItems
, electron_18
+, buildGoModule
, esbuild
, fetchFromGitHub
, libdeltachat
@@ -35,15 +36,18 @@ let
"${electron_18}/Applications/Electron.app/Contents/MacOS/Electron"
else
"${electron_18}/bin/electron";
- esbuild' = esbuild.overrideAttrs (old: rec {
- version = "0.12.29";
- src = fetchFromGitHub {
- owner = "evanw";
- repo = "esbuild";
- rev = "v${version}";
- hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg=";
- };
- });
+ esbuild' = esbuild.override {
+ buildGoModule = args: buildGoModule (args // rec {
+ version = "0.12.29";
+ src = fetchFromGitHub {
+ owner = "evanw";
+ repo = "esbuild";
+ rev = "v${version}";
+ hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg=";
+ };
+ vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
+ });
+ };
in nodePackages.deltachat-desktop.override rec {
pname = "deltachat-desktop";
version = "1.30.1";
diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/applications/window-managers/fvwm/2.6.nix
index 2cecb81ea04b..44dde60ac05d 100644
--- a/pkgs/applications/window-managers/fvwm/2.6.nix
+++ b/pkgs/applications/window-managers/fvwm/2.6.nix
@@ -17,6 +17,7 @@
, libxslt
, perl
, pkg-config
+, python3Packages
, readline
, enableGestures ? false
}:
@@ -32,7 +33,11 @@ stdenv.mkDerivation rec {
hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI=";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ python3Packages.wrapPython
+ ];
buildInputs = [
cairo
@@ -48,14 +53,25 @@ stdenv.mkDerivation rec {
librsvg
libxslt
perl
+ python3Packages.python
readline
] ++ lib.optional enableGestures libstroke;
+ pythonPath = [
+ python3Packages.pyxdg
+ ];
+
configureFlags = [
"--enable-mandoc"
"--disable-htmldoc"
];
+ postFixup = ''
+ wrapPythonPrograms
+ '';
+
+ enableParallelBuilding = true;
+
meta = with lib; {
homepage = "http://fvwm.org";
description = "A multiple large virtual desktop window manager";
diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix
index f3862f9ac0d8..e68f93bf836c 100644
--- a/pkgs/applications/window-managers/fvwm/3.nix
+++ b/pkgs/applications/window-managers/fvwm/3.nix
@@ -25,7 +25,7 @@
, libxslt
, perl
, pkg-config
-, python3
+, python3Packages
, readline
, sharutils
}:
@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
autoreconfHook
asciidoctor
pkg-config
+ python3Packages.wrapPython
];
buildInputs = [
@@ -69,15 +70,25 @@ stdenv.mkDerivation (finalAttrs: {
libstroke
libxslt
perl
- python3
+ python3Packages.python
readline
sharutils
];
+ pythonPath = [
+ python3Packages.pyxdg
+ ];
+
configureFlags = [
"--enable-mandoc"
];
+ postFixup = ''
+ wrapPythonPrograms
+ '';
+
+ enableParallelBuilding = true;
+
meta = with lib; {
homepage = "http://fvwm.org";
description = "A multiple large virtual desktop window manager - Version 3";
diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix
index e2db700494e9..69e5779d8f0d 100644
--- a/pkgs/development/compilers/go/1.17.nix
+++ b/pkgs/development/compilers/go/1.17.nix
@@ -25,7 +25,7 @@
assert threadsCross != null -> stdenv.targetPlatform.isWindows;
let
- go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
+ go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { };
goBootstrap = runCommand "go-bootstrap" { } ''
mkdir $out
diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix
index d36cbc5e3c29..bcc97acd3633 100644
--- a/pkgs/development/compilers/go/1.18.nix
+++ b/pkgs/development/compilers/go/1.18.nix
@@ -25,7 +25,7 @@
assert threadsCross != null -> stdenv.targetPlatform.isWindows;
let
- go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
+ go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { };
goBootstrap = runCommand "go-bootstrap" { } ''
mkdir $out
diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix
index 1df70649f43d..fc2855251e03 100644
--- a/pkgs/development/compilers/go/1.19.nix
+++ b/pkgs/development/compilers/go/1.19.nix
@@ -25,7 +25,7 @@
assert threadsCross != null -> stdenv.targetPlatform.isWindows;
let
- go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
+ go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { };
goBootstrap = runCommand "go-bootstrap" { } ''
mkdir $out
diff --git a/pkgs/development/compilers/go/bootstrap.nix b/pkgs/development/compilers/go/bootstrap116.nix
similarity index 100%
rename from pkgs/development/compilers/go/bootstrap.nix
rename to pkgs/development/compilers/go/bootstrap116.nix
diff --git a/pkgs/development/compilers/go/bootstrap117.nix b/pkgs/development/compilers/go/bootstrap117.nix
new file mode 100644
index 000000000000..3afa2ba9a10f
--- /dev/null
+++ b/pkgs/development/compilers/go/bootstrap117.nix
@@ -0,0 +1,15 @@
+{ callPackage }:
+callPackage ./binary.nix {
+ version = "1.17.13";
+ hashes = {
+ # Use `print-hashes.sh ${version}` to generate the list below
+ darwin-amd64 = "c101beaa232e0f448fab692dc036cd6b4677091ff89c4889cc8754b1b29c6608";
+ darwin-arm64 = "e4ccc9c082d91eaa0b866078b591fc97d24b91495f12deb3dd2d8eda4e55a6ea";
+ linux-386 = "5e02f35aecc6b89679f631e0edf12c49922dd31c8140cf8dd725c5797a9f2425";
+ linux-amd64 = "4cdd2bc664724dc7db94ad51b503512c5ae7220951cac568120f64f8e94399fc";
+ linux-arm64 = "914daad3f011cc2014dea799bb7490442677e4ad6de0b2ac3ded6cee7e3f493d";
+ linux-armv6l = "260431d7deeb8893c21e71fcbbb1fde3258616d8eba584c8d72060228ab42c86";
+ linux-ppc64le = "bd0763fb130f8412672ffe1e4a8e65888ebe2419e5caa9a67ac21e8c298aa254";
+ linux-s390x = "08f6074e1e106cbe5d78622357db71a93648c7a4c4e4b02e3b5f2a1828914c76";
+ };
+}
diff --git a/pkgs/development/compilers/go/print-hashes.sh b/pkgs/development/compilers/go/print-hashes.sh
index f095b67c627b..ed3e62b941b8 100755
--- a/pkgs/development/compilers/go/print-hashes.sh
+++ b/pkgs/development/compilers/go/print-hashes.sh
@@ -1,15 +1,16 @@
-#!/usr/bin/env bash
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq
+# shellcheck shell=bash
set -euo pipefail
BASEURL=https://go.dev/dl/
VERSION=${1:-}
-if [[ -z $VERSION ]]
-then
- echo "No version supplied"
- exit -1
+if [[ -z ${VERSION} ]]; then
+ echo "No version supplied"
+ exit 1
fi
-curl -s "${BASEURL}?mode=json&include=all" | \
- jq '.[] | select(.version == "go'${VERSION}'")' | \
- jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")'
+curl -s "${BASEURL}?mode=json&include=all" |
+ jq '.[] | select(.version == "go'"${VERSION}"'")' |
+ jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")'
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 13e23b0fa4b5..6fc48c2d4e44 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ stdenv.cc.cc ];
meta = with lib; {
- homepage = "https://www.exiv2.org/";
+ homepage = "https://exiv2.org";
description = "A library and command-line utility to manage image metadata";
platforms = platforms.all;
license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix
index 1c5acd2a1401..6bf670a40382 100644
--- a/pkgs/development/libraries/libiptcdata/default.nix
+++ b/pkgs/development/libraries/libiptcdata/default.nix
@@ -1,23 +1,42 @@
-{ lib, stdenv, fetchurl, libiconv }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, libiconv
+, libintl
+}:
stdenv.mkDerivation rec {
pname = "libiptcdata";
- version = "1.0.4";
+ version = "1.0.5";
+
+ src = fetchFromGitHub {
+ owner = "ianw";
+ repo = pname;
+ rev = "release_${builtins.replaceStrings ["."] ["_"] version}";
+ sha256 = "sha256-ZjokepDAHiSEwXrkvM9qUAPcpIiRQoOsv7REle7roPU=";
+ };
+
+ postPatch = ''
+ # gtk-doc doesn't build without network access
+ sed -i '/GTK_DOC_CHECK/d;/docs/d' configure.ac
+ sed -i 's/docs//' Makefile.am
+ '';
+
+ nativeBuildInputs = [
+ autoreconfHook
+ ];
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
+ libintl
];
- src = fetchurl {
- url = "mirror://sourceforge/libiptcdata/${pname}-${version}.tar.gz";
- sha256 = "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr";
- };
-
- meta = {
+ meta = with lib; {
description = "Library for reading and writing the IPTC metadata in images and other files";
- homepage = "http://libiptcdata.sourceforge.net/";
- license = lib.licenses.gpl2Plus;
- platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [ wegank ];
+ homepage = "https://github.com/ianw/libiptcdata";
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ wegank ];
};
}
diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix
index 9abe32241207..3ad5c16d352d 100644
--- a/pkgs/development/libraries/libpulsar/default.nix
+++ b/pkgs/development/libraries/libpulsar/default.nix
@@ -51,10 +51,10 @@ let
in
stdenv.mkDerivation rec {
pname = "libpulsar";
- version = "2.9.1";
+ version = "2.10.1";
src = fetchurl {
- hash = "sha512-NKHiL7D/Lmnn6ICpQyUmmQYQETz4nZPJU9/4LMRDUQ3Pck6qDh+t6CRk+b9UQ2Vb0jvPIGTjEsSp2nC7TJk3ug==";
+ hash = "sha256-qMj76jnxRH68DE6JkZjQrLSNzgXGnO7HjPjlaFavaUY=";
url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz";
};
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index ed2819e88c17..64746d84572a 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -9,10 +9,10 @@
stdenv.mkDerivation rec {
pname = "tachyon";
- version = "0.99.4";
+ version = "0.99.5";
src = fetchurl {
url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-vJvDHhLDp5rpH9KhXUtQaqfjyai0e3NMKOEkbhYuaA0=";
+ sha256 = "sha256-CSA8ECMRFJ9d9cw2dAn5bHJXQmZtGcJNtbqZTVqBpvU=";
};
buildInputs = lib.optionals stdenv.isDarwin [
Carbon
diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix
index 1e2eea7ac899..c576405bb3b6 100644
--- a/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/pkgs/development/libraries/tinyxml-2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A simple, small, efficient, C++ XML parser";
- homepage = "http://www.grinninglizard.com/tinyxml2/index.html";
+ homepage = "https://www.grinninglizard.com/tinyxml2/index.html";
platforms = lib.platforms.unix;
license = lib.licenses.zlib;
};
diff --git a/pkgs/development/nim-packages/flatty/default.nix b/pkgs/development/nim-packages/flatty/default.nix
index 5e542d22e4a5..31abbfbdd21e 100644
--- a/pkgs/development/nim-packages/flatty/default.nix
+++ b/pkgs/development/nim-packages/flatty/default.nix
@@ -2,13 +2,13 @@
buildNimPackage rec {
pname = "flatty";
- version = "0.2.3";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "treeform";
repo = pname;
rev = version;
- hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA=";
+ hash = "sha256-ZmhjehmEJHm5qNlsGQvyYLajUdwhWt1+AtRppRrNtgA=";
};
doCheck = true;
diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix
new file mode 100644
index 000000000000..32a6152efc12
--- /dev/null
+++ b/pkgs/development/python-modules/aioecowitt/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, meteocalc
+, pytest-aiohttp
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "aioecowitt";
+ version = "2022.7.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.9";
+
+ src = fetchFromGitHub {
+ owner = "home-assistant-libs";
+ repo = pname;
+ rev = "refs/tags/${version}";
+ hash = "sha256-GALBhapE31CM2mqBrgcdQf5SJV+edN3kj35r0cf7BcU=";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ meteocalc
+ ];
+
+ checkInputs = [
+ pytest-aiohttp
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "aioecowitt"
+ ];
+
+ meta = with lib; {
+ description = "Wrapper for the EcoWitt protocol";
+ homepage = "https://github.com/home-assistant-libs/aioecowitt";
+ changelog = "https://github.com/home-assistant-libs/aioecowitt/releases/tag/${version}";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix
index 9e6d383db203..890c20b0d25a 100644
--- a/pkgs/development/python-modules/clustershell/default.nix
+++ b/pkgs/development/python-modules/clustershell/default.nix
@@ -1,5 +1,13 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, pyyaml, openssh
-, nose, bc, hostname, coreutils, bash, gnused
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchPypi
+, pyyaml
+, openssh
+, nose
+, bc
+, hostname
+, bash
}:
buildPythonPackage rec {
@@ -11,8 +19,6 @@ buildPythonPackage rec {
sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081";
};
- propagatedBuildInputs = [ pyyaml ];
-
postPatch = ''
substituteInPlace lib/ClusterShell/Worker/Ssh.py \
--replace '"ssh"' '"${openssh}/bin/ssh"' \
@@ -20,29 +26,40 @@ buildPythonPackage rec {
substituteInPlace lib/ClusterShell/Worker/fastsubprocess.py \
--replace '"/bin/sh"' '"${bash}/bin/sh"'
+
+ for f in tests/*; do
+ substituteInPlace $f \
+ --replace '/bin/hostname' '${hostname}/bin/hostname' \
+ --replace '/bin/sleep' 'sleep' \
+ --replace '/bin/echo' 'echo' \
+ --replace '/bin/uname' 'uname' \
+ --replace '/bin/false' 'false' \
+ --replace '/bin/true' 'true' \
+ --replace '/usr/bin/printf' 'printf'
+ done
+
+ # Fix warnings
+ substituteInPlace lib/ClusterShell/Task.py \
+ --replace "notifyAll" "notify_all"
+ substituteInPlace tests/TaskPortTest.py lib/ClusterShell/Task.py \
+ --replace "currentThread" "current_thread"
'';
- checkInputs = [ nose bc hostname coreutils gnused ];
+ propagatedBuildInputs = [ pyyaml ];
+
+ checkInputs = [
+ bc
+ hostname
+ nose
+ ];
+
+ pythonImportsCheck = [ "ClusterShell" ];
# Many tests want to open network connections
# https://github.com/cea-hpc/clustershell#test-suite
#
# Several tests fail on Darwin
checkPhase = ''
- for f in tests/*; do
- substituteInPlace $f \
- --replace '/bin/hostname' '${hostname}/bin/hostname' \
- --replace '/bin/sleep' '${coreutils}/bin/sleep' \
- --replace '"sleep' '"${coreutils}/bin/sleep' \
- --replace '/bin/echo' '${coreutils}/bin/echo' \
- --replace '/bin/uname' '${coreutils}/bin/uname' \
- --replace '/bin/false' '${coreutils}/bin/false' \
- --replace '/bin/true' '${coreutils}/bin/true' \
- --replace '/usr/bin/printf' '${coreutils}/bin/printf' \
- --replace '"sed' '"${gnused}/bin/sed' \
- --replace ' sed ' ' ${gnused}/bin/sed '
- done
-
rm tests/CLIClushTest.py
rm tests/TreeWorkerTest.py
rm tests/TaskDistantMixin.py
diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix
index 4b4397029dac..b6da5663f41a 100644
--- a/pkgs/development/python-modules/dvc-render/default.nix
+++ b/pkgs/development/python-modules/dvc-render/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "dvc-render";
- version = "0.0.8";
+ version = "0.0.9";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-pn1dmCyDxbMgXwUj9o//X3FZ/x0jz5ZKdTcEuKkeJ1s=";
+ hash = "sha256-ZUIyNg+PTj5CWC65RqB1whnB+pUp1yNJQj43iSBcyvU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -58,6 +58,6 @@ buildPythonPackage rec {
description = "Library for rendering DVC plots";
homepage = "https://github.com/iterative/dvc-render";
license = licenses.asl20;
- maintainers = with maintainers; [ fab ];
+ maintainers = with maintainers; [ fab anthonyroussel ];
};
}
diff --git a/pkgs/development/python-modules/meteocalc/default.nix b/pkgs/development/python-modules/meteocalc/default.nix
new file mode 100644
index 000000000000..6b18bba979ca
--- /dev/null
+++ b/pkgs/development/python-modules/meteocalc/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "meteocalc";
+ version = "1.1.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "malexer";
+ repo = pname;
+ rev = version;
+ hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk=";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "meteocalc"
+ ];
+
+ meta = with lib; {
+ description = "Module for calculation of meteorological variables";
+ homepage = "https://github.com/malexer/meteocalc";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
new file mode 100644
index 000000000000..7ec64df2e1b8
--- /dev/null
+++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pysigma
+, pytestCheckHook
+, pythonOlder
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "pysigma-backend-elasticsearch";
+ version = "0.1.0";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "SigmaHQ";
+ repo = "pySigma-backend-elasticsearch";
+ rev = "v${version}";
+ hash = "sha256-BEvYz0jTJifsNBrA4r16JkiFaERDj/zWKd9MbhcuCS8=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ pysigma
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ requests
+ ];
+
+ pythonImportsCheck = [
+ "sigma.backends.elasticsearch"
+ ];
+
+ disabledTests = [
+ # Tests requires network access
+ "test_connect_lucene"
+ ];
+
+ meta = with lib; {
+ description = "Library to support Elasticsearch for pySigma";
+ homepage = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch";
+ license = with licenses; [ lgpl21Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
index 50b1e40852a2..c373a2fc6776 100644
--- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-insightidr";
- version = "0.1.6";
+ version = "0.1.7";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-insightidr";
rev = "refs/tags/v${version}";
- hash = "sha256-Sg+AYoEbCmcqxw5dl8wmQcI+lFrAfFgDnQjiQh6r9Yc=";
+ hash = "sha256-5uWSXUKLSJbkJHvMmFGrS/yukBO/ax8seg+0ZqAHdaE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
new file mode 100644
index 000000000000..36e44c629855
--- /dev/null
+++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pysigma
+, pysigma-backend-elasticsearch
+, pytestCheckHook
+, pythonOlder
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "pysigma-backend-opensearch";
+ version = "0.1.2";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "SigmaHQ";
+ repo = "pySigma-backend-opensearch";
+ rev = "v${version}";
+ hash = "sha256-5+/LOi7GHu8h9WhjpZ7bBc4aM41NiXrSrdGhbXdYMvw=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ pysigma
+ pysigma-backend-elasticsearch
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ requests
+ ];
+
+ pythonImportsCheck = [
+ "sigma.backends.opensearch"
+ ];
+
+ disabledTests = [
+ # Tests requires network access
+ "test_connect_lucene"
+ ];
+
+ meta = with lib; {
+ description = "Library to support OpenSearch for pySigma";
+ homepage = "https://github.com/SigmaHQ/pySigma-backend-opensearch";
+ license = with licenses; [ lgpl21Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix
new file mode 100644
index 000000000000..348dd6991a5b
--- /dev/null
+++ b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pysigma
+, pysigma-pipeline-sysmon
+, pytestCheckHook
+, pythonOlder
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "pysigma-backend-qradar";
+ version = "0.1.9";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "nNipsx-Sec";
+ repo = "pySigma-backend-qradar";
+ rev = "v${version}";
+ hash = "sha256-b3e8cVrVFZgihhEk6QlUnRZigglczHUa/XeMvMzNYLk=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ pysigma
+ ];
+
+ checkInputs = [
+ pysigma-pipeline-sysmon
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "sigma.backends.qradar"
+ ];
+
+ meta = with lib; {
+ description = "Library to support Qradar for pySigma";
+ homepage = "https://github.com/nNipsx-Sec/pySigma-backend-qradar";
+ license = with licenses; [ lgpl21Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix
index 7f7539973ab3..b44baae526b0 100644
--- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-splunk";
- version = "0.3.5";
+ version = "0.3.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-splunk";
rev = "refs/tags/v${version}";
- hash = "sha256-W6wnxQPrtMDG5jctB7CMXr4kPIhZievFTBJCeSeDCWw=";
+ hash = "sha256-6XvKytODJll9BPeAhk6girwLibNJk+QEn2AV/WNqnyI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
index 14129f148b19..d6207f7082a2 100644
--- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
+++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysigma-pipeline-crowdstrike";
- version = "0.1.6";
+ version = "0.1.7";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-pipeline-crowdstrike";
rev = "v${version}";
- hash = "sha256-5xX7NwM+Us0ToJa2miAw9KsCt2T+TqBnqHtwphZNxJI=";
+ hash = "sha256-cALpOAn+zf1w7KYExBVFebRwNYMjiQPE7fdB1x7gHZw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
index d308d72d805f..23c9b5eef4d5 100644
--- a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
+++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysigma-pipeline-sysmon";
- version = "0.1.6";
+ version = "1.0.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-pipeline-sysmon";
rev = "v${version}";
- hash = "sha256-hKXnM3iqt6PnV+cMV3gEleBChd263sy2DovpIKg22fs=";
+ hash = "sha256-OwWUt1O8436kmuaqv8Ec6485NLkVztLjGIWF2SPRtKA=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
index 7620f84a97e5..98808b6090a2 100644
--- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
+++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysigma-pipeline-windows";
- version = "0.1.1";
+ version = "1.0.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-pipeline-windows";
rev = "refs/tags/v${version}";
- hash = "sha256-ATDWhHY9tjuQbfIFgoGhz8qsluH9hTSI9zdPmP8GPWE=";
+ hash = "sha256-/DUhgvcGhk28HRDCi96K1NH6MHNB1WogfuMVCgNbot4=";
};
nativeBuildInputs = [
@@ -29,11 +29,6 @@ buildPythonPackage rec {
pysigma
];
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace 'pysigma = "^0.5.0"' 'pysigma = "^0.6.0"'
- '';
-
checkInputs = [
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix
index a125c68dbf98..b75df650acdf 100644
--- a/pkgs/development/python-modules/pysigma/default.nix
+++ b/pkgs/development/python-modules/pysigma/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
- version = "0.6.8";
+ version = "0.7.3";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "refs/tags/v${version}";
- hash = "sha256-Jq37/9w1GHr+GZ8Fvftmfz2XkL3zUpTjbDlokrUoLtw=";
+ hash = "sha256-yXzYNBD39dPd2f5Gvmo5p0cVlTy38q1jnBL+HjAxmB8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix
index 71b8ecad8eb1..e9d504f5bc29 100644
--- a/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/pkgs/development/python-modules/regenmaschine/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "regenmaschine";
- version = "2022.07.3";
+ version = "2022.08.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-z7FrVnGQjpTjdIX/gatP/ZjzOLaj2D8XsQ+UTYBOHgE=";
+ sha256 = "sha256-JPJ+8h3r1C2fHxVPsQgk0ZuG7VqKfBb4qthAG+GCvcE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix
index 3511d16962ed..adb55bd0726d 100644
--- a/pkgs/development/python-modules/volvooncall/default.nix
+++ b/pkgs/development/python-modules/volvooncall/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "volvooncall";
- version = "0.10.0";
+ version = "0.10.1";
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "molobrakos";
repo = "volvooncall";
rev = "v${version}";
- hash = "sha256-HLSanXJs1yPSgYo4oX0zJtrV5sKkxV2yLPhc2dVRHY8=";
+ hash = "sha256-udYvgKj7Rlc/hA86bbeBfnoVRjKkXT4TwpceWz226cU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/zadnegoale/default.nix b/pkgs/development/python-modules/zadnegoale/default.nix
new file mode 100644
index 000000000000..7d47cb347c8c
--- /dev/null
+++ b/pkgs/development/python-modules/zadnegoale/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, aiohttp
+, aioresponses
+, buildPythonPackage
+, fetchFromGitHub
+, dacite
+, orjson
+, pytest-asyncio
+, pytest-error-for-skips
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "zadnegoale";
+ version = "0.6.5";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "bieniu";
+ repo = pname;
+ rev = "refs/tags/${version}";
+ hash = "sha256-ubBN4jvueNgReNbS+RXNDNHID0MF/rvQnb0+F4/DZaU=";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ dacite
+ orjson
+ ];
+
+ checkInputs = [
+ aioresponses
+ pytest-asyncio
+ pytest-error-for-skips
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "zadnegoale"
+ ];
+
+ meta = with lib; {
+ description = "Python wrapper for getting allergen concentration data from Żadnego Ale servers";
+ homepage = "https://github.com/bieniu/zadnegoale";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index d577b62a193a..5afbf979700f 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers; [ thoughtpolice AndersonTorres ];
platforms = platforms.unix;
- broken = stdenv.isAarch64; # ofborg complains
+ broken = with stdenv; isAarch64 && !isDarwin; # ofborg complains
};
passthru.tests.bmakeMusl = pkgsMusl.bmake;
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index d11576a5e01e..c03511011220 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildGoModule, fetchFromGitHub, lib, installShellFiles }:
+{ buildGoModule, fetchFromGitHub, lib, installShellFiles }:
buildGoModule rec {
pname = "golangci-lint";
- version = "1.47.3";
+ version = "1.48.0";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
- sha256 = "sha256-uY8D3VqcaLEi/QChH/kfY9SF3H2wmiScm3m6OGeWTu8=";
+ sha256 = "sha256-6nXn1+LsjiXjCeHhvVjyU1F6IJ8YP1Oj+5tDRhiMuUc=";
};
- vendorSha256 = "sha256-F7arWygCbh9Z6zemPt+0T6wWMcP2Wg5A1qC6A7mYngI=";
+ vendorSha256 = "sha256-4ZqO4NEZfIhl/hWcB0HeRbp2jQ/WhMBpTLmP2W7X7xM=";
doCheck = false;
diff --git a/pkgs/development/tools/kubectx/bump-golang-x-sys.patch b/pkgs/development/tools/kubectx/bump-golang-x-sys.patch
new file mode 100644
index 000000000000..ec838728410a
--- /dev/null
+++ b/pkgs/development/tools/kubectx/bump-golang-x-sys.patch
@@ -0,0 +1,25 @@
+diff --git a/go.mod b/go.mod
+index c523783..1ef8d00 100644
+--- a/go.mod
++++ b/go.mod
+@@ -9,6 +9,7 @@ require (
+ github.com/imdario/mergo v0.3.9 // indirect
+ github.com/mattn/go-isatty v0.0.12
+ github.com/pkg/errors v0.9.1
++ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect
+ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
+ k8s.io/apimachinery v0.21.0-alpha.1
+ k8s.io/client-go v0.21.0-alpha.1
+diff --git a/go.sum b/go.sum
+index 8f16b5a..7426c68 100644
+--- a/go.sum
++++ b/go.sum
+@@ -293,6 +293,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
+ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
+ golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80=
++golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index 1de22705ebda..dfdfebcf3eab 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -11,7 +11,11 @@ buildGoModule rec {
sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM=";
};
- vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg=";
+ patches = [
+ ./bump-golang-x-sys.patch
+ ];
+
+ vendorSha256 = "sha256-p4KUBmJw6hWG1J2qwg4QBbh6Vo1cr/HQz0IqytIDJjU=";
nativeBuildInputs = [ installShellFiles ];
@@ -24,6 +28,5 @@ buildGoModule rec {
license = licenses.asl20;
homepage = "https://github.com/ahmetb/kubectx";
maintainers = with maintainers; [ jlesquembre ];
- platforms = with platforms; unix;
};
}
diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix
index 56ef62ce1346..8ee80ec448c9 100644
--- a/pkgs/development/tools/revive/default.nix
+++ b/pkgs/development/tools/revive/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "revive";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "mgechev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xZakVuw+QKzFh6wsnZbltLEEwyb9WcMvVWEzKnS9aWc=";
+ sha256 = "sha256-kHnRzjhrUPXgDTBu95Ytrhx5lO5ogm9PMzeANfLcWHQ=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -18,7 +18,7 @@ buildGoModule rec {
rm -rf $out/.git
'';
};
- vendorSha256 = "sha256-Fpl5i+qMvJ/CDh8X0gps9C/BxF7/Uvln+3DpVOXE0WQ=";
+ vendorSha256 = "sha256-sa4OkTSRyoPFXTGmjpiqBug+EKgxkcJrNxQwbTRfN2A=";
ldflags = [
"-s"
@@ -35,7 +35,7 @@ buildGoModule rec {
# The following tests fail when built by nix:
#
- # $ nix log /nix/store/build-revive.1.2.1.drv | grep FAIL
+ # $ nix log /nix/store/build-revive.1.2.2.drv | grep FAIL
#
# --- FAIL: TestAll (0.01s)
# --- FAIL: TestTimeEqual (0.00s)
diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index 46521da88539..40b5dc7e0b65 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -21,7 +21,9 @@ let common = { version, hash, jdk ? jdk11_headless, tests }:
installPhase = ''
mkdir -p $out
cp -R * $out
- wrapProgram $out/bin/hbase --set-default JAVA_HOME ${jdk.home}
+ wrapProgram $out/bin/hbase --set-default JAVA_HOME ${jdk.home} \
+ --run "test -d /etc/hadoop-conf && export HBASE_CONF_DIR=\''${HBASE_CONF_DIR-'/etc/hadoop-conf/'}" \
+ --set-default HBASE_CONF_DIR "$out/conf/"
'';
passthru = { inherit tests; };
diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix
index e62cfa6b8a80..26c1b99216c6 100644
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/tools/graphics/mangohud/default.nix
@@ -1,28 +1,26 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, fetchurl
, substituteAll
, coreutils
, curl
-, gawk
, glxinfo
, gnugrep
, gnused
-, lsof
, xdg-utils
, dbus
, hwdata
, libX11
, mangohud32
, vulkan-headers
+, appstream
, glslang
, makeWrapper
+, Mako
, meson
, ninja
, pkg-config
-, python3Packages
, unzip
, vulkan-loader
, libXNVCtrl
@@ -43,24 +41,24 @@ let
src = fetchFromGitHub {
owner = "ocornut";
repo = "imgui";
- rev = "v${version}";
- hash = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18=";
};
patch = fetchurl {
url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch";
- hash = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18=";
+ sha256 = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18=";
};
};
in stdenv.mkDerivation rec {
pname = "mangohud";
- version = "0.6.7-1";
+ version = "0.6.8";
src = fetchFromGitHub {
owner = "flightlessmango";
repo = "MangoHud";
- rev = "v${version}";
+ rev = "refs/tags/v${version}";
fetchSubmodules = true;
- sha256 = "sha256-60cZYo+d679KRggLBGbpLYM5Iu1XySEEGp+MxZs6wF0=";
+ sha256 = "sha256-jfmgN90kViHa7vMOjo2x4bNY2QbLk93uYEvaA4DxYvg=";
};
outputs = [ "out" "doc" "man" ];
@@ -81,23 +79,15 @@ in stdenv.mkDerivation rec {
path = lib.makeBinPath [
coreutils
curl
- gawk
glxinfo
gnugrep
gnused
- lsof
xdg-utils
];
libdbus = dbus.lib;
inherit hwdata libX11;
})
-
- (fetchpatch {
- name = "allow-system-nlohmann-json.patch";
- url = "https://github.com/flightlessmango/MangoHud/commit/e1ffa0f85820abea44639438fca2152290c87ee8.patch";
- sha256 = "sha256-CaJb0RpXmNGCBidMXM39VJVLIXb6NbN5HXWkH/5Sfvo=";
- })
] ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") [
# Support 32bit OpenGL applications by appending the mangohud32
# lib path to LD_LIBRARY_PATH.
@@ -124,13 +114,13 @@ in stdenv.mkDerivation rec {
];
nativeBuildInputs = [
+ appstream
glslang
makeWrapper
+ Mako
meson
ninja
pkg-config
- python3Packages.Mako
- python3Packages.python
unzip
vulkan-loader
];
diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
index 379e1dd7ba23..0416008a99a3 100644
--- a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
+++ b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
@@ -1,15 +1,3 @@
-From 56a191f6db6d530c2bc89d9d3395b4c9768d108f Mon Sep 17 00:00:00 2001
-From: Atemu
-Date: Tue, 17 May 2022 16:58:08 +0200
-Subject: [PATCH 1/2] hardcode dependencies
-
----
- src/dbus.cpp | 2 +-
- src/loaders/loader_x11.cpp | 2 +-
- src/logging.cpp | 7 +++++++
- src/pci_ids.cpp | 6 ++----
- 4 files changed, 11 insertions(+), 6 deletions(-)
-
diff --git a/src/dbus.cpp b/src/dbus.cpp
index 3b3cccb..1405725 100644
--- a/src/dbus.cpp
@@ -34,21 +22,18 @@ index 4db6f78..c60d08c 100644
-std::shared_ptr g_x11(new libx11_loader("libX11.so.6"));
+std::shared_ptr g_x11(new libx11_loader("@libX11@/lib/libX11.so.6"));
diff --git a/src/logging.cpp b/src/logging.cpp
-index b27f21e..48f5e03 100644
+index 1668226..f0c8df5 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
-@@ -22,7 +22,14 @@ string exec(string command) {
+@@ -24,7 +24,11 @@ string exec(string command) {
#endif
std::array buffer;
std::string result;
+
+ char* originalPath = getenv("PATH");
+ setenv("PATH", "@path@", 1);
-+
std::unique_ptr pipe(popen(command.c_str(), "r"), pclose);
-+
+ setenv("PATH", originalPath, 1);
-+
if (!pipe) {
return "popen failed!";
}
@@ -70,6 +55,3 @@ index feec222..6baa707 100644
}
std::string line;
---
-2.36.0
-
diff --git a/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch
index f4f2e112d945..03af397faee7 100644
--- a/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch
+++ b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch
@@ -1,24 +1,12 @@
-From 1ac93cbf0eed951af6967a81f731a0f418ea0b3d Mon Sep 17 00:00:00 2001
-From: Atemu
-Date: Tue, 17 May 2022 16:58:45 +0200
-Subject: [PATCH 2/2] opengl32 nix workaround
-
----
- bin/mangohud.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
diff --git a/bin/mangohud.in b/bin/mangohud.in
-index 8ec21de..f65304a 100755
+index e13da99..086443c 100755
--- a/bin/mangohud.in
+++ b/bin/mangohud.in
@@ -23,6 +23,6 @@ fi
# figure out whether the 32 or 64 bit version should be used, and will search
# for it in the correct directory
- LD_PRELOAD="${LD_PRELOAD}:${MANGOHUD_LIB_NAME}"
--LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@"
-+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@:@mangohud32@/lib/mangohud"
+ LD_PRELOAD="${LD_PRELOAD}${LD_PRELOAD:+:}${MANGOHUD_LIB_NAME}"
+-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@ld_libdir_mangohud@"
++LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@ld_libdir_mangohud@:@mangohud32@/lib/mangohud"
exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LD_PRELOAD="${LD_PRELOAD}" "$@"
---
-2.36.0
-
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index da2a969aafc2..17f2f7d94e1d 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -16,11 +16,11 @@ let
in
tcl.mkTclDerivation rec {
pname = "remind";
- version = "04.00.00";
+ version = "04.00.01";
src = fetchurl {
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
- sha256 = "sha256-I7bmsO3EAUnmo2KoIy5myxXuZB8tzs5kCEXpG550x8Y=";
+ sha256 = "sha256-NhXS7WpFbKuRFiAWDSy+g9PoYVQcpugLppQEF/S5WeI=";
};
propagatedBuildInputs = tclLibraries;
diff --git a/pkgs/tools/misc/reredirect/default.nix b/pkgs/tools/misc/reredirect/default.nix
index eb1c90324e01..479c8ac28e54 100644
--- a/pkgs/tools/misc/reredirect/default.nix
+++ b/pkgs/tools/misc/reredirect/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "reredirect";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "jerome-pouiller";
repo = "reredirect";
rev = "v${version}";
- sha256 = "0aqzs940kwvw80lhkszx8spcdh9ilsx5ncl9vnp611hwlryfw7kk";
+ sha256 = "sha256-RHRamDo7afnJ4DlOVAqM8lQAC60YESGSMKa8Io2vcX0=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 510c3a69185d..bbaa588545f6 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.8.7";
+ version = "1.8.8";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
- sha256 = "/RGq/q0N623RR4HuAmyfFx1/OYZBrmK1ddhiT4bgy3k=";
+ hash = "sha256-kgskeQM6zESkjDWmgGqhZlGnH8naZ5k0sw+70ZzW2/E=";
};
postPatch = ''
diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix
index 9763d52d0b1d..691ea6e8a3d9 100644
--- a/pkgs/tools/networking/smartdns/default.nix
+++ b/pkgs/tools/networking/smartdns/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "smartdns";
- version = "36.1";
+ version = "37";
src = fetchFromGitHub {
owner = "pymumu";
repo = pname;
rev = "Release${version}";
- sha256 = "sha256-5pAt7IjgbCCGaHeSoQvuoc6KPD9Yn5iXL1CAawgBeY0=";
+ sha256 = "sha256-zmcLXhqgwP9SKTyUUhOehQRJk6uX7iwgu9WP2TVhsR8=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix
index 22106727e392..7d6122fe5f40 100644
--- a/pkgs/tools/security/buttercup-desktop/default.nix
+++ b/pkgs/tools/security/buttercup-desktop/default.nix
@@ -2,24 +2,23 @@
let
pname = "buttercup-desktop";
- version = "2.14.2";
- name = "${pname}-${version}";
+ version = "2.16.0";
src = fetchurl {
url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage";
- sha256 = "sha256-ZZaolebDGqRk4BHP5PxFxBsMgOQAxUoIMTlhxM58k0Y=";
+ sha256 = "sha256-o6KdbwD0VdCTYLEfar7Jt7MRZUayGHyasnmtU8Cqg3E=";
};
- appimageContents = appimageTools.extractType2 { inherit name src; };
+ appimageContents = appimageTools.extractType2 { inherit pname src version; };
in appimageTools.wrapType2 {
- inherit name src;
+ inherit pname src version;
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
extraInstallCommands = ''
- mv $out/bin/${name} $out/bin/buttercup-desktop
+ mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${appimageContents}/buttercup.desktop -t $out/share/applications
substituteInPlace $out/share/applications/buttercup.desktop \
- --replace 'Exec=AppRun' 'Exec=buttercup-desktop'
+ --replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix
index 5a3ed90a4182..8b10d6412d1c 100644
--- a/pkgs/tools/security/sigma-cli/default.nix
+++ b/pkgs/tools/security/sigma-cli/default.nix
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sigma-cli";
- version = "0.4.3";
+ version = "0.5.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "SigmaHQ";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-3LFakeS3aQaacm7HqeAJPMJhi3Wf8zbJc//SEWUA1Rg=";
+ hash = "sha256-i0rin4TLoqo+F2nWG4kcFp3x/cRtkMzAo5Ldyo0Si5w=";
};
nativeBuildInputs = with python3.pkgs; [
@@ -23,8 +23,11 @@ python3.pkgs.buildPythonApplication rec {
click
prettytable
pysigma
- pysigma-backend-splunk
+ pysigma-backend-elasticsearch
pysigma-backend-insightidr
+ pysigma-backend-opensearch
+ pysigma-backend-qradar
+ pysigma-backend-splunk
pysigma-pipeline-crowdstrike
pysigma-pipeline-sysmon
pysigma-pipeline-windows
@@ -37,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'prettytable = "^3.1.1"' 'prettytable = "*"' \
- --replace 'pysigma = "^0.5.0"' 'pysigma = "*"'
+ --replace 'pysigma = "^0.7.2"' 'pysigma = "*"'
'';
pythonImportsCheck = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 979d8486ae2d..068c1f02b6fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8572,6 +8572,7 @@ with pkgs;
mangohud = callPackage ../tools/graphics/mangohud {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
mangohud32 = pkgsi686Linux.mangohud;
+ inherit (python3Packages) Mako;
};
manix = callPackage ../tools/nix/manix {
@@ -16237,9 +16238,7 @@ with pkgs;
kubeaudit = callPackage ../tools/security/kubeaudit { };
- kubectx = callPackage ../development/tools/kubectx {
- buildGoModule = buildGo117Module;
- };
+ kubectx = callPackage ../development/tools/kubectx { };
kube-linter = callPackage ../development/tools/kube-linter { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8b01d2c424d1..497940bfaa33 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -287,6 +287,8 @@ in {
aioeagle = callPackage ../development/python-modules/aioeagle { };
+ aioecowitt = callPackage ../development/python-modules/aioecowitt { };
+
aioemonitor = callPackage ../development/python-modules/aioemonitor { };
aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { };
@@ -5459,6 +5461,8 @@ in {
meteoalertapi = callPackage ../development/python-modules/meteoalertapi { };
+ meteocalc = callPackage ../development/python-modules/meteocalc { };
+
meteofrance-api = callPackage ../development/python-modules/meteofrance-api { };
mezzanine = callPackage ../development/python-modules/mezzanine { };
@@ -8196,6 +8200,12 @@ in {
pysigma = callPackage ../development/python-modules/pysigma { };
+ pysigma-backend-elasticsearch = callPackage ../development/python-modules/pysigma-backend-elasticsearch { };
+
+ pysigma-backend-opensearch = callPackage ../development/python-modules/pysigma-backend-opensearch { };
+
+ pysigma-backend-qradar = callPackage ../development/python-modules/pysigma-backend-qradar { };
+
pysigma-backend-splunk = callPackage ../development/python-modules/pysigma-backend-splunk { };
pysigma-backend-insightidr = callPackage ../development/python-modules/pysigma-backend-insightidr { };
@@ -11695,6 +11705,8 @@ in {
inherit python;
})).python;
+ zadnegoale = callPackage ../development/python-modules/zadnegoale { };
+
zake = callPackage ../development/python-modules/zake { };
zarr = callPackage ../development/python-modules/zarr { };