diff --git a/.editorconfig b/.editorconfig
index b780def5d11e..532bb4824340 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -67,10 +67,6 @@ indent_style = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
-[pkgs/build-support/upstream-updater/**]
-indent_style = unset
-trim_trailing_whitespace = unset
-
[pkgs/development/compilers/elm/registry.dat]
end_of_line = unset
insert_final_newline = unset
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 41a84ed02213..2d2eec1763cf 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -235,6 +235,23 @@
removed due to it being an outdated version.
+
+
+ The DHCP server (services.dhcpd4,
+ services.dhcpd6) has been hardened. The
+ service is now using the systemd’s
+ DynamicUser mechanism to run as an
+ unprivileged dynamically-allocated user with limited
+ capabilities. The dhcpd state files are now always stored in
+ /var/lib/dhcpd{4,6} and the
+ services.dhcpd4.stateDir and
+ service.dhcpd6.stateDir options have been
+ removed. If you were depending on root privileges or
+ set{uid,gid,cap} binaries in dhcpd shell hooks, you may give
+ dhcpd more capabilities with e.g.
+ systemd.services.dhcpd6.serviceConfig.AmbientCapabilities.
+
+
The mailpile email webclient
@@ -435,6 +452,20 @@
directly.
+
+
+ The existing pkgs.opentelemetry-collector
+ has been moved to
+ pkgs.opentelemetry-collector-contrib to
+ match the actual source being the contrib
+ edition. pkgs.opentelemetry-collector is
+ now the actual core release of opentelemetry-collector. If you
+ use the community contributions you should change the package
+ you refer to. If you don’t need them update your commands from
+ otelcontribcol to
+ otelcorecol and enjoy a 7x smaller binary.
+
+
pkgs.noto-fonts-cjk is now deprecated in
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 50099671f62d..448f302afe67 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -81,6 +81,11 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.kubernetes.addons.dashboard` was removed due to it being an outdated version.
+- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened.
+ The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities.
+ The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed.
+ If you were depending on root privileges or set{uid,gid,cap} binaries in dhcpd shell hooks, you may give dhcpd more capabilities with e.g. `systemd.services.dhcpd6.serviceConfig.AmbientCapabilities`.
+
- The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2.
- The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs.
@@ -133,11 +138,20 @@ In addition to numerous new and upgraded packages, this release has the followin
- MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.
+
- The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under
`$out/libexec/terraform-providers/////_/terraform-provider-_v` (which mkProvider does).
This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly.
+- The existing `pkgs.opentelemetry-collector` has been moved to
+ `pkgs.opentelemetry-collector-contrib` to match the actual source being the
+ "contrib" edition. `pkgs.opentelemetry-collector` is now the actual core
+ release of opentelemetry-collector. If you use the community contributions
+ you should change the package you refer to. If you don't need them update your
+ commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary.
+
+
- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`
and `pkgs.noto-fonts-cjk-serif` because they each have different release
schedules. To maintain compatibility with prior releases of Nixpkgs,
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 24d5b7bc2b29..99bdb11b0112 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -57,7 +57,6 @@ in {
rtl8723bs-firmware
rtl8761b-firmware
rtw88-firmware
- rtw89-firmware
zd1211fw
alsa-firmware
sof-firmware
@@ -65,6 +64,8 @@ in {
] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
rtl8723bs-firmware
+ ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [
+ rtw89-firmware
];
hardware.wirelessRegulatoryDatabase = true;
})
diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index 54e4f9002859..3c4c0069dfd0 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -28,38 +28,45 @@ let
}
'';
- dhcpdService = postfix: cfg: optionalAttrs cfg.enable {
- "dhcpd${postfix}" = {
- description = "DHCPv${postfix} server";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
+ dhcpdService = postfix: cfg:
+ let
+ configFile =
+ if cfg.configFile != null
+ then cfg.configFile
+ else writeConfig cfg;
+ leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases";
+ args = [
+ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"
+ "-pf" "/run/dhcpd${postfix}/dhcpd.pid"
+ "-cf" configFile
+ "-lf" leaseFile
+ ] ++ cfg.extraFlags
+ ++ cfg.interfaces;
+ in
+ optionalAttrs cfg.enable {
+ "dhcpd${postfix}" = {
+ description = "DHCPv${postfix} server";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
- preStart = ''
- mkdir -m 755 -p ${cfg.stateDir}
- chown dhcpd:nogroup ${cfg.stateDir}
- touch ${cfg.stateDir}/dhcpd.leases
- '';
-
- serviceConfig =
- let
- configFile = if cfg.configFile != null then cfg.configFile else writeConfig cfg;
- args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"
- "-pf" "/run/dhcpd${postfix}/dhcpd.pid"
- "-cf" "${configFile}"
- "-lf" "${cfg.stateDir}/dhcpd.leases"
- "-user" "dhcpd" "-group" "nogroup"
- ] ++ cfg.extraFlags
- ++ cfg.interfaces;
-
- in {
- ExecStart = concatMapStringsSep " " escapeShellArg args;
- Type = "forking";
- Restart = "always";
- RuntimeDirectory = [ "dhcpd${postfix}" ];
- PIDFile = "/run/dhcpd${postfix}/dhcpd.pid";
+ preStart = "touch ${leaseFile}";
+ serviceConfig = {
+ ExecStart = concatMapStringsSep " " escapeShellArg args;
+ Type = "forking";
+ Restart = "always";
+ DynamicUser = true;
+ User = "dhcpd";
+ Group = "dhcpd";
+ AmbientCapabilities = [
+ "CAP_NET_RAW" # to send ICMP messages
+ "CAP_NET_BIND_SERVICE" # to bind on DHCP port (67)
+ ];
+ StateDirectory = "dhcpd${postfix}";
+ RuntimeDirectory = "dhcpd${postfix}";
+ PIDFile = "/run/dhcpd${postfix}/dhcpd.pid";
+ };
};
- };
- };
+ };
machineOpts = { ... }: {
@@ -102,15 +109,6 @@ let
'';
};
- stateDir = mkOption {
- type = types.path;
- # We use /var/lib/dhcp for DHCPv4 to save backwards compatibility.
- default = "/var/lib/dhcp${if postfix == "4" then "" else postfix}";
- description = ''
- State directory for the DHCP server.
- '';
- };
-
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -194,7 +192,13 @@ in
imports = [
(mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ])
- ];
+ ] ++ flip map [ "4" "6" ] (postfix:
+ mkRemovedOptionModule [ "services" "dhcpd${postfix}" "stateDir" ] ''
+ The DHCP server state directory is now managed with the systemd's DynamicUser mechanism.
+ This means the directory is named after the service (dhcpd${postfix}), created under
+ /var/lib/private/ and symlinked to /var/lib/.
+ ''
+ );
###### interface
@@ -210,15 +214,6 @@ in
config = mkIf (cfg4.enable || cfg6.enable) {
- users = {
- users.dhcpd = {
- isSystemUser = true;
- group = "dhcpd";
- description = "DHCP daemon user";
- };
- groups.dhcpd = {};
- };
-
systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6;
};
diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix
index 026bde2a92df..14cbfb395402 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -4,6 +4,8 @@ with lib;
let
cfg = config.services.miniflux;
+ defaultAddress = "localhost:8080";
+
dbUser = "miniflux";
dbPassword = "miniflux";
dbHost = "localhost";
@@ -31,7 +33,7 @@ in
{
options = {
services.miniflux = {
- enable = mkEnableOption "miniflux";
+ enable = mkEnableOption "miniflux and creates a local postgres database for it";
config = mkOption {
type = types.attrsOf types.str;
@@ -45,6 +47,9 @@ in
Configuration for Miniflux, refer to
for documentation on the supported values.
+
+ Correct configuration for the database is already provided.
+ By default, listens on ${defaultAddress}.
'';
};
@@ -64,7 +69,7 @@ in
config = mkIf cfg.enable {
services.miniflux.config = {
- LISTEN_ADDR = mkDefault "localhost:8080";
+ LISTEN_ADDR = mkDefault defaultAddress;
DATABASE_URL = "postgresql://${dbUser}:${dbPassword}@${dbHost}/${dbName}?sslmode=disable";
RUN_MIGRATIONS = "1";
CREATE_ADMIN = "1";
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index a8610047f5f3..6876dbf39d84 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -924,7 +924,7 @@ in
PrivateMounts = true;
# System Call Filtering
SystemCallArchitectures = "native";
- SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid @mincore" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ];
+ SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ];
};
};
diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
index 68836c730729..37a89fc21e44 100644
--- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
+++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
@@ -36,19 +36,10 @@ import ./make-test-python.nix ({pkgs, ...}: {
};
# Since we want to program the routes that we delegate to the "customer"
- # into our routing table we must have a way to gain the required privs.
- # This security wrapper will do in our test setup.
- #
- # DO NOT COPY THIS TO PRODUCTION AS IS. Think about it at least twice.
- # Everyone on the "isp" machine will be able to add routes to the kernel.
- security.wrappers.add-dhcpd-lease = {
- owner = "root";
- group = "root";
- source = pkgs.writeShellScript "add-dhcpd-lease" ''
- exec ${pkgs.iproute2}/bin/ip -6 route replace "$1" via "$2"
- '';
- capabilities = "cap_net_admin+ep";
- };
+ # into our routing table we must give dhcpd the required privs.
+ systemd.services.dhcpd6.serviceConfig.AmbientCapabilities =
+ [ "CAP_NET_ADMIN" ];
+
services = {
# Configure the DHCPv6 server
#
@@ -80,7 +71,7 @@ import ./make-test-python.nix ({pkgs, ...}: {
set Prefix = pick-first-value(binary-to-ascii(16, 16, ":", suffix(option dhcp6.ia-pd, 16)), "n/a");
set PrefixLength = pick-first-value(binary-to-ascii(10, 8, ":", substring(suffix(option dhcp6.ia-pd, 17), 0, 1)), "n/a");
log(concat(IP, " ", Prefix, " ", PrefixLength));
- execute("/run/wrappers/bin/add-dhcpd-lease", concat(Prefix,"/",PrefixLength), IP);
+ execute("${pkgs.iproute2}/bin/ip", "-6", "route", "replace", concat(Prefix,"/",PrefixLength), "via", IP);
}
'';
};
diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix
index afceca2a54ba..9fe86550f0da 100644
--- a/pkgs/applications/audio/cozy/default.nix
+++ b/pkgs/applications/audio/cozy/default.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
format = "other"; # no setup.py
pname = "cozy";
- version = "1.1.2";
+ version = "1.2.0";
# Temporary fix
# See https://github.com/NixOS/nixpkgs/issues/57029
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
owner = "geigi";
repo = pname;
rev = version;
- sha256 = "sha256-QENn8mFMk06/Uj8QJo0mJQ7frJNcv5RVNJwDB+H/LkI=";
+ sha256 = "0igqf9b77i13sxlk4ziw549h379hmz1slrb3vvf8irk94gxabsaw";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/cyanrip/default.nix b/pkgs/applications/audio/cyanrip/default.nix
index d03b7836f2ae..4f3a5a08af2e 100644
--- a/pkgs/applications/audio/cyanrip/default.nix
+++ b/pkgs/applications/audio/cyanrip/default.nix
@@ -12,13 +12,13 @@
}:
stdenv.mkDerivation rec {
pname = "cyanrip";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "cyanreg";
repo = pname;
rev = "v${version}";
- sha256 = "1aip52bwkq8cb1d8ifyv2m6m5dz7jk6qmbhyb97yyf4nhxv445ky";
+ sha256 = "17bi2xhjv3f3i870whkyqckvjlg32wqkspash87zi0jw7m7jm229";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index e3200d8e43f1..6527b90b89e1 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -72,6 +72,7 @@ mkDerivation rec {
gstreamer
gst-plugins-base
gst-plugins-good
+ gst-plugins-bad
gst-plugins-ugly
]) ++ lib.optional withVlc libvlc;
diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix
index 96ca870b79fb..f4b26c5f2ea6 100644
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
- version = "4.0.16.2";
+ version = "4.0.20.1";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
- sha256 = "sha256-nAaNT5Rt/oLBA2pSJSinoLKMYJ0VZmuC0zoMYbMSAJQ=";
+ sha256 = "sha256-uKt0TNKcqiXiT5MnsguU5fTdUyFgV7Km5KjrFS/7tws=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix
index 41eb1b9ca5e7..56114ed72a83 100644
--- a/pkgs/applications/blockchains/erigon.nix
+++ b/pkgs/applications/blockchains/erigon.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0l0w1badhvlh1rgqzvlmy5k7xhb1nf4f5dmhkl935a5ila08aak3";
};
- vendorSha256 = "sha256-kA7pOSP4wkzKuFmUqhZmjXJ0ao64cIgZMrQtQ0bQ++U=";
+ vendorSha256 = "sha256-i8BaT9C39tmHU3GGgd0hUB1PHXnoAdNYRIqZA1ggbjQ=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index e45ae5482f63..0ceeb899f086 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool
+{ lib, stdenv, fetchFromGitHub, pkg-config, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
, potrace, ApplicationServices
@@ -18,23 +18,15 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
- version = "7.1.0-20";
+ version = "7.1.0-22";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
- sha256 = "0r8zmk2cfmf09l94hqzfz4aspnzn178ggdbgm7w4hr0p864cbvc3";
+ sha256 = "sha256-Pd/b3lmFpOis8z+ITFScBUNALIKJY4ZOx2VOBwM0Bh4=";
};
- patches = [
- # fix a type confusion bug introduced in 7.1.0-20 with commit 075565e93c71bcaaabf0ce70b7d1060bccdf0020
- (fetchpatch {
- url = "https://github.com/ImageMagick/ImageMagick/commit/62845d5672eca4446b952dd0ab2e3e0dab0309d4.patch";
- sha256 = "1kni5i8b5hl69niypidm90mhir8cafi6r9i857fxdlv045h3dg4p";
- })
- ];
-
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
outputMan = "out"; # it's tiny
diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix
index 204a090136de..5f0c09303ff8 100644
--- a/pkgs/applications/misc/charm/default.nix
+++ b/pkgs/applications/misc/charm/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-5WNkD+YfmQHGAWWfD9/ZEHnHPT0Ejm9Nz+/mn8xvU4U=";
};
- vendorSha256 = "sha256-TncVMDeZ8+Wuv1o0Cjks3Ve1OsO+WXH9mClC6GNaSas=";
+ vendorSha256 = "sha256-r0mYrtWllKOvKQJmW0ie4l+1nsCwU8O+CV6ESXNoETk=";
doCheck = false;
diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix
index 7b52145f794b..582295a2bc8f 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/pkgs/applications/misc/clight/clightd.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "clightd";
- version = "5.4";
+ version = "5.5";
src = fetchFromGitHub {
owner = "FedeDP";
repo = "Clightd";
rev = version;
- sha256 = "sha256-ppaxfnZB3+aOzvc/wk1f8D2mFYngQspEOl9XArNMdBE=";
+ sha256 = "sha256-uygMc4SPYBk+G+ENp+KsgDhkm+oq9ZMvWX4wF6iohPM=";
};
# dbus-1.pc has datadir=/etc
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 3f62ffe7dfb4..8e7716c98bbc 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "dbeaver";
- version = "21.3.2"; # When updating also update fetchedMavenDeps.sha256
+ version = "21.3.3"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
- sha256 = "SifnnzuETFKtnEwLjJtB7CV2QZaToex3MjKGuiShlwo=";
+ sha256 = "sha256-WycjNxPa4hkxBtT8Pq7ayUu8pNV0DvaJ+29GDKNJNWE=";
};
fetchedMavenDeps = stdenv.mkDerivation {
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
dontFixup = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "grSFtkohTlLtK8qE4A4wVppC6UHcyaXRQlGnrOmQDC4=";
+ outputHash = "sha256-pfYNHue7tZKYgU16kypZEfr2bXuDoPc4KorIAVjSylo=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix
index 2c31f24b6b1b..e838bd3eda2a 100644
--- a/pkgs/applications/misc/expenses/default.nix
+++ b/pkgs/applications/misc/expenses/default.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0=";
};
- vendorSha256 = "sha256-Ac3f17Ws3Ne8Zo0vT+qlaMm/rhak9ua2jh5jlT6jF2Y=";
+ vendorSha256 = "sha256-rIcwZUOi6bdfiWZEsRF4kl1reNPPQNuBPHDOo7RQgYo=";
# package does not contain any tests as of v0.2.3
doCheck = false;
diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/applications/misc/mepo/default.nix
index e65a5219ab7f..72e05d19bbda 100644
--- a/pkgs/applications/misc/mepo/default.nix
+++ b/pkgs/applications/misc/mepo/default.nix
@@ -5,32 +5,28 @@
, zig
, curl
, SDL2
+, SDL2_gfx
, SDL2_image
, SDL2_ttf
}:
stdenv.mkDerivation rec {
pname = "mepo";
- version = "0.2";
+ version = "0.3";
src = fetchFromSourcehut {
owner = "~mil";
repo = pname;
rev = version;
- hash = "sha256-ECq748GpjOjvchzAWlGA7H7HBvKNxY9d43+PTOWopiM=";
+ hash = "sha256-B7BOAFhiOTILUdzh49hTMrNNHZpCNRDLW2uekXyptqQ=";
};
nativeBuildInputs = [ pkg-config zig ];
- buildInputs = [ curl SDL2 SDL2_image SDL2_ttf ];
-
- buildPhase = ''
- runHook preBuild
+ buildInputs = [ curl SDL2 SDL2_gfx SDL2_image SDL2_ttf ];
+ preBuild = ''
export HOME=$TMPDIR
- zig build -Drelease-safe=true -Dcpu=baseline
-
- runHook postBuild
'';
doCheck = true;
@@ -45,8 +41,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
- install -Dm755 zig-out/bin/mepo -t $out/bin
- install -Dm755 scripts/mepo_* $out/bin
+ zig build -Drelease-safe=true -Dcpu=baseline --prefix $out install
runHook postInstall
'';
diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix
index 967c3db4c651..dbc57794eeec 100644
--- a/pkgs/applications/misc/neo4j-desktop/default.nix
+++ b/pkgs/applications/misc/neo4j-desktop/default.nix
@@ -1,12 +1,12 @@
{ appimageTools, lib, fetchurl }:
let
pname = "neo4j-desktop";
- version = "1.4.7";
+ version = "1.4.12";
name = "${pname}-${version}";
src = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage";
- hash = "sha256-oEcSW7UIeiGY2fCPJQ5EtDBRtd73Q04HaSk+7ObLKJc=";
+ hash = "sha256-CfdXus9Zj6Tx6wAXpV2tRdqvJqowgE+NIL04v3fwtJE=";
};
appimageContents = appimageTools.extract { inherit name src; };
diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix
index 6798e73c9314..488f5cd997d0 100644
--- a/pkgs/applications/misc/nwg-panel/default.nix
+++ b/pkgs/applications/misc/nwg-panel/default.nix
@@ -13,13 +13,13 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
- version = "0.5.4";
+ version = "0.5.7";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "v${version}";
- sha256 = "0vl9vfgpa1byf9vxn03j58h9zcbjd1y83b0kgv97cxm2mhqz12dg";
+ sha256 = "1d3qh42cwayb5d9ymhfs2vrbg5x5x6x73hw77m3xb9y4vyhji85x";
};
# No tests
diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix
index 6a4beec6a5ec..0c1d9cf20e9c 100644
--- a/pkgs/applications/misc/remarkable/rmapi/default.nix
+++ b/pkgs/applications/misc/remarkable/rmapi/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "rmapi";
- version = "0.0.18";
+ version = "0.0.19";
src = fetchFromGitHub {
owner = "juruen";
repo = "rmapi";
rev = "v${version}";
- sha256 = "sha256-Yrq21eiyNem9P219FxuQMHpagKQDaNsASwi2REaDAgk=";
+ sha256 = "sha256-HXWE6688jhRQQEiZuPfuJStSQeueqoWwwa+PfneHprw=";
};
vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU=";
diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix
index b8f8684e4209..6f2b43785c7a 100644
--- a/pkgs/applications/misc/snapmaker-luban/default.nix
+++ b/pkgs/applications/misc/snapmaker-luban/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "snapmaker-luban";
- version = "4.1.3";
+ version = "4.1.4";
src = fetchurl {
url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz";
- sha256 = "sha256-GXpM5dJ3JPf2HgrgTONyeCG6JjK4JhbcGP5ck7v4cqk=";
+ sha256 = "sha256-hbqIwX6YCrUQAjvKKWFAUjHvcZycnIA6v6l6qmAMuUI=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix
index 3035f74cacd7..539cebedcb63 100644
--- a/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
- version = "2.8.4";
+ version = "2.8.5";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-WsNiMlqr9ya06Urvw/m3yPsGLCTOvYFaO0oNHuVKNTs=";
+ sha256 = "sha256-cCIlKTHo+LyhIZkN6ncggBvZMwDBgXqDJVAfGWbUtj8=";
};
vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";
diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index bcd277cad4aa..fa77f3b52993 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }:
+{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_15, libsecret }:
stdenv.mkDerivation rec {
pname = "todoist-electron";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchurl {
url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage";
- sha256 = "1c4qmfyfi4hm3fs5bkxjbq1hxs5sgyp531xi5z5vpnzzi5z7dw0k";
+ sha256 = "sha256-bHX/RWDfe+ht66U7xg4HBZxeWlNBu4gYlIVd+9OuMNU=";
};
appimageContents = appimageTools.extractType2 {
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
- makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+ makeWrapper ${electron_15}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}"
'';
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 6fdfe92da253..a012e9ba6981 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
sha256 = "0hd5gnydxfncsmm7c58lvhkpnyxknvicc8f58xfh74azf363wcvm";
};
- vendorSha256 = "1pkdfg042kg3b6m5rf044gz5yg6vp3bbsay1mrrbaysnb3gs51dq";
+ vendorSha256 = "166dpxli2qyls4b9s0nv9vbwiwkp7jh32lkm35qz6s5w9zp6yjfb";
doCheck = false;
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index dc3415ac7699..3f3c7932a5b1 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
- version = "6.16.2";
+ version = "6.16.3";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
- sha256 = "sha256-RbpvEPjRwwGbjt4+A4tbnvEdLc+hH1VszE36xXnIxPE=";
+ sha256 = "sha256-YR/8ApkuZtO2vJA/VlZ06JdQnGDbTzQ5fNqHgBpFZjQ=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix
index ddb137137cf3..5682091237b4 100644
--- a/pkgs/applications/networking/aether/default.nix
+++ b/pkgs/applications/networking/aether/default.nix
@@ -9,31 +9,27 @@
let
binaryName = "AetherP2P";
+ aether-app-git = fetchFromGitHub {
+ owner = "aethereans";
+ repo = "aether-app";
+ rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d";
+ sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r";
+ };
in
stdenv.mkDerivation rec {
pname = "aether";
version = "2.0.0-dev.15";
- srcs = [
- (fetchurl {
- url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz";
- sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7";
- # % in the url / canonical filename causes an error
- name = "aether-tarball.tar.gz";
- })
- (fetchFromGitHub {
- owner = "aethereans";
- repo = "aether-app";
- rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d";
- sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r";
- })
- ];
-
- sourceRoot = "Aether-${version}+2011262249.19338c93";
+ src = fetchurl {
+ url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz";
+ sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7";
+ # % in the url / canonical filename causes an error
+ name = "aether-tarball.tar.gz";
+ };
# there is no logo in the tarball so we grab it from github and convert it in the build phase
buildPhase = ''
- convert ../source/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png
+ convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png
'';
dontWrapGApps = true;
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 64658d6442f5..482914ace0a5 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
- version = "1.10.1";
+ version = "1.10.3";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
- sha256 = "sha256-HwrIdQv4LDVLLuvukzp28AuKKbEMQeHSb0ZW+a9q4ug=";
+ sha256 = "sha256-4Xjm4P4uK0aZxUT0WzcSDdY6rEeh5YFwsMfVtFB14No=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix
index 5243c4130f14..36b3141b31fb 100644
--- a/pkgs/applications/networking/cluster/driftctl/default.nix
+++ b/pkgs/applications/networking/cluster/driftctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "driftctl";
- version = "0.18.3";
+ version = "0.18.5";
src = fetchFromGitHub {
owner = "cloudskiff";
repo = "driftctl";
rev = "v${version}";
- sha256 = "sha256-JD3T0dCRg0UQlG0pWnI8RJZuRrIFfSMVHMoaEIymdWE=";
+ sha256 = "sha256-Qz/yObF1Df62Hqwl6fPHGkWcsifvgO5EfeiyU3aql3Q=";
};
- vendorSha256 = "sha256-g3+g+mPXEO2ZcVraKuVYZCMBD5zEr1l8ogcYt3r4UjU=";
+ vendorSha256 = "sha256-wOk4IXD9qHG8R4iddlc4TLH39jVSof9bwTDU1kyAmuA=";
postUnpack = ''
# Without this, tests fail to locate aws/3.19.0.json
diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix
index 67db6edd989b..30ca2ee1cdee 100644
--- a/pkgs/applications/networking/cluster/starboard/default.nix
+++ b/pkgs/applications/networking/cluster/starboard/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "starboard";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/k9lQS3oPOYxhaaXuaDwPnai7byDkge4yBu7/9g4RUE=";
+ sha256 = "sha256-sB7C0IKadgpQ2h6HuH4D6ku/GXnFfFS+fGCW/RBSc10=";
# 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;
@@ -22,7 +22,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
- vendorSha256 = "sha256-7SVEyyJRE7oYIhuENraZy0aieIAoFFWtq4mrSXxURlQ=";
+ vendorSha256 = "sha256-R7tF724y5WNIByE+9nRoNSZDZzfLtPfK/9tSBkARaN0=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 8612e898d910..3a80e788c494 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -956,10 +956,10 @@
"owner": "selectel",
"provider-source-address": "registry.terraform.io/selectel/selectel",
"repo": "terraform-provider-selectel",
- "rev": "v3.7.1",
- "sha256": "02sfzrs3k907djcyjz7qn42b21wccykw0fw65ms34h5vz5ld73mx",
- "vendorSha256": null,
- "version": "3.7.1"
+ "rev": "v3.8.0",
+ "sha256": "0qc08v217cv2i43cxcx854rvhihrlhlakfark37vcdrh9z6swf1n",
+ "vendorSha256": "1mjp5yqwl1nya82yf5v6l3sq7iv0m94xy5w7y5avn8h40dl1wfnf",
+ "version": "3.8.0"
},
"sentry": {
"owner": "jianyuan",
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index dbdf06771b46..d58a319f724d 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.23.4";
+ version = "0.23.5";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-SWofXsbkuirPvqgU639W8IQklafLKbThoZUzOzfYwdQ=";
+ sha256 = "sha256-qVybS+gRuTezX89NMWYQVWtUH6wnjB11HImejrzVHAc=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index 97530b722fdb..ad57e2c6623b 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -44,11 +44,11 @@ in
stdenv.mkDerivation rec {
pname = "bluejeans";
- version = "2.25.0.78";
+ version = "2.26.0.136";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
- sha256 = "sha256-Xk9iU7mNm3YlXKsmf6yPqd1YAklsFOWu+04Llb+2yWQ=";
+ sha256 = "sha256-9QiE7CjCepDXQCzduqGzNUGqUgYS+PWBS71ouzHa83o=";
};
nativeBuildInputs = [ rpmextract makeWrapper ];
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 2f58ec414ab9..0672cb72425e 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,11 +7,16 @@ let
canary = "0.0.132";
} else {
stable = "0.0.264";
- ptb = "0.0.58";
+ ptb = "0.0.59";
canary = "0.0.280";
};
version = versions.${branch};
- srcs = {
+ srcs = let
+ darwin-ptb = fetchurl {
+ url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
+ sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8=";
+ };
+ in {
x86_64-linux = {
stable = fetchurl {
url =
@@ -34,11 +39,7 @@ let
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p";
};
- ptb = fetchurl {
- url =
- "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
- sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0=";
- };
+ ptb = darwin-ptb;
canary = fetchurl {
url =
"https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
@@ -46,13 +47,7 @@ let
};
};
# Only PTB bundles a MachO Universal binary with ARM support.
- aarch64-darwin = {
- ptb = fetchurl {
- url =
- "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
- sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0=";
- };
- };
+ aarch64-darwin = { ptb = darwin-ptb; };
};
src = srcs.${stdenv.hostPlatform.system}.${branch};
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 9d9e1a7c8df9..00289e5c6286 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -6,11 +6,11 @@
mkDerivation rec {
pname = "teamviewer";
- version = "15.25.5";
+ version = "15.26.4";
src = fetchurl {
url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
- sha256 = "sha256-LtITPS0bLy85dv/zdOo8JcsEZ0ZgtVmM+CcggaYJxXA=";
+ sha256 = "sha256-2CprtdKHHTLxS8jA4bRVoHvj/8zyVUV0aGPzU7mNxM8=";
};
unpackPhase = ''
diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix
index bcd42b361b93..7eff0ac90976 100644
--- a/pkgs/applications/office/foliate/default.nix
+++ b/pkgs/applications/office/foliate/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "foliate";
- version = "2.6.3";
+ version = "2.6.4";
src = fetchFromGitHub {
owner = "johnfactotum";
repo = pname;
rev = version;
- sha256 = "0ribqaxl8g1i83fxbn288afwbzzls48ni57xqi07d19p9ka892mr";
+ sha256 = "sha256-Pr2YA2MHXD4W7lyCxGAVLKyoZarZ8t92RSkWle3LNuc=";
};
nativeBuildInputs = [ meson ninja python3 wrapGAppsHook ];
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index 0b4ce74cdfa7..964d17587a4a 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -2,12 +2,12 @@
, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsa-lib, cairo, freetype, pango, gdk-pixbuf, glib }:
stdenv.mkDerivation rec {
- version = "5.1";
+ version = "5.5";
pname = "jabref";
src = fetchurl {
url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}-portable_linux.tar.gz";
- sha256 = "04f612byrq3agzy26byg1sgrjyhcpa8xfj0ssh8dl8d8vnhx9742";
+ sha256 = "sha256-9MHNehyAmu7CiBp1rgb4zTkSqmjXm2tcmiGKFBFapKI=";
};
preferLocalBuild = true;
diff --git a/pkgs/applications/office/libreoffice/darwin.nix b/pkgs/applications/office/libreoffice/darwin.nix
new file mode 100644
index 000000000000..765cbcd43024
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/darwin.nix
@@ -0,0 +1,51 @@
+{ stdenv
+, lib
+, fetchurl
+, undmg
+}:
+
+let
+ appName = "LibreOffice.app";
+ version = "7.2.5";
+ dist = {
+ aarch64-darwin = {
+ arch = "aarch64";
+ sha256 = "bdbcb9a98211f866ca089d440aebcd1d313aa99e8ab4104aae4e65ea3cee74ca";
+ };
+
+ x86_64-darwin = {
+ arch = "x86_64";
+ sha256 = "0b7ef18ed08341ac6c15339fe9a161ad17f6b469009d987cfc7d50c628d12a4e";
+ };
+ }."${stdenv.hostPlatform.system}";
+in
+stdenv.mkDerivation {
+ inherit version;
+ pname = "libreoffice";
+ src = fetchurl {
+ url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${dist.arch}/LibreOffice_${version}_MacOS_${dist.arch}.dmg";
+ inherit (dist) sha256;
+ };
+
+ nativeBuildInputs = [ undmg ];
+ sourceRoot = "${appName}";
+ dontPatch = true;
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstallPhase
+ mkdir -p $out/{Applications/${appName},bin}
+ cp -R . $out/Applications/${appName}
+ ln -s $out/Applications/${appName}/Contents/MacOS/soffice $out/bin
+ runHook postInstallPhase
+ '';
+
+ meta = with lib; {
+ description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
+ homepage = "https://libreoffice.org/";
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ tricktron ];
+ platforms = [ "aarch64-darwin" "x86_64-darwin" ];
+ };
+}
diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix
new file mode 100644
index 000000000000..bfe72a7115a4
--- /dev/null
+++ b/pkgs/applications/office/morgen/default.nix
@@ -0,0 +1,59 @@
+{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
+, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }:
+
+stdenv.mkDerivation rec {
+ pname = "morgen";
+ version = "2.4.3";
+
+ src = fetchurl {
+ url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
+ sha256 = "sha256-IWGeb0+IiFNYJ+jQAzGYfQ5FnrbR6HIpynS9jgd5/mY=";
+ };
+
+ nativeBuildInputs = [
+ dpkg
+ autoPatchelfHook
+ makeWrapper
+ nodePackages.asar
+ ];
+
+ buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ];
+
+ dontBuild = true;
+ dontConfigure = true;
+
+ unpackCmd = ''
+ dpkg-deb -x ${src} ./morgen-${pname}
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mv usr $out
+ mv opt $out
+
+ asar extract $out/opt/Morgen/resources/app.asar "$TMP/work"
+ # 1. Fixes path for todesktop-runtime-config.json
+ # 2. Fixes startup script
+ substituteInPlace $TMP/work/dist/main.js \
+ --replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \
+ --replace "Exec=\"+process.execPath+\"" "Exec=$out/bin/morgen"
+ asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar
+
+ substituteInPlace $out/share/applications/morgen.desktop \
+ --replace '/opt/Morgen' $out/bin
+
+ makeWrapper ${electron}/bin/electron $out/bin/morgen \
+ --add-flags $out/opt/Morgen/resources/app.asar
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "All-in-one Calendars, Tasks and Scheduler";
+ homepage = "https://morgen.so/download";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ wolfangaukang ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index 506a2f99f607..3958d2870942 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -7,11 +7,11 @@
mkDerivation rec {
pname = "skrooge";
- version = "2.26.1";
+ version = "2.27.0";
src = fetchurl {
url = "https://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
- sha256 = "sha256-66hoA+FDTeMbNAInr9TlTSnwUywJQjTRz87MkdNYn5Q=";
+ sha256 = "sha256-xkl0UyJEDOeYOqqXf3woCDMb8ZyC2c5ChQdDFFERZxE=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 57947e23baa0..047d64c411e1 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -10,11 +10,11 @@
mkDerivation rec {
pname = "zanshin";
- version = "21.12.0";
+ version = "21.12.1";
src = fetchurl {
url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz";
- sha256 = "sha256-l8W47tS7q747fkSAH3HJdwPsqjMfCyxzl3xJEeAXeh0=";
+ sha256 = "sha256-hYbJwmnD9i/SL5ET2t9YgPxJHJUpAbMZ4a62WljhpHw=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index 3e1366547ee7..2865e8b70a10 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -48,13 +48,13 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.10";
- minor = "0";
+ minor = "1";
patch = "0";
}
}:
let
- sourceSha256 = "sha256-1K8nlNiirks3MJ+9cH9bkILVFtu5OxhKkNhetGqojn4=";
+ sourceSha256 = "sha256-bU6z7H08G8QIToogAMI2P5tHBtVZezlBDqSbnEsqAjE=";
featuresInfo = {
# Needed always
basic = {
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index 203d0520660f..156f55161291 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kallisto";
- version = "0.46.2";
+ version = "0.48.0";
src = fetchFromGitHub {
repo = "kallisto";
owner = "pachterlab";
rev = "v${version}";
- sha256 = "0m0r2820ca3rch99md1zzbgkilmlfkhdkpys2lfnb87qxmf1jnmb";
+ sha256 = "sha256-r0cdR0jTRa1wu/LDKW6NdxI3XaKj6wcIVbIlct0fFvI=";
};
nativeBuildInputs = [ autoconf cmake ];
diff --git a/pkgs/applications/science/biology/repseek/default.nix b/pkgs/applications/science/biology/repseek/default.nix
new file mode 100644
index 000000000000..5966c83b7a5f
--- /dev/null
+++ b/pkgs/applications/science/biology/repseek/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "repseek";
+ version = "9Sep2014";
+ src = fetchurl {
+ url = "https://bioinfo.mnhn.fr/abi/public/RepSeek/RepSeek.${version}.tgz";
+ sha256 = "1jiknji3ivrv7zmrfbf2mccfpdwhin3lfxfsciaqwf69b3sda8nf";
+ };
+
+ preConfigure = ''
+ mkdir -p $out/bin
+ substituteInPlace Makefile \
+ --replace "INSTALLDIR = \$\$HOME/bin" "INSTALLDIR = $out/bin/" \
+ --replace "CC= gcc" "CC = $CC"
+ '' + lib.optionalString stdenv.isLinux ''
+ substituteInPlace Makefile --replace "MACHINE = MACOSX" "MACHINE = LINUX"
+ '';
+
+ meta = {
+ description = "Tool to retrieve approximate repeats from large DNA sequences";
+ homepage = "https://bioinfo.mnhn.fr/abi/public/RepSeek";
+ maintainers = [ lib.maintainers.bzizou ];
+ license = lib.licenses.lgpl21;
+ };
+
+}
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index e9dae55fbae3..2066087692a0 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -14,13 +14,17 @@ let
# `sagelib`, i.e. all of sage except some wrappers and runtime dependencies
sagelib = self.callPackage ./sagelib.nix {
inherit flint arb;
- inherit sage-src env-locations pynac singular;
+ inherit sage-src env-locations singular;
inherit (maxima) lisp-compiler;
linbox = pkgs.linbox.override { withSage = true; };
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
- sage_docbuild = self.callPackage ./sage_docbuild.nix {
+ sage-docbuild = self.callPackage ./python-modules/sage-docbuild.nix {
+ inherit sage-src;
+ };
+
+ sage-setup = self.callPackage ./python-modules/sage-setup.nix {
inherit sage-src;
};
};
@@ -58,9 +62,9 @@ let
# the env-locations file.
sage-env = callPackage ./sage-env.nix {
sagelib = python3.pkgs.sagelib;
- sage_docbuild = python3.pkgs.sage_docbuild;
+ sage-docbuild = python3.pkgs.sage-docbuild;
inherit env-locations;
- inherit python3 singular palp flint pynac pythonEnv maxima;
+ inherit python3 singular palp flint pythonEnv maxima;
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
@@ -74,7 +78,7 @@ let
sage-with-env = callPackage ./sage-with-env.nix {
inherit python3 pythonEnv;
inherit sage-env;
- inherit pynac singular maxima;
+ inherit singular maxima;
inherit three;
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
@@ -91,7 +95,7 @@ let
pythonRuntimeDeps = with python3.pkgs; [
sagelib
- sage_docbuild
+ sage-docbuild
cvxopt
networkx
service-identity
@@ -132,9 +136,6 @@ let
};
};
- # *not* to confuse with the python package "pynac"
- pynac = pkgs.pynac.override { inherit singular flint; };
-
# With openblas (64 bit), the tests fail the same way as when sage is build with
# openblas instead of openblasCompat. Apparently other packages somehow use flints
# blas when it is available. Alternative would be to override flint to use
diff --git a/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch
new file mode 100644
index 000000000000..a478f50d92e8
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch
@@ -0,0 +1,46 @@
+diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py
+index 01f32fb8e4..4d83dc7b47 100644
+--- a/src/sage/doctest/control.py
++++ b/src/sage/doctest/control.py
+@@ -1253,6 +1253,7 @@ class DocTestController(SageObject):
+
+ self.log("Using --optional=" + self._optional_tags_string())
+ available_software._allow_external = self.options.optional is True or 'external' in self.options.optional
++ available_software._autodetect_safe = self.options.optional is True or 'sage' in self.options.optional
+ self.log("Features to be detected: " + ','.join(available_software.detectable()))
+ self.add_files()
+ self.expand_files_into_sources()
+diff --git a/src/sage/doctest/external.py b/src/sage/doctest/external.py
+index 84dae19ea5..badc61466e 100644
+--- a/src/sage/doctest/external.py
++++ b/src/sage/doctest/external.py
+@@ -409,6 +409,7 @@ class AvailableSoftware(object):
+ []
+ """
+ self._allow_external = True
++ self._autodetect_safe = True
+ # For multiprocessing of doctests, the data self._seen should be
+ # shared among subprocesses. Thus we use Array class from the
+ # multiprocessing module.
+@@ -430,6 +431,8 @@ class AvailableSoftware(object):
+ sage: 'internet' in available_software # random, optional - internet
+ True
+ """
++ if not self._autodetect_safe:
++ return False
+ try:
+ idx = self._indices[item]
+ except KeyError:
+diff --git a/src/sage/features/sagemath.py b/src/sage/features/sagemath.py
+index 433338766d..233623b14a 100644
+--- a/src/sage/features/sagemath.py
++++ b/src/sage/features/sagemath.py
+@@ -12,7 +12,7 @@ class sagemath_doc_html(StaticFile):
+
+ EXAMPLES::
+
+- sage: from sage.features.sagemath import sagemath_doc_html
++ sage: from sage.features.sagemath import sagemath_doc_html # optional - sagemath_doc_html
+ sage: sagemath_doc_html().is_present() # optional - sagemath_doc_html
+ FeatureTestResult('sagemath_doc_html', True)
+ """
diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
deleted file mode 100644
index d5c19a54fd96..000000000000
--- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f5ea42a7aaed7611fb55b65897b9fcf2b7bcf97e Mon Sep 17 00:00:00 2001
-From: Timo Kaufmann
-Date: Sun, 21 Oct 2018 17:52:40 +0200
-Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested
-
----
- src/sage/doctest/control.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py
-index 2d93841e50..6d156e29a1 100644
---- a/src/sage/doctest/control.py
-+++ b/src/sage/doctest/control.py
-@@ -375,7 +375,8 @@ class DocTestController(SageObject):
- if not optionaltag_regex.search(o):
- raise ValueError('invalid optional tag {!r}'.format(o))
-
-- options.optional |= auto_optional_tags
-+ if "sage" in options.optional:
-+ options.optional |= auto_optional_tags
-
- self.options = options
-
---
-2.28.0
-
diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
index 178cef3e54ea..90a23f94cb5f 100644
--- a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
+++ b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
@@ -1,8 +1,8 @@
diff --git a/src/sage/env.py b/src/sage/env.py
-index 95980cc2df..37107a30e1 100644
+index c4953cfa65..47b880f9ad 100644
--- a/src/sage/env.py
+++ b/src/sage/env.py
-@@ -227,93 +227,12 @@ OPENMP_CXXFLAGS = var("OPENMP_CXXFLAGS", "")
+@@ -244,81 +244,8 @@ os.environ['MPMATH_SAGE'] = '1'
SAGE_BANNER = var("SAGE_BANNER", "")
SAGE_IMPORTALL = var("SAGE_IMPORTALL", "yes")
@@ -29,20 +29,12 @@ index 95980cc2df..37107a30e1 100644
-
- EXAMPLES::
-
-- sage: import sys
-- sage: from fnmatch import fnmatch
- sage: from sage.env import _get_shared_lib_path
-- sage: lib_filename = _get_shared_lib_path("Singular", "singular-Singular")
-- sage: if sys.platform == 'cygwin':
-- ....: pattern = "*/cygSingular-*.dll"
-- ....: elif sys.platform == 'darwin':
-- ....: pattern = "*/libSingular-*.dylib"
-- ....: else:
-- ....: pattern = "*/lib*Singular-*.so"
-- sage: fnmatch(str(lib_filename), pattern)
+- sage: "gap" in _get_shared_lib_path("gap")
- True
- sage: _get_shared_lib_path("an_absurd_lib") is None
- True
+-
- """
-
- for libname in libnames:
@@ -87,11 +79,6 @@ index 95980cc2df..37107a30e1 100644
- # Just return None if no files were found
- return None
-
- # locate singular shared object
- # On Debian it's libsingular-Singular so try that as well
--SINGULAR_SO = var("SINGULAR_SO", _get_shared_lib_path("Singular", "singular-Singular"))
-+SINGULAR_SO = var("SINGULAR_SO", '/default')
-
# locate libgap shared object
-GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", ""))
+GAP_SO = var("GAP_SO", '/default')
diff --git a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch b/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch
new file mode 100644
index 000000000000..91e080aa294a
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch
@@ -0,0 +1,58 @@
+diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd
+index 7794c9edc3..1753277b1f 100644
+--- a/src/sage/libs/linbox/conversion.pxd
++++ b/src/sage/libs/linbox/conversion.pxd
+@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in
+ - v -- linbox vector
+ """
+ cdef Vector_integer_dense res = P()
+- cdef cppvector[Integer] * vec = &v.refRep()
+ cdef size_t i
+ for i in range( res._degree):
+- mpz_set(res._entries[i], vec[0][i].get_mpz_const())
++ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const())
+
+ return res
+diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd
+index 9112d151f8..dcc482960c 100644
+--- a/src/sage/libs/linbox/linbox.pxd
++++ b/src/sage/libs/linbox/linbox.pxd
+@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
+ ctypedef Modular_double Field
+ ctypedef double Element
+ DenseMatrix_Modular_double(Field F, size_t m, size_t n)
+- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n)
++ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*)
+ void setEntry(size_t i, size_t j, Element& a)
+ Element &getEntry(size_t i, size_t j)
+
+@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
+ ctypedef Modular_float Field
+ ctypedef float Element
+ DenseMatrix_Modular_float(Field F, size_t m, size_t n)
+- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n)
++ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*)
+ void setEntry(size_t i, size_t j, Element& a)
+ Element &getEntry(size_t i, size_t j)
+
+@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h":
+ DenseVector_integer (Field &F)
+ DenseVector_integer (Field &F, long& m)
+ DenseVector_integer (Field &F, cppvector[Integer]&)
+- cppvector[Element]& refRep()
+ size_t size()
+ void resize(size_t)
+ void resize(size_t n, const Element&)
+diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi
+index 010365d76f..3d60726ff9 100644
+--- a/src/sage/matrix/matrix_modn_dense_template.pxi
++++ b/src/sage/matrix/matrix_modn_dense_template.pxi
+@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_
+ return 0,[]
+
+ cdef ModField *F = new ModField(modulus)
+- cdef DenseMatrix *A = new DenseMatrix(F[0], entries,nrows, ncols)
++ cdef DenseMatrix *A = new DenseMatrix(F[0], nrows, ncols, entries)
+ cdef Py_ssize_t r = reducedRowEchelonize(A[0])
+ cdef Py_ssize_t i,j
+ for i in range(nrows):
diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
index 3c64be100d25..1ff081b25e0f 100644
--- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
+++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
@@ -1,8 +1,8 @@
diff --git a/src/sage_docbuild/__init__.py b/src/sage_docbuild/__init__.py
-index 79005b903a..fbe6fe2595 100644
+index 8a5c1a19d2..21fd192642 100644
--- a/src/sage_docbuild/__init__.py
+++ b/src/sage_docbuild/__init__.py
-@@ -85,27 +85,6 @@ def builder_helper(type):
+@@ -89,27 +89,6 @@ def builder_helper(type):
"""
Returns a function which builds the documentation for
output type ``type``.
@@ -12,7 +12,7 @@ index 79005b903a..fbe6fe2595 100644
- Check that :trac:`25161` has been resolved::
-
- sage: from sage_docbuild import DocBuilder, setup_parser
-- sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set
+- sage: DocBuilder._options = setup_parser().parse_args([]) # builder_helper needs _options to be set
-
- sage: import sage_docbuild.sphinxbuild
- sage: def raiseBaseException():
@@ -30,7 +30,7 @@ index 79005b903a..fbe6fe2595 100644
"""
def f(self, *args, **kwds):
output_dir = self._output_dir(type)
-@@ -127,10 +106,9 @@ def builder_helper(type):
+@@ -131,10 +110,9 @@ def builder_helper(type):
logger.debug(build_command)
# Run Sphinx with Sage's special logger
@@ -44,10 +44,10 @@ index 79005b903a..fbe6fe2595 100644
if ABORT_ON_ERROR:
raise
diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py
-index f58f6c61d7..ef51a55411 100644
+index d917c3e9d4..551cc8028a 100644
--- a/src/sage_docbuild/sphinxbuild.py
+++ b/src/sage_docbuild/sphinxbuild.py
-@@ -326,3 +326,8 @@ def runsphinx():
+@@ -327,3 +327,8 @@ def runsphinx():
sys.stderr = saved_stderr
sys.stdout.flush()
sys.stderr.flush()
diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix
new file mode 100644
index 000000000000..1766cec3e35d
--- /dev/null
+++ b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, sage-src
+, sphinx
+}:
+
+buildPythonPackage rec {
+ version = src.version;
+ pname = "sage-docbuild";
+ src = sage-src;
+
+ propagatedBuildInputs = [
+ sphinx
+ ];
+
+ preBuild = ''
+ cd pkgs/sage-docbuild
+ '';
+
+ doCheck = false; # we will run tests in sagedoc.nix
+
+ meta = with lib; {
+ description = "Build system of the Sage documentation";
+ homepage = "https://www.sagemath.org";
+ license = licenses.gpl2Plus;
+ maintainers = teams.sage.members;
+ };
+}
diff --git a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix
new file mode 100644
index 000000000000..50346153123d
--- /dev/null
+++ b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, sage-src
+, pkgconfig # the python module, not the pkg-config alias
+}:
+
+buildPythonPackage rec {
+ version = src.version;
+ pname = "sage-setup";
+ src = sage-src;
+
+ buildInputs = [
+ pkgconfig
+ ];
+
+ preBuild = ''
+ cd pkgs/sage-setup
+ '';
+
+ doCheck = false; # sagelib depends on sage-setup, but sage-setup's tests depend on sagelib
+
+ meta = with lib; {
+ description = "Build system of the Sage library";
+ homepage = "https://www.sagemath.org";
+ license = licenses.gpl2Plus;
+ maintainers = teams.sage.members;
+ };
+}
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index ae0b9f7453b5..e680c0c3b22d 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -2,7 +2,7 @@
, lib
, writeTextFile
, sagelib
-, sage_docbuild
+, sage-docbuild
, env-locations
, gfortran
, bash
@@ -45,11 +45,10 @@
, flint
, gmp
, mpfr
-, pynac
, zlib
, gsl
, ntl
-, jdk8
+, jdk
, less
}:
@@ -60,8 +59,6 @@ assert (!blas.isILP64) && (!lapack.isILP64);
# dependencies.
let
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-
runtimepath = (lib.makeBinPath ([
"@sage-local@"
"@sage-local@/build"
@@ -163,7 +160,6 @@ writeTextFile rec {
gmp
mpfr
pari
- pynac
zlib
eclib
gsl
@@ -179,7 +175,6 @@ writeTextFile rec {
glpk
flint
gap
- pynac
mpfr.dev
])
}'
@@ -193,5 +188,5 @@ writeTextFile rec {
'';
} // { # equivalent of `passthru`, which `writeTextFile` doesn't support
lib = sagelib;
- docbuild = sage_docbuild;
+ docbuild = sage-docbuild;
}
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index eb07434b4cc0..a51e92cde52e 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -57,24 +57,29 @@ let
);
in
stdenv.mkDerivation rec {
- version = "9.4";
+ version = "9.5";
pname = "sage-src";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage";
rev = version;
- sha256 = "sha256-jqkr4meG02KbTCMsGvyr1UbosS4ZuUJhPXU/InuS+9A=";
+ sha256 = "sha256-uOsLpsGpcIGs8Xr82X82MElnTB2E908gytyNJ8WVD5w=";
};
# Patches needed because of particularities of nix or the way this is packaged.
# The goal is to upstream all of them and get rid of this list.
nixPatches = [
- # Make sure py2/py3 tests are only run when their expected context (all "sage"
- # tests) are also run. That is necessary to test dochtml individually. See
- # https://trac.sagemath.org/ticket/26110 for an upstream discussion.
- # TODO: Determine if it is still necessary.
- ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
+ # Since https://trac.sagemath.org/ticket/32174, some external features are
+ # marked as "safe" and get auto-detected, in which case the corresponding
+ # optional tests are executed. We disable auto-detection of safe features if
+ # we are doctesting with an "--optional" argument which does not include
+ # "sage", because tests from autodetected features expect context provided
+ # by running basic sage tests. This is necessary to test sagemath_doc_html
+ # separately. See https://trac.sagemath.org/ticket/26110 for a related
+ # upstream discussion (from the time when Sage still had optional py2/py3
+ # tags).
+ ./patches/Only-test-external-software-when-all-of-sage-is.patch
# Fixes a potential race condition which can lead to transient doctest failures.
./patches/fix-ecl-race.patch
@@ -117,46 +122,6 @@ stdenv.mkDerivation rec {
# Let's just assume warnings are expected until we update to 4.27.0.
./patches/fonttools-deprecation-warnings.patch
- # https://trac.sagemath.org/ticket/32305
- (fetchSageDiff {
- base = "9.4";
- name = "networkx-2.6-upgrade.patch";
- rev = "9808325853ba9eb035115e5b056305a1c9d362a0";
- sha256 = "sha256-gJSqycCtbAVr5qnVEbHFUvIuTOvaxFIeffpzd6nH4DE=";
- })
-
- # https://trac.sagemath.org/ticket/32420
- (fetchSageDiff {
- base = "9.5.beta2";
- name = "sympy-1.9-update.patch";
- rev = "beed4e16aff32e47d0c3b1c58cb1e2f4c38590f8";
- sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE=";
- })
-
- # https://trac.sagemath.org/ticket/32567
- (fetchSageDiff {
- base = "9.5.beta2";
- name = "arb-2.21.0-update.patch";
- rev = "eb3304dd521a3d5a9334e747a08e234bbf16b4eb";
- sha256 = "sha256-XDkaY4VQGyESXI6zuD7nCNzyQOl/fmBFvAESH9+RRvk=";
- })
-
- # https://trac.sagemath.org/ticket/32797
- (fetchSageDiff {
- base = "9.5.beta7";
- name = "pari-2.13.3-update.patch";
- rev = "f5f7a86908daf60b25e66e6a189c51ada7e0a732";
- sha256 = "sha256-H/caGx3q4KcdsyGe+ojV9bUTQ5y0siqM+QHgDbeEnbw=";
- })
-
- # https://trac.sagemath.org/ticket/32909
- (fetchSageDiff {
- base = "9.5.beta7";
- name = "matplotlib-3.5-deprecation-warnings.patch";
- rev = "a5127dc56fdf5c2e82f6bc781cfe78dbd04e97b7";
- sha256 = "sha256-p23qUu9mgEUbdbX6cy7ArxZAtpcFjCKbgyxN4jWvj1o=";
- })
-
# https://trac.sagemath.org/ticket/32968
(fetchSageDiff {
base = "9.5.beta8";
@@ -164,6 +129,11 @@ stdenv.mkDerivation rec {
rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841";
sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q=";
})
+
+ # Upstream has not upgraded to linbox 1.7 yet because it conflicts with
+ # pre-4.2.1p3 versions of Singular, but we don't have this problem.
+ # https://trac.sagemath.org/ticket/32959
+ ./patches/linbox-1.7-upgrade.patch
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index b74ec4007e62..df3a1467d53c 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -18,7 +18,6 @@
, eclib
, ntl
, ecm
-, pynac
, pythonEnv
}:
@@ -36,7 +35,6 @@ let
blas lapack
singular
three
- pynac
giac
gap
pari
@@ -126,6 +124,10 @@ stdenv.mkDerivation rec {
cp -r src/bin "$out/bin"
cp -r build/bin "$out/build/bin"
+ # sage assumes the existence of sage-src-env-config.in means it's being executed in-tree. in this case, it
+ # adds SAGE_SRC/bin to PATH, breaking our wrappers
+ rm "$out/bin"/*.in "$out/build/bin"/*.in
+
cp -f '${sage-env}/sage-env' "$out/bin/sage-env"
substituteInPlace "$out/bin/sage-env" \
--subst-var-by sage-local "$out"
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index 106f9eea3097..5805a5c7b0c7 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -62,7 +62,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab";
- license = licenses.gpl2;
+ homepage = "https://www.sagemath.org";
+ license = licenses.gpl2Plus;
maintainers = teams.sage.members;
};
}
diff --git a/pkgs/applications/science/math/sage/sage_docbuild.nix b/pkgs/applications/science/math/sage/sage_docbuild.nix
deleted file mode 100644
index ed78d46b4451..000000000000
--- a/pkgs/applications/science/math/sage/sage_docbuild.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ buildPythonPackage
-, sage-src
-, sphinx
-}:
-
-buildPythonPackage rec {
- version = src.version;
- pname = "sage_docbuild";
- src = sage-src;
-
- propagatedBuildInputs = [
- sphinx
- ];
-
- preBuild = ''
- cd build/pkgs/sage_docbuild/src
- '';
-
- doCheck = false; # we will run tests in sagedoc.nix
-}
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
index 6016b3baeb48..489fc2edfe55 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
jmol
cddlib
] ++ (with python3.pkgs; [
- sage_docbuild
+ sage-docbuild
psutil
future
sphinx
@@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = ''
- ${sage-with-env}/bin/sage -t --optional=dochtml --all
+ ${sage-with-env}/bin/sage -t --optional=sagemath_doc_html --all
'';
}
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index a884ad8899d4..8d685c8da60f 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -2,6 +2,7 @@
, env-locations
, perl
, buildPythonPackage
+, m4
, arb
, blas
, lapack
@@ -37,7 +38,7 @@
, pkg-config
, planarity
, ppl
-, pynac
+, primecountpy
, python
, ratpoints
, readline
@@ -49,11 +50,24 @@
, singular
, pip
, jupyter_core
+, sage-setup
, libhomfly
, libbraiding
, gmpy2
, pplpy
, sqlite
+, jupyter-client
+, ipywidgets
+, mpmath
+, rpy2
+, fpylll
+, scipy
+, sympy
+, matplotlib
+, pillow
+, ipykernel
+, networkx
+, sphinx # TODO: this is in setup.cfg, bug should we override it?
}:
assert (!blas.isILP64) && (!lapack.isILP64);
@@ -73,8 +87,10 @@ buildPythonPackage rec {
perl
jupyter_core
pkg-config
+ sage-setup
pip # needed to query installed packages
lisp-compiler
+ m4
];
buildInputs = [
@@ -116,7 +132,7 @@ buildPythonPackage rec {
pari
planarity
ppl
- pynac
+ primecountpy
rankwidth
ratpoints
singular
@@ -130,6 +146,18 @@ buildPythonPackage rec {
gmpy2
pplpy
sqlite
+ mpmath
+ rpy2
+ scipy
+ sympy
+ matplotlib
+ pillow
+ ipykernel
+ fpylll
+ networkx
+ jupyter-client
+ ipywidgets
+ sphinx
];
preBuild = ''
@@ -148,8 +176,24 @@ buildPythonPackage rec {
mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython"
mkdir -p "var/lib/sage/installed"
- # src/setup.py should not be used, see https://trac.sagemath.org/ticket/31377#comment:124
- cd build/pkgs/sagelib/src
+ cd build/pkgs/sagelib
+
+ # some files, like Pipfile, pyproject.toml, requirements.txt and setup.cfg
+ # are generated by the bootstrap script using m4. these can fetch data from
+ # build/pkgs, either directly or via sage-get-system-packages.
+ sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt
+ sed -i 's/, <3.4//' ../rpy2/install-requires.txt
+ sed -i 's/, <4.3//' ../sphinx/install-requires.txt
+ sed -i '/sage_conf/d' src/setup.cfg.m4
+ sed -i '/sage_conf/d' src/requirements.txt.m4
+ for infile in src/*.m4; do
+ if [ -f "$infile" ]; then
+ outfile="src/$(basename $infile .m4)"
+ m4 "$infile" > "$outfile"
+ fi
+ done
+
+ cd src
'';
postInstall = ''
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index b543252e8712..23712061160e 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gmp, bison, perl, ncurses, readline, coreutils, pkg-config
, lib
-, fetchpatch
, autoreconfHook
+, buildPackages
, sharutils
, file
, flint
@@ -11,6 +11,7 @@
, lrcalc
, doxygen
, graphviz
+, latex2html
# upstream generates docs with texinfo 4. later versions of texinfo
# use letters instead of numbers for post-appendix chapters, and we
# want it to match the upstream format because sage depends on it.
@@ -22,66 +23,25 @@
stdenv.mkDerivation rec {
pname = "singular";
- version = "4.2.0p2";
+ version = "4.3.0";
- # since the tarball does not contain tests or documentation (and
- # there is no separate tests tarball for 4.2.0), we fetch from
- # GitHub.
+ # since the tarball does not contain tests, we fetch from GitHub.
src = fetchFromGitHub {
owner = "Singular";
repo = "Singular";
- # 4.2.0p2 is not tagged, but the tarball matches the commit below.
- rev = "6f68939ddf612d96e3caaaaa8275f77613ac1da8";
- sha256 = "sha256-BJNzYylzDqD/5YjzjxPRb/c96tYiuGy9Y+A7qf3ZSG8=";
-
- # if a release is tagged it will be in the format below.
- # rev = "Release${lib.replaceStrings ["."] ["-"] version}";
+ # if a release is tagged (which sometimes does not happen), it will
+ # be in the format below.
+ # rev = "Release-${lib.replaceStrings ["."] ["-"] version}";
+ rev = "d895b0f1f543c61eb03adddad20f08655a419d4e";
+ sha256 = "sha256-c5Qr6VUuPKjfw8fowjJJz3oGAyUwo/K0WeMvU5djzVA=";
# the repository's .gitattributes file contains the lines "/Tst/
# export-ignore" and "/doc/ export-ignore" so some directories are
- # not included in the tarball downloaded by fetchzip. setting
- # fetchSubmodules works around this by using fetchgit instead of
- # fetchzip.
- fetchSubmodules = true;
+ # not included in the tarball downloaded by fetchzip.
+ forceFetchGit = true;
};
- patches = [
- # fix timeouts when docbuilding with >= 64 cpus
- # https://github.com/Singular/Singular/issues/1117
- ./vspace-MAX_PROCESS.patch
-
- # add aarch64 support to cpu-check.m4. copied from redhat.
- ./redhat-aarch64.patch
-
- # the newest version of ax-prog-cc-for-build.m4 seems to trigger
- # linker errors. see
- # https://github.com/alsa-project/alsa-firmware/issues/3 for a
- # related issue.
- ./use-older-ax-prog-cc-for-build.patch
-
- # https://github.com/Singular/Singular/issues/1086
- (fetchpatch {
- name = "schubert-lib-fails-with-too-many-cpus.patch";
- url = "https://github.com/Singular/Singular/commit/3cda50c00a849455efa2502e56596955491a353a.patch";
- sha256 = "sha256-fgYd+2vT32w5Ki8kKx6PfZn2e4QSJcYWOwEFXtc+lSA=";
- })
- ] ++ lib.optionals enableDocs [
- # singular supports building without 4ti2, bertini, normaliz or
- # topcom just fine, but the docbuilding does not skip manual pages
- # tagged as depending on those binaries (probably a bug in
- # doc2tex.pl::HandleLib, since it seems to ignore "-exclude"
- # argumens). skip them manually.
- ./disable-docs-for-optional-unpackaged-deps.patch
-
- # fix some non-ascii characters in doc/decodegb.doc
- (fetchpatch {
- name = "decodegb-ascii.patch";
- url = "https://github.com/Singular/Singular/commit/36966d9009de572ee4dbc487f3e5744098fe91be.patch";
- sha256 = "sha256-9WcEov/oOQRC584ag6WVHFwY2aCjbM75HWyvZoEwppw=";
- })
- ];
-
configureFlags = [
"--with-ntl=${ntl}"
"--disable-pyobject-module"
@@ -114,6 +74,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals enableGfanlib [
cddlib
];
+
nativeBuildInputs = [
bison
perl
@@ -123,9 +84,11 @@ stdenv.mkDerivation rec {
] ++ lib.optionals enableDocs [
doxygen
graphviz
+ latex2html
texinfo4
texlive.combined.scheme-small
];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
preAutoreconf = ''
find . -type f -readable -writable -exec sed \
@@ -137,21 +100,14 @@ stdenv.mkDerivation rec {
hardeningDisable = lib.optional stdenv.isi686 "stackprotector";
- # The Makefile actually defaults to `make install` anyway
- buildPhase = ''
- # do nothing
- '';
-
doCheck = true; # very basic checks, does not test any libraries
installPhase = ''
- mkdir -p "$out"
- cp -r Singular/LIB "$out/lib"
make install
'' + lib.optionalString enableDocs ''
- # Sage uses singular.hlp (which is not in the tarball)
+ # Sage uses singular.info, which is not installed by default
mkdir -p $out/share/info
- cp doc/singular.hlp $out/share/info
+ cp doc/singular.info $out/share/info
'' + ''
# Make sure patchelf picks up the right libraries
rm -rf libpolys factory resources omalloc Singular
@@ -211,5 +167,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
homepage = "http://www.singular.uni-kl.de";
downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
+ mainProgram = "Singular";
};
}
diff --git a/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch b/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch
deleted file mode 100644
index 46d92922f3ce..000000000000
--- a/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-commit 9e8b044d982e132cf35a106a1cc0cf7e77b27f7c
-Author: Mauricio Collares
-Date: Thu Apr 15 20:33:21 2021 -0300
-
- Disable manual sections using optional packages not yet in Nixpkgs
-
- * normaliz.lib depends on normaliz.
- * polymake.lib depends on topcom.
- * recover.lib depends on bertini.
- * sing4ti2.lib depends on 4ti2.
- * tateProdCplxNegGrad.lib uses multigrading.lib, which depends on 4ti2.
-
-diff --git a/doc/singular.doc b/doc/singular.doc
-index 64b969d39..e704f95f0 100644
---- a/doc/singular.doc
-+++ b/doc/singular.doc
-@@ -407,7 +407,6 @@ LIB "all.lib";
- * nfmodsyz_lib:: Syzygy modules of submodules of free modules over algebraic number fields
- * noether_lib:: Noether normalization of an ideal
- * normal_lib:: procedure for normalization
--* normaliz_lib:: integral closure, normalization for monomial ideals, toric ideals
- * pointid_lib:: factorized lex GB of the vanishing ideal of a set of points
- * primdec_lib:: procedures for primary decomposition
- * primdecint_lib:: primary decomposition over the integers
-@@ -416,7 +415,6 @@ LIB "all.lib";
- * reesclos_lib:: Rees Algebra and integral closure of an ideal
- * rstandard_lib:: Janet bases and border bases for ideals
- * sagbi_lib:: Subalgebras bases Analogous to Groebner bases for ideals
--* sing4ti2_lib:: interface to program 4ti2
- * symodstd_lib:: Groebner bases for symmetric ideals
- * toric_lib:: toric ideals
- @end menu
-@@ -521,10 +519,6 @@ LIB "all.lib";
- @node normal_lib
- @subsection normal_lib
- @c lib normal.lib
--@c ---------------------------------------------------------
--@node normaliz_lib
--@subsection normaliz_lib
--@c lib normaliz.lib tag:normaliz
- @c ----------------------------------------------------------
- @node pointid_lib
- @subsection pointid_lib
-@@ -558,10 +552,6 @@ LIB "all.lib";
- @subsection sagbi_lib
- @c lib sagbi.lib
- @c ---------------------------------------------------------
--@node sing4ti2_lib
--@subsection sing4ti2_lib
--@c lib sing4ti2.lib tag:sing4ti2
--@c ----------------------------------------------------------
- @node symodstd_lib
- @subsection symodstd_lib
- @c lib symodstd.lib
-@@ -873,7 +863,6 @@ iniD, reslist, sumlist, dividelist, createlist
- * solve_lib:: procedures to solve polynomial systems
- * triang_lib:: procedures for decomposing zero-dimensional ideals
- * ntsolve_lib:: one real solution of polynomial systems (Newton iteration)
--* recover_lib:: Hybrid numerical/symbolical algorithms
- * rootisolation_lib:: real root isolation with intervals
- * signcond_lib:: computing realizable sign conditions
- * zeroset_lib:: procedures for roots and factorization
-@@ -904,10 +893,6 @@ iniD, reslist, sumlist, dividelist, createlist
- @subsection ntsolve_lib
- @c lib ntsolve.lib
- @c ---------------------------------------------------------
--@node recover_lib
--@subsection recover_lib
--@c lib recover.lib tag:bertini
--@c ----------------------------------------------------------
- @node rootisolation_lib
- @subsection rootisolation_lib
- @c lib rootisolation.lib
-@@ -1108,7 +1093,6 @@ but not for serious computations.
- * cimonom_lib:: complete intersection for toric ideals
- * gfan_lib:: A gfanlib interface for Singular
- * gitfan_lib:: Compute GIT-fans
--* polymake_lib:: interface to TOPCOM
- * realizationMatroids_lib:: Realizability for Tropical Fan Curves
- * tropical_lib:: interface to gfan
- * tropicalNewton_lib:: Newton polygons in tropical geometry
-@@ -1125,10 +1109,7 @@ but not for serious computations.
- @node gitfan_lib
- @subsection gitfan_lib
- @c lib gitfan.lib
--@c ----------------------------------------------------------
--@node polymake_lib
--@subsection polymake_lib
--@c lib polymake.lib tag:topcom
-+
- @c ----------------------------------------------------------
- @node realizationMatroids_lib
- @subsection realizationMatroids_lib
-@@ -1219,7 +1200,6 @@ Comments should be send to the author of the library directly.
- * stanleyreisner_lib:: T1 and T2 for a general Stanley-Reiser ring
- * swalk_lib:: Sagbi Walk Conversion Algorithm
- * systhreads_lib:: multi-threaded objects
--* tateProdCplxNegGrad_lib:: sheaf cohomology on product of projective spaces
- * VecField_lib:: vector fields
- @end menu
- @c ----------------------------------------------------------
-@@ -1310,10 +1290,6 @@ Todos/Issues:
- @subsection systhreads_lib
- @c lib systhreads.lib
- @c ---------------------------------------------------------
--@node tateProdCplxNegGrad_lib
--@subsection tateProdCplxNegGrad_lib
--@c lib tateProdCplxNegGrad.lib
--@c ---------------------------------------------------------
- @node VecField_lib
- @subsection VecField_lib
- @c lib VecField.lib
diff --git a/pkgs/applications/science/math/singular/redhat-aarch64.patch b/pkgs/applications/science/math/singular/redhat-aarch64.patch
deleted file mode 100644
index e0db6e87f994..000000000000
--- a/pkgs/applications/science/math/singular/redhat-aarch64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/m4/cpu-check.m4 b/m4/cpu-check.m4
-index 3cf0a7f08..12bb926ac 100644
---- a/m4/cpu-check.m4
-+++ b/m4/cpu-check.m4
-@@ -37,6 +37,18 @@ if test "$ac_cv_singcpuname" = ppc; then
- AC_DEFINE(SI_CPU_PPC,1,"PPC")
- AC_SUBST(SI_CPU_PPC)
- fi
-+if test "$ac_cv_singcpuname" = arm -o "$ac_cv_singcpuname" = armel; then
-+ AC_DEFINE(SI_CPU_ARM,1,"ARM")
-+ AC_SUBST(SI_CPU_ARM)
-+fi
-+if test "$ac_cv_singcpuname" = aarch64; then
-+ AC_DEFINE(SI_CPU_AARCH64,1,"AARCH64")
-+ AC_SUBST(SI_CPU_AARCH64)
-+fi
-+if test "$ac_cv_singcpuname" = s390; then
-+ AC_DEFINE(SI_CPU_S390,1,"S390")
-+ AC_SUBST(SI_CPU_S390)
-+fi
-
- # UNAME and PATH
- AC_MSG_CHECKING(uname for Singular)
-@@ -65,6 +77,14 @@ dnl testet on: ppc_Linux, 740/750 PowerMac G3, 512k L2 cache
- [powerpc*|ppc*], [AC_DEFINE(HAVE_GENERIC_MULT,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)],
- dnl the following settings seems to be better on arm processors
- [arm*], [],
-+dnl FIXME: need to run some tests
-+ [aarch64*], [
-+ AC_DEFINE(HAVE_MULT_MOD,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)
-+ AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add)
-+ AC_DEFINE(HAVE_DIV_MOD,1,division using extend euclidian algorithm otherwise using tables of logartihms)
-+ ],
-+dnl FIXME: need to run some tests
-+ [s390*], [AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add)],
- []
- )
-
diff --git a/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch b/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch
deleted file mode 100644
index f664378617cf..000000000000
--- a/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4
-index f7410d74b..12cb005a5 100644
---- a/m4/ax_prog_cc_for_build.m4
-+++ b/m4/ax_prog_cc_for_build.m4
-@@ -32,35 +32,31 @@
- # and this notice are preserved. This file is offered as-is, without any
- # warranty.
-
--#serial 18
-+#serial 9
-
- AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
- AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_PROG_CPP])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
- dnl Use the standard macros, but make them use other variable names
- dnl
- pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
--pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl
- pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
- pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
- pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
- pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
--pushdef([ac_cv_c_compiler_gnu], ac_cv_build_c_compiler_gnu)dnl
- pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
- pushdef([ac_cv_objext], ac_cv_build_objext)dnl
- pushdef([ac_exeext], ac_build_exeext)dnl
- pushdef([ac_objext], ac_build_objext)dnl
- pushdef([CC], CC_FOR_BUILD)dnl
- pushdef([CPP], CPP_FOR_BUILD)dnl
--pushdef([GCC], GCC_FOR_BUILD)dnl
- pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
- pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
--pushdef([EXEEXT], BUILD_EXEEXT)dnl
- pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
--pushdef([OBJEXT], BUILD_OBJEXT)dnl
- pushdef([host], build)dnl
- pushdef([host_alias], build_alias)dnl
- pushdef([host_cpu], build_cpu)dnl
-@@ -71,29 +67,27 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
- pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
- pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
- pushdef([ac_cv_host_os], ac_cv_build_os)dnl
--pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl
--pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl
--pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl
--pushdef([cross_compiling], cross_compiling_build)dnl
-+pushdef([ac_cpp], ac_build_cpp)dnl
-+pushdef([ac_compile], ac_build_compile)dnl
-+pushdef([ac_link], ac_build_link)dnl
-
--cross_compiling_build=no
-+save_cross_compiling=$cross_compiling
-+save_ac_tool_prefix=$ac_tool_prefix
-+cross_compiling=no
-+ac_tool_prefix=
-
--ac_build_tool_prefix=
--AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"],
-- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"])
--
--AC_LANG_PUSH([C])
- AC_PROG_CC
--_AC_COMPILER_EXEEXT
--_AC_COMPILER_OBJEXT
- AC_PROG_CPP
-+AC_EXEEXT
-+
-+ac_tool_prefix=$save_ac_tool_prefix
-+cross_compiling=$save_cross_compiling
-
- dnl Restore the old definitions
- dnl
--popdef([cross_compiling])dnl
--popdef([am_cv_prog_cc_c_o])dnl
--popdef([am_cv_CC_dependencies_compiler_type])dnl
--popdef([ac_tool_prefix])dnl
-+popdef([ac_link])dnl
-+popdef([ac_compile])dnl
-+popdef([ac_cpp])dnl
- popdef([ac_cv_host_os])dnl
- popdef([ac_cv_host_vendor])dnl
- popdef([ac_cv_host_cpu])dnl
-@@ -104,33 +98,25 @@ popdef([host_vendor])dnl
- popdef([host_cpu])dnl
- popdef([host_alias])dnl
- popdef([host])dnl
--popdef([OBJEXT])dnl
- popdef([LDFLAGS])dnl
--popdef([EXEEXT])dnl
- popdef([CPPFLAGS])dnl
- popdef([CFLAGS])dnl
--popdef([GCC])dnl
- popdef([CPP])dnl
- popdef([CC])dnl
- popdef([ac_objext])dnl
- popdef([ac_exeext])dnl
- popdef([ac_cv_objext])dnl
- popdef([ac_cv_exeext])dnl
--popdef([ac_cv_c_compiler_gnu])dnl
- popdef([ac_cv_prog_cc_g])dnl
- popdef([ac_cv_prog_cc_cross])dnl
- popdef([ac_cv_prog_cc_works])dnl
--popdef([ac_cv_prog_cc_c89])dnl
- popdef([ac_cv_prog_gcc])dnl
- popdef([ac_cv_prog_CPP])dnl
-
--dnl restore global variables ac_ext, ac_cpp, ac_compile,
--dnl ac_link, ac_compiler_gnu (dependant on the current
--dnl language after popping):
--AC_LANG_POP([C])
--
- dnl Finally, set Makefile variables
- dnl
-+BUILD_EXEEXT=$ac_build_exeext
-+BUILD_OBJEXT=$ac_build_objext
- AC_SUBST(BUILD_EXEEXT)dnl
- AC_SUBST(BUILD_OBJEXT)dnl
- AC_SUBST([CFLAGS_FOR_BUILD])dnl
-diff --git a/m4/ax_prog_cxx_for_build.m4 b/m4/ax_prog_cxx_for_build.m4
-index 4d976769f..17c19a89f 100644
---- a/m4/ax_prog_cxx_for_build.m4
-+++ b/m4/ax_prog_cxx_for_build.m4
-@@ -31,7 +31,7 @@
- # and this notice are preserved. This file is offered as-is, without any
- # warranty.
-
--#serial 4
-+#serial 3
-
- AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD])
- AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl
-@@ -49,7 +49,6 @@ pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl
- pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl
- pushdef([CXX], CXX_FOR_BUILD)dnl
- pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl
--pushdef([GXX], GXX_FOR_BUILD)dnl
- pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl
- pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
- pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl
-@@ -63,25 +62,26 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
- pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
- pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
- pushdef([ac_cv_host_os], ac_cv_build_os)dnl
--pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl
--pushdef([am_cv_CXX_dependencies_compiler_type], am_cv_build_CXX_dependencies_compiler_type)dnl
--pushdef([cross_compiling], cross_compiling_build)dnl
-+pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl
-+pushdef([ac_compile], ac_build_compile)dnl
-+pushdef([ac_link], ac_build_link)dnl
-
--cross_compiling_build=no
-+save_cross_compiling=$cross_compiling
-+save_ac_tool_prefix=$ac_tool_prefix
-+cross_compiling=no
-+ac_tool_prefix=
-
--ac_build_tool_prefix=
--AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"],
-- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"])
--
--AC_LANG_PUSH([C++])
- AC_PROG_CXX
- AC_PROG_CXXCPP
-
-+ac_tool_prefix=$save_ac_tool_prefix
-+cross_compiling=$save_cross_compiling
-+
- dnl Restore the old definitions
- dnl
--popdef([cross_compiling])dnl
--popdef([am_cv_CXX_dependencies_compiler_type])dnl
--popdef([ac_tool_prefix])dnl
-+popdef([ac_link])dnl
-+popdef([ac_compile])dnl
-+popdef([ac_cxxcpp])dnl
- popdef([ac_cv_host_os])dnl
- popdef([ac_cv_host_vendor])dnl
- popdef([ac_cv_host_cpu])dnl
-@@ -103,10 +103,6 @@ popdef([ac_cv_prog_cxx_works])dnl
- popdef([ac_cv_prog_gxx])dnl
- popdef([ac_cv_prog_CXXCPP])dnl
-
--dnl restore global variables (dependant on the current
--dnl language after popping):
--AC_LANG_POP([C++])
--
- dnl Finally, set Makefile variables
- dnl
- AC_SUBST([CXXFLAGS_FOR_BUILD])dnl
diff --git a/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch b/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch
deleted file mode 100644
index 78d658f926ee..000000000000
--- a/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/kernel/GBEngine/kChinese.cc b/kernel/GBEngine/kChinese.cc
-index 829a66609..84655caf2 100644
---- a/kernel/GBEngine/kChinese.cc
-+++ b/kernel/GBEngine/kChinese.cc
-@@ -209,6 +209,8 @@ ideal id_ChineseRemainder_0(ideal *xx, number *q, int rl, const ring r)
- return NULL;
- }
- int cpus=(int)(long)feOptValue(FE_OPT_CPUS);
-+ if (cpus>=vspace::internals::MAX_PROCESS)
-+ cpus=vspace::internals::MAX_PROCESS-1;
- if ((cpus==1) || (2*cpus>=cnt))
- /* at least 2 polys for each process, or switch to seriell version */
- return id_ChineseRemainder(xx,q,rl,r);
-@@ -295,6 +297,8 @@ ideal id_Farey_0(ideal x, number N, const ring r)
- {
- int cnt=IDELEMS(x)*x->nrows;
- int cpus=(int)(long)feOptValue(FE_OPT_CPUS);
-+ if (cpus>=vspace::internals::MAX_PROCESS)
-+ cpus=vspace::internals::MAX_PROCESS-1;
- if (2*cpus>=cnt) /* at least 2 polys for each process,
- or switch to seriell version */
- return id_Farey(x,N,r);
-diff --git a/kernel/GBEngine/kverify.cc b/kernel/GBEngine/kverify.cc
-index 909d84994..aa06d6624 100644
---- a/kernel/GBEngine/kverify.cc
-+++ b/kernel/GBEngine/kverify.cc
-@@ -176,6 +176,8 @@ BOOLEAN kVerify2(ideal F, ideal Q)
- /*---------------------------------------------------------------------*/
- BOOLEAN all_okay=TRUE;
- int cpus=(int)(long)feOptValue(FE_OPT_CPUS);
-+ if (cpus>=vspace::internals::MAX_PROCESS)
-+ cpus=vspace::internals::MAX_PROCESS-1;
- int parent_pid=getpid();
- using namespace vspace;
- vmem_init();
diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix
index 7cefd485d144..69e950867631 100644
--- a/pkgs/applications/version-management/git-and-tools/glab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE=";
};
- vendorSha256 = "sha256-P7gHCyFafjWOYLEtK9Eh2S2KA0e2hzc1G/ZqVaEWWB0=";
+ vendorSha256 = "sha256-hGpJXCs5lZ6QQHr6LW1fCT+CVtOaUpYXJPchDPDdbaM=";
ldflags = [
"-X main.version=${version}"
diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix
index 626e3db5ca50..30516aca4fe1 100644
--- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "glitter";
- version = "1.5.12";
+ version = "1.5.13";
src = fetchFromGitHub {
owner = "milo123459";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-XQ3HLmT3sWjoHTxnOU9FSHbnCwitFH0tOOpT7WwTEPE=";
+ sha256 = "sha256-arHwIQXZYxwnFbyLoKQiv3gYHEN80DxbdaO4dM9ZBs8=";
};
- cargoSha256 = "sha256-V54Itj7/zUO1bp0y30TjV1mSo/oNJOxEofpSqrYz6xk=";
+ cargoSha256 = "sha256-d+DERHE8Nzre1MXNj4Cp9fcRkLPEC8hzh0SeTpS2C5A=";
# tests require it to be in a git repository
preCheck = ''
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index f7b7305b1097..3f9d8442ea44 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -8,16 +8,16 @@ with lib;
buildGoModule rec {
pname = "gogs";
- version = "0.12.3";
+ version = "0.12.4";
src = fetchFromGitHub {
owner = "gogs";
repo = "gogs";
rev = "v${version}";
- sha256 = "0ix3mxy8cpqbx24qffbzyf5z88x7605icm7rk5n54r8bdsr7cckd";
+ sha256 = "sha256-t2aXRYCr54sqXwv6cJHDf1z1z94SqJM0WQRd2ejc7XY=";
};
- vendorSha256 = "0m0g4dsiq8p2ngsbjxfi3wff7x4xpm67qlhgcgf8b48mqai4d2gc";
+ vendorSha256 = "sha256-3dT5D+oDd0mpJp/cP53TQcRUkmqh6g3sRBWWAUqhaAo=";
subPackages = [ "." ];
diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix
index 61e938b093b3..50e826174792 100644
--- a/pkgs/applications/version-management/got/default.nix
+++ b/pkgs/applications/version-management/got/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "got";
- version = "0.64";
+ version = "0.66";
src = fetchurl {
url =
"https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
- sha256 = "1qigv8fnmiynrx6qrg28n2981a30n56nh3xbhmlpihl7fqxmg1sq";
+ sha256 = "13xrwndj80jix210fxkadivxyd1f5qavdrhxyl32n68xyv5xmkgg";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index 81b354fe1fff..34b6eb9c2862 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -36,12 +36,16 @@ in mkDerivation rec {
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ];
+ # plexmediaplayer currently segfaults under wayland
+ qtWrapperArgs = [ "--set" "QT_QPA_PLATFORM" "xcb" ];
+
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Streaming media player for Plex";
license = licenses.gpl2;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ b4dm4n ];
homepage = "https://plex.tv";
+ mainProgram = "plexmediaplayer";
};
}
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix
index 4c2a21fd4c2d..955d609d7a28 100644
--- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix
+++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix
@@ -2,19 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "cloud-hypervisor";
- version = "20.2";
+ version = "21.0";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-yIp1p8GyBojWKmvFRZ/OeyF2bjlqYsuXUrYTVunYV8Y=";
+ sha256 = "00b0ij9sfv7zsrgwrcj2rzpy1z8bp0m0lmzjp433xzpcgcnzw3w5";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
- cargoSha256 = "sha256-s2u6e2JbukPo3pXYzQJXP5d2G213u1+1ke9gZFnB+5g=";
+ cargoSha256 = "0lf7bb468s2ic9vabx954i46605gf7c6064vvwqvz7djk30z0y0d";
+
+ # Integration tests require root.
+ cargoTestFlags = [ "--bins" ];
meta = with lib; {
homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 1b6c340f7f0c..5718cadd4ffa 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -827,6 +827,8 @@ rec {
# this on, but tooling may disable this to insert the store paths more
# efficiently via other means, such as bind mounting the host store.
includeStorePaths ? true
+ , # Passthru arguments for the underlying derivation.
+ passthru ? {}
,
}:
assert
@@ -987,7 +989,7 @@ rec {
result = runCommand "stream-${baseName}"
{
inherit (conf) imageName;
- passthru = {
+ passthru = passthru // {
inherit (conf) imageTag;
# Distinguish tarballs and exes at the Nix level so functions that
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix
index c8a76b98367d..2ffb05e2eb96 100644
--- a/pkgs/data/misc/ddccontrol-db/default.nix
+++ b/pkgs/data/misc/ddccontrol-db/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "ddccontrol-db";
- version = "20210812";
+ version = "20220119";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = "ddccontrol-db";
rev = version;
- sha256 = "sha256-dRqyjDC9yNkNOnYQ9fkWPlnyzSqIZ4zxZ2T7t8Bu9FE=";
+ sha256 = "sha256-8JJ6RG7yA1ssoYsvgDYp3/r+h1+rKnOwwoDhRx2brY8=";
};
preConfigure = ''
diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
new file mode 100644
index 000000000000..06b0e32d1b7a
--- /dev/null
+++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, extra-cmake-modules
+, wrapQtAppsHook
+, kwin
+, kdelibs4support
+, libepoxy
+, libXdmcp
+, lib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "kde-rounded-corners";
+ version = "unstable-2021-11-06";
+
+ src = fetchFromGitHub {
+ owner = "matinlotfali";
+ repo = "KDE-Rounded-Corners";
+ rev = "8ad8f5f5eff9d1625abc57cb24dc484d51f0e1bd";
+ sha256 = "0xbskf7jd03d2invfz1nnfc82klzvc784snw539n4kn6c6rc381p";
+ };
+
+ postConfigure = ''
+ substituteInPlace cmake_install.cmake \
+ --replace "${kdelibs4support}" "$out"
+ '';
+
+ nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
+ buildInputs = [ kwin kdelibs4support libepoxy libXdmcp ];
+
+ meta = with lib; {
+ description = "Rounds the corners of your windows";
+ homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ flexagoon ];
+ };
+}
diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix
index a940a6f2cd63..936fe62c259b 100644
--- a/pkgs/desktops/gnome/games/tali/default.nix
+++ b/pkgs/desktops/gnome/games/tali/default.nix
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "tali";
- version = "40.4";
+ version = "40.5";
src = fetchurl {
url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "AsrMdvTuQjD2eqAK2hlOnFSPidJ6DnLyANi9U67nGhc=";
+ sha256 = "Y6CcVeRqGhl1a/XglXyvmUMA+tq9umvaYC5mjfzfcSI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix
index bf53e71a221c..425060e240d4 100644
--- a/pkgs/development/interpreters/lunatic/default.nix
+++ b/pkgs/development/interpreters/lunatic/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "lunatic";
- version = "0.7.4";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "lunatic-solutions";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-RX8JarGpY6dhPGpvOX1FuUjirEPff0wGqLkGFxOa+bc=";
+ sha256 = "sha256-HqDrGoyYzdx8OTanlRd95L1wAtFeew7Xs2rZ7nK2Zus=";
};
- cargoSha256 = "sha256-UvrDqxaZSgUJ/a6abigTuiUOfw+C7UolBApt5kVR+yo=";
+ cargoSha256 = "sha256-t3EwVYrKx7dvUcSp0B1iUAklg7WdQDld/T0O1HgHw54=";
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix
index d151c6765bf3..def2d7cb0c83 100644
--- a/pkgs/development/interpreters/rakudo/zef.nix
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zef";
- version = "0.13.4";
+ version = "0.13.6";
src = fetchFromGitHub {
owner = "ugexe";
repo = "zef";
rev = "v${version}";
- sha256 = "sha256-zTgXMICuLn612bmL5e6GP5aBQ4uOcSLfce0PCRYGob0=";
+ sha256 = "sha256-Bios3h2bcR6PntFt6JWF7l5u6gjKaljS8HsKfTf+0X8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index ca2f3b0e381d..134d9031e97e 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -6,13 +6,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "fflas-ffpack";
- version = "2.4.3";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "linbox-team";
repo = pname;
- rev = version;
- sha256 = "1ynbjd72qrwp0b4kpn0p5d7gddpvj8dlb5fwdxajr5pvkvi3if74";
+ rev = "v${version}";
+ sha256 = "sha256-Eztc2jUyKRVUiZkYEh+IFHkDuPIy+Gx3ZW/MsuOVaMc=";
};
checkInputs = [
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index 3a82b566a50f..7d4ff382d8c1 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
-, fetchpatch
+, pkg-config
, gettext
, autoreconfHook
, gmp
@@ -9,16 +9,17 @@
stdenv.mkDerivation rec {
pname = "fplll";
- version = "5.3.2";
+ version = "5.4.1";
src = fetchFromGitHub {
owner = "fplll";
repo = "fplll";
rev = version;
- sha256 = "00iyz218ywspizjiimrjdcqvdqmrsb2367zyy3vkmypnf9i9l680";
+ sha256 = "sha256-6Zde8/bPOQQ16DqhqrQuGXDrf5HQEn5lwxauvyBr4XQ=";
};
nativeBuildInputs = [
+ pkg-config
gettext
autoreconfHook
];
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 29674118dfee..83f7854a73b0 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }:
stdenv.mkDerivation rec {
pname = "givaro";
- version = "4.1.1";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "linbox-team";
repo = pname;
rev = "v${version}";
- sha256 = "11wz57q6ijsvfs5r82masxgr319as92syi78lnl9lgdblpc6xigk";
+ sha256 = "sha256-KR0WJc0CSvaBnPRott4hQJhWNBb/Wi6MIhcTExtVobQ=";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 24bec8ec350f..874c567ed42e 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
- version = "1.12.6";
+ version = "1.12.7";
src = fetchFromGitHub {
- sha256 = "sha256-k5Lt/NCSlBaTGhpR4T3Q4Ih+RR1xKROxz+RNYor7zaQ=";
+ sha256 = "sha256-a79/seKO6Efn6g4RWdqsP83pL5AIBAp1InjnMdOs3Qk=";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index 8e9a34716f2a..2a1ea4f606d7 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libamqpcpp";
- version = "4.3.15";
+ version = "4.3.16";
src = fetchFromGitHub {
owner = "CopernicaMarketingSoftware";
repo = "AMQP-CPP";
rev = "v${version}";
- sha256 = "sha256-S2/ecWC78Q4ihVLtDQ6DD8/qX1cDslnTjqd5IkKCjc4=";
+ sha256 = "sha256-aBLNdw9LhHFwnIt70vIYlX1/j2IUTmpm5Ub+ZImF8FI=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
index 52a88e2194d6..470b9137f6e1 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
@@ -46,5 +46,6 @@ in stdenv.mkDerivation {
license = licenses.bsd3;
maintainers = [ ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libtorrent-rasterbar-1_1_x.x86_64-darwin
};
}
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 821edd333692..0f650e7474ff 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -14,13 +14,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "linbox";
- version = "1.6.3"; # TODO: Check postPatch script on update
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "linbox-team";
repo = pname;
rev = "v${version}";
- sha256 = "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571";
+ sha256 = "sha256-mW84a98KPLqcHMjX3LIYTmVe0ngUdz6RJLpoDaAqKU8=";
};
nativeBuildInputs = [
@@ -35,20 +35,6 @@ stdenv.mkDerivation rec {
fflas-ffpack
];
- patches = [
- # Remove inappropriate `const &` qualifiers on data members that can be
- # modified via member functions.
- # See also: https://github.com/linbox-team/linbox/pull/256
- ./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update
- ];
-
- postPatch = ''
- # Remove @LINBOXSAGE_LIBS@ that is actually undefined.
- # See also: https://github.com/linbox-team/linbox/pull/249
- # TODO: Remove on 1.7.0 update
- find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \;
- '';
-
configureFlags = [
"--with-blas-libs=-lblas"
"--disable-optimization"
diff --git a/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch b/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch
deleted file mode 100644
index ec8571a7d710..000000000000
--- a/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/linbox/algorithms/det-rational.h
-+++ b/linbox/algorithms/det-rational.h
-@@ -79,8 +79,8 @@
- struct MyRationalModularDet {
- const Blackbox &A;
- const MyMethod &M;
-- const Integer &mul;//multiplicative prec;
-- const Integer ÷
-+ Integer mul;//multiplicative prec;
-+ Integer div;
-
- MyRationalModularDet(const Blackbox& b, const MyMethod& n,
- const Integer & p1, const Integer & p2) :
diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix
index 2ac1ba9536f6..60f5e51ae957 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/default.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "indilib";
- version = "1.9.3";
+ version = "1.9.4";
src = fetchFromGitHub {
owner = "indilib";
repo = "indi";
rev = "v${version}";
- sha256 = "sha256-Ik62kbOetA2vSMpnwrSiNRNJqOgmqlCB2+KNhpBo9TA=";
+ sha256 = "sha256-U3Q0WUEDRn0zfBIdHXFp5Zcaf+M6HrSFnpeu5aAkjks=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 3f0cf45062f1..b1896917658c 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -1,94 +1,38 @@
{ lib, stdenv
-, fetchurl
-, fetchpatch
+, autoreconfHook
+, gengetopt
+, pkg-config
+, fetchFromGitLab
, pari
}:
stdenv.mkDerivation rec {
- version = "1.23";
+ version = "2.0.5";
pname = "lcalc";
- src = fetchurl {
- # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available
- # "newer" version at google code https://code.google.com/archive/p/l-calc/source/default/source
- url = "mirror://sageupstream/lcalc/lcalc-${version}.tar.bz2";
- sha256 = "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43";
+ src = fetchFromGitLab {
+ owner = "sagemath";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc=";
};
- preConfigure = "cd src";
+ nativeBuildInputs = [
+ autoreconfHook
+ gengetopt
+ pkg-config
+ ];
buildInputs = [
pari
];
- patches = [
- # Port to newer pari
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/pari-2.7.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "1x3aslldm8njjm7p9g9s9w2c91kphnci2vpkxkrcxfihw3ayss6c";
- })
-
- # Uncomment the definition of lcalc_to_double(const long double& x).
- # (Necessary for GCC >= 4.6.0, cf. https://trac.sagemath.org/ticket/10892)
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/Lcommon.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "0g4ybvsrcv48rmlh1xjnkms19jp25k58azv6ds1f2cm34hxs8fdx";
- })
-
- # Include also in Lcommandline_numbertheory.h (at least required
- # on Cygwin, cf. https://trac.sagemath.org/ticket/9845)
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/time.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "1brf04n11kkc43ylagf8dm32j5r2g9zv51dp5wag1mpm4p04l7cl";
- })
-
- # Fix for gcc >4.6
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_1.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "0i2yvxm5fx4z0v6m4srgh8rj98kijmlvyirlxf1ky0bp2si6bpka";
- })
-
- # gcc 5.1
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_2.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vlh";
- })
-
- # based on gentoos makefile patch -- fix paths, adhere to flags
- ./makefile.patch
-
- # (fetchpatch {
- # name = "default-double.patch";
- # url = "https://github.com/dimpase/lcalc/pull/1/commits/0500c67b6aa1f492715591669f6647c8f7a3ea59.patch";
- # sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vla";
- # })
-
- (fetchpatch {
- name = "c++11.patch";
- url = "https://raw.githubusercontent.com/archlinux/svntogit-community/3607b97df5a8c231191115b0cb5c62426b339e71/trunk/lcalc-c++11.patch";
- sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3";
- })
- ] ++ lib.optional stdenv.isDarwin
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch";
- sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18";
- });
-
- postPatch = lib.optionalString stdenv.isDarwin ''
- substituteInPlace src/Makefile --replace g++ c++
- '';
-
- installFlags = [
- "DESTDIR=$(out)"
- ];
-
- makeFlags = [
- "PARI_DEFINE=-DINCLUDE_PARI"
- "PARI_PREFIX=${pari}"
+ configureFlags = [
+ "--with-pari"
];
meta = with lib; {
- homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html";
+ homepage = "https://gitlab.com/sagemath/lcalc";
description = "A program for calculating with L-functions";
license = with licenses; [ gpl2 ];
maintainers = teams.sage.members;
diff --git a/pkgs/development/libraries/science/math/lcalc/makefile.patch b/pkgs/development/libraries/science/math/lcalc/makefile.patch
deleted file mode 100644
index 5c22cf0b84e8..000000000000
--- a/pkgs/development/libraries/science/math/lcalc/makefile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 84e4e88..56ca676 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -58,7 +58,7 @@ ifeq ($(G5),TRUE)
- #MACHINE_SPECIFIC_FLAGS = -mpowerpc -mpowerpc64 -m64
- endif
-
--CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
-+CCFLAGS = $(CXXFLAGS) $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS)
- #CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
- #CCFLAGS = -Wa,-W -O2 -fno-exceptions -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
-
-@@ -68,12 +68,12 @@ CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MA
-
- ifeq ($(PARI_DEFINE),-DINCLUDE_PARI)
- #location of pari.h.
-- LOCATION_PARI_H = /usr/local/include/pari #usual location
-+ LOCATION_PARI_H = $(PARI_PREFIX)/include/pari #usual location
-
- #location of libpari.a or of libpari.so
- #depending on whether static or dynamic libraries are being used.
- #On mac os x it's the former, on linux I think usually the latter.
-- LOCATION_PARI_LIBRARY = /usr/local/lib #usual location
-+ LOCATION_PARI_LIBRARY = $(PARI_PREFIX)/lib #usual location
- else
- #supplied as a dummy so as to avoid more ifeq's below
- LOCATION_PARI_H = .
-@@ -89,24 +89,24 @@ INCLUDEFILES= -I../include
-
- ifeq ($(OS_NAME),Darwin)
- LDFLAGS2 =
-- DYN_OPTION=dynamiclib
-+ DYN_OPTION=-dynamiclib
- else
-- LDFLAGS1 = -Xlinker -export-dynamic #not sure why pari calls these when linking but on the web I found
-+ LDFLAGS1 = #not sure why pari calls these when linking but on the web I found
- #'Libtool provides the `-export-dynamic' link flag (see section Link mode), which does this declaration.
- #You need to use this flag if you are linking a shared library that will be dlopened'
- #see notes below
- #ifeq ($(PARI_DEFINE),-DINCLUDE_PARI)
-- LDFLAGS2 = $(LDFLAGS1) -Xlinker -rpath -Xlinker $(LOCATION_PARI_LIBRARY)
-+ LDFLAGS2 = $(LDFLAGS)
- #else
- # LDFLAGS2 = $(LDFLAGS1)
- #endif
-- DYN_OPTION=shared
-+ DYN_OPTION=$(LDFLAGS) -shared -Wl,-soname,libLfunction.so
- endif
-
- ifeq ($(PARI_DEFINE),-DINCLUDE_PARI)
-- LDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari
-+ MYLDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari
- else
-- LDFLAGS = $(LDFLAGS2)
-+ MYLDFLAGS = $(LDFLAGS2)
- endif
-
-
-@@ -129,7 +129,8 @@ endif
- #become clear which libraries the computer can find.
-
-
--INSTALL_DIR= /usr/local
-+INSTALL_DIR= $(DESTDIR)
-+LIB_DIR ?=lib
-
- #object files for the libLfunction library
- OBJ_L = Lglobals.o Lgamma.o Lriemannsiegel.o Lriemannsiegel_blfi.o Ldokchitser.o
-@@ -141,9 +142,8 @@ OBJECTS = $(OBJ3)
-
- all:
- # make print_vars
-- make libLfunction.so
-- make lcalc
-- make examples
-+ ${MAKE} libLfunction.so
-+ ${MAKE} lcalc
- # make find_L
- # make test
-
-@@ -151,7 +151,7 @@ print_vars:
- @echo OS_NAME = $(OS_NAME)
-
- lcalc: $(OBJECTS)
-- $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(LDFLAGS) -o lcalc $(GMP_FLAGS)
-+ $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(MYLDFLAGS) -o lcalc $(GMP_FLAGS)
-
- examples:
- $(CC) $(CCFLAGS) $(INCLUDEFILES) example_programs/example.cc libLfunction.so -o example_programs/example $(GMP_FLAGS)
-@@ -262,15 +262,18 @@ Lcommandline.o: ../include/Lcommandline_values_zeros.h
-
-
- libLfunction.so: $(OBJ_L)
-- g++ -$(DYN_OPTION) -o libLfunction.so $(OBJ_L)
-+ g++ $(DYN_OPTION) -o libLfunction.so $(OBJ_L)
-
- clean:
- rm -f *.o lcalc libLfunction.so example_programs/example
-
- install:
-- cp -f lcalc $(INSTALL_DIR)/bin/.
-- cp -f libLfunction.so $(INSTALL_DIR)/lib/.
-- cp -rf ../include $(INSTALL_DIR)/include/Lfunction
-+ install -d $(INSTALL_DIR)/bin
-+ install -d $(INSTALL_DIR)/$(LIB_DIR)
-+ install -d $(INSTALL_DIR)/include/Lfunction
-+ install lcalc $(INSTALL_DIR)/bin
-+ install libLfunction.so $(INSTALL_DIR)/$(LIB_DIR)
-+ install -m 644 -t $(INSTALL_DIR)/include/Lfunction ../include/*.h
-
-
- SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c
diff --git a/pkgs/development/libraries/science/math/primecount/default.nix b/pkgs/development/libraries/science/math/primecount/default.nix
index 7985b9d6dbd6..e1390ce6416e 100644
--- a/pkgs/development/libraries/science/math/primecount/default.nix
+++ b/pkgs/development/libraries/science/math/primecount/default.nix
@@ -15,6 +15,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo=";
};
+ cmakeFlags = [
+ "-DBUILD_STATIC_LIBS=OFF"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DBUILD_TESTS=ON"
+ "-DBUILD_PRIMECOUNT=ON"
+ "-DBUILD_LIBPRIMESIEVE=ON"
+ ];
+
meta = with lib; {
description = "Fast prime counting function implementations";
homepage = "https://github.com/kimwalisch/primecount";
diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix
index c3c4f8610c70..3bf22261f219 100644
--- a/pkgs/development/libraries/smarty3/default.nix
+++ b/pkgs/development/libraries/smarty3/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "smarty3";
- version = "3.1.39";
+ version = "3.1.44";
src = fetchFromGitHub {
owner = "smarty-php";
repo = "smarty";
rev = "v${version}";
- sha256 = "0n5hmnw66gxqikp6frgfd9ywsvr2azyg5nl7ix89digqlzcljkbg";
+ sha256 = "sha256-9a9OC18jyFpmFXffYOYHZ0j01j4NCF5zwrSYr1fZwqo=";
};
installPhase = ''
diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix
index 5b8f93d7bc7b..b17fbe16655b 100644
--- a/pkgs/development/libraries/soci/default.nix
+++ b/pkgs/development/libraries/soci/default.nix
@@ -1,5 +1,6 @@
{ cmake
, fetchFromGitHub
+, fetchpatch
, sqlite
, postgresql
, boost
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-NE0ApbX8HG2VAQ9cg9+kX3kJQ4PR1XvWL9BlT8NphmE=";
};
+ patches = [
+ (fetchpatch {
+ name = "fix-backend-search-path.patch";
+ url = "https://github.com/SOCI/soci/commit/56c93afc467bdba8ffbe68739eea76059ea62f7a.patch";
+ sha256 = "sha256-nC/39pn3Cv5e65GgIfF3l64/AbCsfZHPUPIWETZFZAY=";
+ })
+ ];
+
# Do not build static libraries
cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ];
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index bbee609eb267..6bb11139502f 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sofia-sip";
- version = "1.13.6";
+ version = "1.13.7";
src = fetchFromGitHub {
owner = "freeswitch";
repo = pname;
rev = "v${version}";
- sha256 = "0b1gq499ksgsi16f5nf3dzbj6s8knwkiak5j810jzdfm7vkm0vvm";
+ sha256 = "sha256-gBejwt5YAkCKQh0vzN00J4y1ifcdc4TglA+SqEevaGQ=";
};
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;
diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
index f8bae8997272..7959d1146f7c 100755
--- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
+++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
@@ -51,7 +51,7 @@ url="${ql_src##* }"
[ "$ql_src_type" = github ] && {
ql_src_type=git
url="https://github.com/$url";
- version="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)"
+ version="$("$(dirname "$0")/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)"
rev="refs/tags/$version";
}
@@ -62,7 +62,7 @@ url="${ql_src##* }"
) && {
url="${url/git:/https:}"
url="${url%.git}"
- [ -z "$rev" ] && rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename)
+ [ -z "$rev" ] && rev=$("$(dirname "$0")/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename)
hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | grep . | tail -n 1)
[ -z "$version" ] && version="git-$(date +%Y%m%d)";
}
@@ -131,7 +131,7 @@ url="${ql_src##* }"
[ "$ql_src_type" = froydware-http ] && {
dirurl="http://method-combination.net/lisp/files/";
- url="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$dirurl" |
+ url="$("$(dirname "$0")/urls-from-page.sh" "$dirurl" |
grep "/${url}_" | grep -v "[.]asc\$" | tail -n 1)"
ql_src_type=http
}
diff --git a/pkgs/build-support/upstream-updater/urls-from-page.sh b/pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh
similarity index 99%
rename from pkgs/build-support/upstream-updater/urls-from-page.sh
rename to pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh
index db39286ccb02..26724d122a77 100755
--- a/pkgs/build-support/upstream-updater/urls-from-page.sh
+++ b/pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh
@@ -6,7 +6,7 @@ path="${url#$protocol://}"
server="${path%%/*}"
basepath="${path%/*}"
relpath="${path#$server}"
-
+
echo "URL: $url" >&2
curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[^a-zA-Z][hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \
diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix
index b37c04a91779..4bc3532f5b57 100644
--- a/pkgs/development/python-modules/afsapi/default.nix
+++ b/pkgs/development/python-modules/afsapi/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "afsapi";
- version = "0.2.1";
+ version = "0.2.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "wlcrs";
repo = "python-afsapi";
rev = version;
- hash = "sha256-LBK32CwiYEa+R5VhcpVzMYklPAgombxl05rM/KWRyIU=";
+ hash = "sha256-C4rxlkylWGsDsnMPuecrC2ELj1PvP6EelZ/kzTn4Brk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 7770996f423d..9d1324053b39 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,24 +1,44 @@
-{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
+{ lib
+, buildPythonPackage
+, docutils
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, sphinx
+}:
buildPythonPackage rec {
- version = "4.31.0";
pname = "breathe";
- disabled = isPy27;
+ version = "4.32.0";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "925eeff96c6640cd857e4ddeae6f75464a1d5e2e08ee56dccce4043583ae2050";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "michaeljones";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-U85iLVS6bmA2Ty0AC4z2qODy9u4rWg6Nb42/k2Ix+kk=";
};
- propagatedBuildInputs = [ docutils six sphinx ];
+ propagatedBuildInputs = [
+ docutils
+ sphinx
+ ];
- doCheck = !isPy3k;
+ checkInputs = [
+ pytestCheckHook
+ ];
- meta = {
- homepage = "https://github.com/michaeljones/breathe";
- license = lib.licenses.bsd3;
+ pythonImportsCheck = [
+ "breathe"
+ ];
+
+ meta = with lib; {
description = "Sphinx Doxygen renderer";
+ homepage = "https://github.com/michaeljones/breathe";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
inherit (sphinx.meta) platforms;
};
}
-
diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix
index 97836b247a33..1bf4d6b4dab5 100644
--- a/pkgs/development/python-modules/django_reversion/default.nix
+++ b/pkgs/development/python-modules/django_reversion/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "django-reversion";
- version = "4.0.1";
+ version = "4.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "6991f16e5d3a972912db3d56e3a714d10b07becd566ab87f85f2e9b671981339";
+ sha256 = "sha256-XTO6lE2/GccDDJ5w43MSSK40Nozyr+3hDg0I+/ieb4w=";
};
# tests assume the availability of a mysql/postgresql database
diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix
index a0a4fb88e0cd..4a8987b16346 100644
--- a/pkgs/development/python-modules/environs/default.nix
+++ b/pkgs/development/python-modules/environs/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "environs";
- version = "9.4.0";
+ version = "9.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "sloria";
repo = pname;
rev = version;
- sha256 = "sha256-LPD46kxzQ/oTC7XjJn/SXaLQgX613ZoCrJuaRng57Gw=";
+ sha256 = "sha256-hucApIn7ul7+MC2W811VTxZNO8Pqb6HDXz9VRcEdmIc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
index 154742638b05..3550f1e17361 100644
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "exchangelib";
- version = "4.7.1";
+ version = "4.7.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "ecederstrand";
repo = pname;
rev = "v${version}";
- sha256 = "1kwb5ixlmxg0xxm4wms5r4kym220vbncr9afi9qc25g8npkbs860";
+ sha256 = "sha256-fdYc+fJEePgCzAkUWz7pmL/CI/O9zm5G9xh1f4bhrH4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix
index d23306be62bd..d73ad8d35c0d 100644
--- a/pkgs/development/python-modules/flask-paginate/default.nix
+++ b/pkgs/development/python-modules/flask-paginate/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "flask-paginate";
- version = "2021.12.28";
+ version = "2022.1.8";
src = fetchPypi {
inherit pname version;
- sha256 = "c722a25067d722483e24cde16ed987a822292ca758a213299e445694d2b5b587";
+ sha256 = "a32996ec07ca004c45b768b0d50829728ab8f3986c0650ef538e42852c7aeba2";
};
propagatedBuildInputs = [ flask ];
diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix
index da246966c932..1bff69e460e5 100644
--- a/pkgs/development/python-modules/fpylll/default.nix
+++ b/pkgs/development/python-modules/fpylll/default.nix
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
-, fetchpatch
, buildPythonPackage
, pkgconfig
, gmp
@@ -15,29 +14,15 @@
buildPythonPackage rec {
pname = "fpylll";
- version = "0.5.1dev";
+ version = "0.5.6";
src = fetchFromGitHub {
owner = "fplll";
repo = "fpylll";
rev = version;
- sha256 = "15vdfgx448mr1nf054h7lr2j3dd35fsfhikqzrh9zsng8n12hxa5";
+ sha256 = "sha256-Bxcc0941+pl2Uzam48qe+PFlcBWsJ0rDYZxrxIYQpEA=";
};
- patches = [
- # two patches to fix the testsuite on aarch64 (https://github.com/fplll/fpylll/issues/162)
- (fetchpatch {
- url = "https://github.com/fplll/fpylll/commit/d5809a8fdb86b2693b1fa94e655bbbe4ad80e286.patch";
- name = "less-precision-in-tests.patch";
- sha256 = "0vkvi25nwwvk5r4a4xmkbf060di4hjq32bys75l2hsaysxmk93nz";
- })
- (fetchpatch {
- url = "https://github.com/fplll/fpylll/commit/b5b146a010d50da219a313adc4b6f7deddcc146b.patch";
- name = "dont-hardcode-precision.patch";
- sha256 = "1rsbwh90i1j5p2rp6jd5n25v1jzw1n8728fzz1lhb91zmk0hlxc9";
- })
- ];
-
buildInputs = [
gmp
pari
diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix
index fac9ecba6ce9..3600e173f944 100644
--- a/pkgs/development/python-modules/httpx-socks/default.nix
+++ b/pkgs/development/python-modules/httpx-socks/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "httpx-socks";
- version = "0.7.2";
+ version = "0.7.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "romis2012";
repo = pname;
rev = "v${version}";
- sha256 = "1wigmkhn4ymfr12z9vhdaimjcma9llicwrr29q0cc8xmy23f3445";
+ sha256 = "11wnhx9nfsg5lsnlgh33zngyhc2klichpfrkwajbbyq95fdqj8ri";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index c44bfda13313..5318f2fd189b 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
- version = "1.18.1";
+ version = "1.18.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
- sha256 = "0xzx32fnm39w916z8wm387ry480rbf7n9qppc18bjdv4jjwgf2rw";
+ sha256 = "sha256-5GGY23MDsUbSC2tYGVqwwtFi5vnSldozMR4HuY+h+l4=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix
index 23ec7c33c205..ed31228dfdee 100644
--- a/pkgs/development/python-modules/lupupy/default.nix
+++ b/pkgs/development/python-modules/lupupy/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "lupupy";
- version = "0.1.1";
+ version = "0.1.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-bWBiM+u5wl9fWqL8k+R2IaYXSNnc4IxgWgUzyJVxkKk=";
+ sha256 = "sha256-oKc2x0T8KSSv9OB6U79QacBbvATDPecZFFKhFeBG39E=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix
index 73ddb17cac17..91e0303b4f04 100644
--- a/pkgs/development/python-modules/manimpango/default.nix
+++ b/pkgs/development/python-modules/manimpango/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "manimpango";
- version = "0.4.0.post1";
+ version = "0.4.0.post2";
src = fetchFromGitHub {
owner = "ManimCommunity";
repo = pname;
rev = "v${version}";
- sha256 = "1in9ibis91rlqmd7apbdp9c8y1mgnpm5bg6ldad8whx62nkkvwa3";
+ sha256 = "sha256-BMRlEdvJJOUbsvKEoZx2qJqHSbL475dhBthUpnsXkn4=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 4d578a97c78e..31edebe64308 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
- version = "0.14.6";
+ version = "0.14.7";
src = fetchPypi {
inherit pname version;
- sha256 = "46a87a8ee9e45e90c72e17ebb75190073e773f0890cfde7b81b0a36e15caec5d";
+ sha256 = "sha256-P4yibI2KQQtIK8G28rkutaaMejiygZY1l/EjTl9Mju8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix
index 58670c49a90b..a37e82a62d34 100644
--- a/pkgs/development/python-modules/md-toc/default.nix
+++ b/pkgs/development/python-modules/md-toc/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "md-toc";
- version = "8.1.0";
+ version = "8.1.1";
format = "setuptools";
disabled = pythonOlder "3.5";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "frnmst";
repo = pname;
rev = version;
- sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo=";
+ sha256 = "sha256-Dlqia+B7WJZlFGlIhgUWdND1qhSS/FOPoFH+uim6i8I=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index 6bc9635a66aa..064d8a8d203b 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "meross-iot";
- version = "0.4.4.3";
+ version = "0.4.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "albertogeniola";
repo = "MerossIot";
rev = version;
- sha256 = "sha256-qff8dB8q4NS7ZYQDIzD1dXOZL/UBGACSBuPDla1okA8=";
+ sha256 = "sha256-bazAhCsxr8UNV51UnaGbP7kTC6mcDNM7N78f0jy26ew=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 36656281675c..35ed3e06b729 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
- version = "1.2.77";
+ version = "1.2.78";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
- sha256 = "sha256-Z5YwZccyQ3LOuOf9NFuRQc8lYr6mbPp38Y4iIpD02CI=";
+ sha256 = "sha256-8P6K8sQ91kbd4o3mlHel12BFPFODcG/U0EnXJaxmknk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix
index 9d36c73bc3cf..63e795f98c85 100644
--- a/pkgs/development/python-modules/nameparser/default.nix
+++ b/pkgs/development/python-modules/nameparser/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "nameparser";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "bbd4831c72426757ec59674a1aad29c40bf411358a6d6e1cdd68002cbcb90d08";
+ sha256 = "sha256-zoM27XRk+nubh0X0i5xi3qa+2TG5lxXKlHk2BUSZIUM=";
};
LC_ALL="en_US.UTF-8";
diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index 83e4a9f6f731..5c30e14db74b 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -25,11 +25,11 @@
buildPythonPackage rec {
pname = "papermill";
- version = "2.3.3";
+ version = "2.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "349aecd526c15c39f73a08df836467e2fead877c474d82c7df349f27ad272525";
+ sha256 = "be12d2728989c0ae17b42fcb05b623500004e94b34f56bd153355ccebb84a59a";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index ca8133549164..c02e5c5ce0d5 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "pikepdf";
- version = "4.4.0";
+ version = "4.4.1";
disabled = ! isPy3k;
src = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
- hash = "sha256-AfHqKcb+ejEmY53irbIv9+1fPEczMgd7/VaFt01cNUs=";
+ hash = "sha256-8yYqyXz4ZqZxsk2Ka8S0rDsHaqO4l6cZTyNuVQuHkew=";
};
patches = [
diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix
index 2f80806c431a..72f0284756af 100644
--- a/pkgs/development/python-modules/pipx/default.nix
+++ b/pkgs/development/python-modules/pipx/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pipx";
- version = "0.17.0";
+ version = "1.0.0";
disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pipxproject";
repo = pname;
rev = version;
- sha256 = "sha256-vR/tKV+ZB0nZaxEcB83dwoSI7kBC1rA+6fo30rizroM=";
+ sha256 = "1sgfrlhci2m83k436dfwfmqjpb8hij6yypm03pm3n8drmr2aaa4s";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 91902a857448..92ab93256c57 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "plugwise";
- version = "0.15.4";
+ version = "0.16.0";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = "v${version}";
- sha256 = "0lp87vn9kh0xqng5mv5j914pgrbnhp54bisq76njijn32mgaw4qq";
+ sha256 = "1zgrq70ihkix39kf08h8xbjxa49800j9l6rn9nbgzwd25d7nlal0";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index dda98f7a8b78..1e641d79ec08 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -7,12 +7,13 @@
, colorful
, tomlkit
, git
+, packaging
, requests
}:
buildPythonPackage rec {
pname = "pontos";
- version = "22.1.1";
+ version = "22.1.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-p7E86McHeijsXpaByD5qLHYQLnSImLwHn15INyxWiZc=";
+ hash = "sha256-u/Mvk2/Wg0dB0OyTXllgV5sEV1h01HGZKLacPUxmeMA=";
};
nativeBuildInputs = [
@@ -31,6 +32,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
colorful
tomlkit
+ packaging
requests
];
@@ -39,6 +41,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'packaging = "^20.3"' 'packaging = "*"'
+ '';
+
disabledTests = [
# Signing fails
"test_find_no_signing_key"
@@ -48,7 +55,9 @@ buildPythonPackage rec {
"test_missing_cmd"
];
- pythonImportsCheck = [ "pontos" ];
+ pythonImportsCheck = [
+ "pontos"
+ ];
meta = with lib; {
description = "Collection of Python utilities, tools, classes and functions";
diff --git a/pkgs/development/python-modules/primecountpy/default.nix b/pkgs/development/python-modules/primecountpy/default.nix
new file mode 100644
index 000000000000..c2ad9ca512b0
--- /dev/null
+++ b/pkgs/development/python-modules/primecountpy/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, primecount
+, cython
+, cysignals
+}:
+
+buildPythonPackage rec {
+ pname = "primecountpy";
+ version = "0.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "78fe7cc32115f0669a45d7c90faaf39f7ce3939e39e2e7e5f14c17fe4bff0676";
+ };
+
+ buildInputs = [ primecount ];
+
+ propagatedBuildInputs = [ cython cysignals ];
+
+ # depends on pytest-cython for "pytest --doctest-cython"
+ doCheck = false;
+
+ pythonImportsCheck = [ "primecountpy" ];
+
+ meta = with lib; {
+ description = "Cython interface for C++ primecount library";
+ homepage = "https://github.com/dimpase/primecountpy/";
+ maintainers = teams.sage.members;
+ license = licenses.gpl3Only;
+ };
+}
diff --git a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix
index 4fbc259c188e..0a3ab7ff3a1c 100644
--- a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix
+++ b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "pycryptodome-test-vectors";
- version = "1.0.4";
+ version = "1.0.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-2+ZL8snmaB0tNxGZRbUM6SdfXZf4CM0nh3/wTOu9R50=";
+ hash = "sha256-oNfIVm7wyhgU9pgDhdP6BVJehuEw4d238GDaYMuAYLQ=";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix
index bd557c402ffb..dbd51166a22c 100644
--- a/pkgs/development/python-modules/python-lsp-black/default.nix
+++ b/pkgs/development/python-modules/python-lsp-black/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "python-lsp-black";
- version = "1.0.1";
+ version = "1.1.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python-lsp";
repo = "python-lsp-black";
rev = "v${version}";
- sha256 = "03k32m4jfqfzrawj69yxhk9kwzsdcwginip77kxdbra2xwgqfc3w";
+ sha256 = "sha256-WIQf1oz3b1PLIcXfQsu4hQ58nfp7l3J7zkcWNT6RbUY=";
};
checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix
index a1f466cfe67a..ebe0825a360d 100644
--- a/pkgs/development/python-modules/pywlroots/default.nix
+++ b/pkgs/development/python-modules/pywlroots/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "pywlroots";
- version = "0.15.3";
+ version = "0.15.4";
src = fetchPypi {
inherit pname version;
- sha256 = "sCHeiD6KugHZLtxcVcLggdHC1gqCxStuHy1065TbGiY=";
+ sha256 = "Cyj3B9uK1RoIuStCO+z9/bq7RjTPdjTqVhfc+tCRofo=";
};
# The XWayland detection uses some hard-coded FHS paths. Since we
diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix
index 7adef77210ab..76df76ba5965 100644
--- a/pkgs/development/python-modules/seatconnect/default.nix
+++ b/pkgs/development/python-modules/seatconnect/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "seatconnect";
- version = "1.1.3";
+ version = "1.1.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "farfar";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EOaFZch/C9N4lacZ4IqIJUVSaEn8wOFN/WN6WOL/1mo=";
+ sha256 = "sha256-NA/UiapJ/SyUmrj9hd2xGV5WWy1KhxwQtqGLV73TfHk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix
index 1b6d1033c456..6a0cbfb97b9b 100644
--- a/pkgs/development/python-modules/subarulink/default.nix
+++ b/pkgs/development/python-modules/subarulink/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "subarulink";
- version = "0.3.16";
+ version = "0.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "G-Two";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-7waY5AOONi+u056JRH9KcoBWSB4AlMw4QcMW0uoCARc=";
+ sha256 = "0mn3am1np653a3mq8rjly482a9x2rp6ss9zx997b6adk5vm3zasc";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index 4558b3afb26a..b854e09c0506 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "tablib";
- version = "3.1.0";
+ version = "3.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "d64c9f6712918a3d90ec5d71b44b8bab1083e3609e4844ad2be80eb633e097ed";
+ sha256 = "12d8686454c721de88d8ca5adf07e1f419ef6dbcecedf65e8950d4a329daf3a0";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
index d8cc7a9e0117..4db9297834f4 100644
--- a/pkgs/development/python-modules/timetagger/default.nix
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -9,13 +9,13 @@
python3Packages.buildPythonPackage rec {
pname = "timetagger";
- version = "22.1.3";
+ version = "22.1.4";
src = fetchFromGitHub {
owner = "almarklein";
repo = pname;
rev = "v${version}";
- sha256 = "1x0hy9wnifi694glwv6irhnjvwh1kgl6wn6qlk5qy4x6z6bkii24";
+ sha256 = "sha256-aOA/2SqvTpXtkURyJ2vf5gGqPpy5reN7/2zUUdaJvyA=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 85c5e10e8cb2..bdbe71809894 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "treq";
- version = "21.5.0";
+ version = "22.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "02ea86383fc4b57539c45a965eaa1e9fd28302cdf382d21da8430050c97be9b8";
+ sha256 = "sha256-d1WBYEkZo9echFQBWYoP0HDKvG3oOEBHLY6fpxXy02w=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix
index 3812a1c64f2c..7e602b2d3c16 100644
--- a/pkgs/development/python-modules/types-setuptools/default.nix
+++ b/pkgs/development/python-modules/types-setuptools/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
- version = "57.4.7";
+ version = "57.4.8";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-lnfZabAOwcFFUvW+KytHpvvqTQ7U3g/c7hir2qDMkmc=";
+ sha256 = "sha256-1VRfKrPa0k9cscAbp0way3QHqzGyYY1CMVj8hAhRYPE=";
};
# Module doesn't have tests
diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix
index 5224b57d6cff..915d11b5d8d1 100644
--- a/pkgs/development/python-modules/types-urllib3/default.nix
+++ b/pkgs/development/python-modules/types-urllib3/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-urllib3";
- version = "1.26.7";
+ version = "1.26.8";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-z9H7vkuppgXtFIKUAIqsinuLdHJlHRzDV9UHrlli49I=";
+ hash = "sha256-qg3iaJPxOFI9VVK7sCOCbAzH6ldJ2AwWk8V6q3tV9Gk=";
};
# Module doesn't have tests
diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index 2f950ecd6c44..472e8138591f 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "vowpalwabbit";
- version = "8.11.0";
+ version = "9.0.0";
src = fetchPypi{
inherit pname version;
- sha256 = "cfde0515a3fa4d224aad5461135372f3441ae1a64717ae6bff5e23509d70b0bd";
+ sha256 = "sha256-Ah6ITMdmbVay0CL7nR4vKRTlxbPfZFlqWaaBvU9olqk=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix
index 92d9a4a84873..54ebc888f1f4 100644
--- a/pkgs/development/python-modules/zeroc-ice/default.nix
+++ b/pkgs/development/python-modules/zeroc-ice/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zeroc-ice";
- version = "3.7.6";
+ version = "3.7.7";
src = fetchPypi {
inherit version pname;
- sha256 = "e8d8a7828e4994545bf57059bd0a0d431d387d31cc4af2eb5eeb93ef28c2d827";
+ sha256 = "415f4a673009fe9a5ef67b61c4469ddf14b73857b6d40f02d6b74f02ad935147";
};
buildInputs = [ openssl bzip2 ];
diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix
index 712f7ad1ca09..66f6bdb37a24 100644
--- a/pkgs/development/tools/air/default.nix
+++ b/pkgs/development/tools/air/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "air";
- version = "1.27.8";
+ version = "1.27.9";
src = fetchFromGitHub {
owner = "cosmtrek";
repo = "air";
rev = "v${version}";
- sha256 = "sha256-CVx4TDDAVIrJ3lnD2AIuxhmTV+/sIA0viX20zFkznNc=";
+ sha256 = "sha256-8VuCZoAV54TG8MiF6n5O8ZStGujfJ/7w95BYhe5/7dE=";
};
- vendorSha256 = "sha256-dloXz1hiKAQUmSQv1rLbE5vYrZpKAcwakC71AFXWZqM=";
+ vendorSha256 = "sha256-gUZPX1ymyzf0IuCpK8Nsq2UKPV5f9SAReJ6YxgpxpqE=";
subPackages = [ "." ];
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 9c64b4a078c9..dd3b2ae2bf26 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-3ZN/SCTQ5k0X4cqnrpp8Yt1QDnYkT2RbMLKpDfdWaxk=";
};
- vendorSha256 = "sha256-XBsYSA0i0q/mp8sQh9h//pjs+TbEDc7UIdNU24/Qemo=";
+ vendorSha256 = "sha256-UhES+jJil6+JmGH27p/LC/b5rZfHC4RIjA9nCFeB7Ao=";
doCheck = false;
diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix
index 33f9811ab836..979cbae99a20 100644
--- a/pkgs/development/tools/build-managers/scala-cli/default.nix
+++ b/pkgs/development/tools/build-managers/scala-cli/default.nix
@@ -1,15 +1,15 @@
{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:
let
- version = "0.0.9";
+ version = "0.1.0";
assets = {
x86_64-darwin = {
asset = "scala-cli-x86_64-apple-darwin.gz";
- sha256 = "sha256-1KwJuapqGhMEIMwrJp2LKlpYFtl+OP9DyaMtge9ZedI=";
+ sha256 = "sha256-YoMwtaif7q7Ht8fWRQRGeP03Pl5KTIUk8fGGKhelc68=";
};
x86_64-linux = {
asset = "scala-cli-x86_64-pc-linux.gz";
- sha256 = "sha256-IDXO+MgFlnT7VPugcQr/IGLZeD/vWFqJ0D0zVIbTtk4=";
+ sha256 = "sha256-YjMdhuo9hQCGtq1qYFKUY8S6nz8dpZt+PsngbF6r/C8=";
};
};
in
diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
index c10e5e7f459b..ea3968c38415 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-dtDciyQyTYhgYwqRCcxV0kAbPMl3KXhDM0BelPTWymA=";
};
- vendorSha256 = "sha256-mIXt3rWXQ6lVbV4hT7KRK7VZ4iFuDX6kZjgoE1WvJxI=";
+ vendorSha256 = "sha256-0BvZ7xLOr7htp3HVgRt3CzCxx2P62RXKhbzbWtGMLc0=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/development/tools/checkmate/default.nix
index d5aded2d8e10..98d9eb7936d9 100644
--- a/pkgs/development/tools/checkmate/default.nix
+++ b/pkgs/development/tools/checkmate/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-oBX1MSniVwXvq4Cy9uR3YqxaeSxeWg38oBlCiBy6z/8=";
};
- vendorSha256 = "sha256-rlwph9oQXgesLHjrtD+H4zvT2ekTeqZFgRBjXoyFltM=";
+ vendorSha256 = "sha256-+O0EQRbqLCMBlaI2mejAId2/KFdPWkJ/i7B81tQykzk=";
subPackages = [ "." ];
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index a1d1453cb104..f200cd742d90 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}";
sha256 = "sha256-8/eZz5ejw5bahCYwz825HI+oZ6D1odeTpMIJh0TcGMY=";
};
- vendorSha256 = "sha256-rYWo0t6iUI6DVsjHJg2fUv2tv3jovndi12prKzLaMlI=";
+ vendorSha256 = "sha256-wvOtBK3lRK7XwgeClywowgrZLohltSTGdoB+j3NRmkE=";
ldflags = [
"-s"
diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix
index 6090bc1d75b7..4ac007f0887a 100644
--- a/pkgs/development/tools/database/clickhouse-backup/default.nix
+++ b/pkgs/development/tools/database/clickhouse-backup/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-ThN1uvofIvV5Dt6dqxLpekTRy9pV4xb0bkVNRcfNJ2c=";
};
- vendorSha256 = "sha256-OQGpWWerUv2asjpjMLAkgeb0Q+lMAsDXjFCh0I4ze20=";
+ vendorSha256 = "sha256-bz21YeEONXD08HD1/8vn+NfGniXkGo7/8bQXLpRFmaM=";
postConfigure = ''
export CGO_ENABLED=0
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index 5348d0be88c8..d66950829f9c 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dbmate";
- version = "1.12.1";
+ version = "1.13.0";
src = fetchFromGitHub {
owner = "amacneil";
repo = "dbmate";
rev = "v${version}";
- sha256 = "sha256-XNxy8CnhO3rQi3VHr7nikFNXvY2eM30jR0ngNc0FV3E=";
+ sha256 = "sha256-j7u8TidiuaA5SbXoD+p23wwTsePi6/hzNdVS5IJMEh0=";
};
- vendorSha256 = "sha256-Qe3fwyEf/NiGmUSha/zZHRBR1okw2vE97u7tybqiWNI=";
+ vendorSha256 = "sha256-GEJ8n0VN9Qt73dRj7Qjx1DAomSy+hQEH74Dx2h/hv9M=";
doCheck = false;
diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix
index f312b522add3..2d1548bd86e0 100644
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- hash = "sha256-Cg85NdbbZs0tkBy2kq5ZRKDuQwLIixdhggOBSFpUM04=";
+ hash = "sha256-KNYxHBtPRsxEFrBJsfz5G7ZRZpVQxOph9UUKKhbHA9Y=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix
index 61d8ea77f3e3..31174ea7a1af 100644
--- a/pkgs/development/tools/ddosify/default.nix
+++ b/pkgs/development/tools/ddosify/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-QLJB2WcnguknEMdgwJzltp++mJCL4cFOWU568aTk0sc=";
};
- vendorSha256 = "sha256-TY8shTb77uFm8/yCvlIncAfq7brWgnH/63W+hj1rvqg=";
+ vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU=";
ldflags = [
"-s -w"
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 9f31ebb0af42..a06cc0f1c41a 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
- version = "1.68.0";
+ version = "1.69.0";
vendorSha256 = null;
@@ -31,7 +31,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
- sha256 = "sha256-3W6jDMT4UUtSND9bJJEexQ9LrqxL4oZtpucdcM1McdE=";
+ sha256 = "sha256-Bm6Xrgp/6/NpIndCVRDamKndBbCANnW5j3vOVRVxnE4=";
};
meta = with lib; {
diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix
index c6cc57e14c5c..a18b3b67fdc1 100644
--- a/pkgs/development/tools/earthly/default.nix
+++ b/pkgs/development/tools/earthly/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "earthly";
- version = "0.6.2";
+ version = "0.6.4";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
- sha256 = "sha256-a2NNpQvbhMY66nbk4RAXFb/o1qR5OXPm93ujzS2cxp4=";
+ sha256 = "sha256-QrlxH9ihWAVzf9lh3CcVCqFPLmn7bM2pNZUqxnHD2WA=";
};
- vendorSha256 = "sha256-0wyefhY/KR79K9DDI4/8EaA/DFI1rf6wxsBIAZo+rUI=";
+ vendorSha256 = "sha256-pI5aBBUJoAmeJ2Kr0eqP9O/tGhgHCBjINL3406LQ9Dc=";
ldflags = [
"-s" "-w"
diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/development/tools/ec2-metadata-mock/default.nix
index 1a2fd8ec0f70..197105ee646d 100644
--- a/pkgs/development/tools/ec2-metadata-mock/default.nix
+++ b/pkgs/development/tools/ec2-metadata-mock/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-k4YzG4M+r6BHc4DdAMXoUvVDTJqmzr8vIL1J6kbJBeY=";
};
- vendorSha256 = "sha256-uq0gcpFzAcz1HMwI1ZjHykWU93bV2U5kxC/G+J4ob7Q=";
+ vendorSha256 = "sha256-bI1W6KdXIq5HsoXDOq93Le2vePAAgvqy/lXm/N1F+yU=";
postInstall = ''
mv $out/bin/{cmd,ec2-metadata-mock}
diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix
index f70767a05919..004774334b91 100644
--- a/pkgs/development/tools/electron/generic.nix
+++ b/pkgs/development/tools/electron/generic.nix
@@ -19,7 +19,7 @@
version: hashes:
let
- name = "electron-${version}";
+ pname = "electron";
meta = with lib; {
description = "Cross platform desktop application shell";
@@ -54,7 +54,7 @@ let
"Unsupported system: ${platform.system}";
common = platform: {
- inherit name version meta;
+ inherit pname version meta;
src = fetcher version (get tags platform) (get hashes platform);
passthru.headers = headersFetcher version hashes.headers;
};
diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index 4995fbe1c3dc..9970fb77cbc4 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
- version = "0.14.11";
+ version = "0.14.13";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
- sha256 = "sha256-hS+LJfYB+nH5z/UA6RKdqA8qc1jT9Gskt6LufHCiqv8=";
+ sha256 = "sha256-DBu6j8UjbRVMoT0j/WwtVlJ+k3VwVKFbX2tdUs0neDs=";
};
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix
index 4648942d709b..29dadf243043 100644
--- a/pkgs/development/tools/evans/default.nix
+++ b/pkgs/development/tools/evans/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
subPackages = [ "." ];
- vendorSha256 = "sha256-bFTmr/xQ12cboH1MGvHDUpLM0dMkxMeLgwG0VbhMEnc=";
+ vendorSha256 = "sha256-ICGnjI9sFwt81rZCnap/rggfSs4+pZNmLouoTY7CYKw=";
meta = with lib; {
description = "More expressive universal gRPC client";
diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix
index fb6a4f496248..715c237f494b 100644
--- a/pkgs/development/tools/frugal/default.nix
+++ b/pkgs/development/tools/frugal/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "frugal";
- version = "3.14.12";
+ version = "3.14.13";
src = fetchFromGitHub {
owner = "Workiva";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2fXefYvcclcxMeX6JtHjoVNRwJTsUAhxet646BDPHic=";
+ sha256 = "sha256-apX4MFzeR7+5gWauw5HXPK0c7N4uTSqkE2vqnYB5LJs=";
};
subPackages = [ "." ];
diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index 0566f0276fbd..49404d051344 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ginkgo";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
- sha256 = "sha256-a3AZ/7UfB9qjMK9yWHSaBRnDA/5FmIGGxXAvNhcfKCc=";
+ sha256 = "sha256-GF96AOyQcVI01dP6yqMwyPmXMDRVxrScu1UL76jF2qA=";
};
vendorSha256 = "sha256-kMQ60HdsorZU27qoOY52DpwFwP+Br2bp8mRx+ZwnQlI=";
doCheck = false;
diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix
index 487edcde9980..cba623dec790 100644
--- a/pkgs/development/tools/github/bump/default.nix
+++ b/pkgs/development/tools/github/bump/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8=";
};
- vendorSha256 = "sha256-2x5rQGEp6ARP2nggE+tvXDRY7AkKCEUXTLEPWDJMCnI=";
+ vendorSha256 = "sha256-ZeKokW6jMiKrXLfnxwEBF+wLuFQufnPUnA/EnuhvrwI=";
doCheck = false;
diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix
index 4f3a32fc3995..f96683322443 100644
--- a/pkgs/development/tools/go-swagger/default.nix
+++ b/pkgs/development/tools/go-swagger/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-sahInHXv1GtylsY8kpw1dDjKiENmq4myx+7mq60vJAI=";
};
- vendorSha256 = "sha256-DL2eN277cXfsw1dDvIbzkJRuKThgqFOzIufPQVpUzmU=";
+ vendorSha256 = "sha256-KLV6ABo1K+KtAzAQ4FcFiK1LAZEsKup+BtgjRJfonAY=";
doCheck = false;
diff --git a/pkgs/development/tools/gokart/default.nix b/pkgs/development/tools/gokart/default.nix
index 7722e0b36afe..f7d0857580ef 100644
--- a/pkgs/development/tools/gokart/default.nix
+++ b/pkgs/development/tools/gokart/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gokart";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "praetorian-inc";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-iXdPQkKTRE2BE2yG2KKThpj7HrxXWwBFv2TobEwGLQQ=";
+ sha256 = "sha256-HsjLNY5Z5UidsLDWSP+1bu3jrfn3oAERPrPV/AkTH8I=";
};
- vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd";
+ vendorSha256 = "sha256-S3RukCKAJnPH1KGVdnkgAJQKEDTZYpcMMdoQ4OnHZVg=";
# Would need files to scan which are not shipped by the project
doCheck = false;
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index b9020f2cc0ed..7f89961f9f80 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:
stdenv.mkDerivation rec {
- version = "2.1.1";
+ version = "2.1.2";
pname = "visualvm";
src = fetchzip {
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
- sha256 = "sha256-LXMPdzIOFPzFUx3uufx+2UeJ6mg/9kJXGews4KU3rrU=";
+ sha256 = "sha256-khbXzdsC0PA10HEu/dIFQ87+QbKpctmTUTt/zEuxV6c=";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix
index 341df436e294..a08b10c19505 100644
--- a/pkgs/development/tools/konstraint/default.nix
+++ b/pkgs/development/tools/konstraint/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "konstraint";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "plexsystems";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-vt8/hYsThBoAxMglF8pjdVphmkbHXsuzaHFJhnGXdU4=";
+ sha256 = "sha256-j1rVkI5hXYtY0jtP+i/yRw1sS3iN3KyVI4gV9fNdj/E=";
};
- vendorSha256 = "sha256-3m+mN90Edb/yMgVmkokRQrDM2EdB7cb2opL0QZJ8L+U=";
+ vendorSha256 = "sha256-oYIUeHMEK55mCkf5cb5ECCU5y6tUZAM258sINrBl9kM=";
# Exclude go within .github folder
excludedPackages = ".github";
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 77fe16c442d3..5e7d4e348fda 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-IsFvUWNuQsECh47M6wDpuyDYXrKKaZp2SSmEGFryzM0=";
};
- vendorSha256 = "sha256-efrjHwHobML/t2lDSFx+UyAOca9dHjZHcAxkFzJqWEo=";
+ vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U=";
doCheck = false;
diff --git a/pkgs/development/tools/misc/luarocks/default.upstream b/pkgs/development/tools/misc/luarocks/default.upstream
deleted file mode 100644
index e69de1fe8895..000000000000
--- a/pkgs/development/tools/misc/luarocks/default.upstream
+++ /dev/null
@@ -1 +0,0 @@
-url http://luarocks.org/releases/
diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index 9d2d9b3962c0..c7d22015d47a 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -19,11 +19,11 @@ let
in buildPythonApplication rec {
pname = "pipenv";
- version = "2021.11.23";
+ version = "2022.1.8";
src = fetchPypi {
inherit pname version;
- sha256 = "1bde859e8bbd1d21d503fd995bc0170048d6da7686ab885f074592c99a16e8f3";
+ sha256 = "f84d7119239b22ab2ac2b8fbc7d619d83cf41135206d72a17c4f151cda529fd0";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix
index f1e21641c35f..ccc8e88dec8b 100644
--- a/pkgs/development/tools/rnix-lsp/default.nix
+++ b/pkgs/development/tools/rnix-lsp/default.nix
@@ -1,19 +1,19 @@
-{ lib, fetchFromGitHub, rustPlatform, nix }:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, nix }:
rustPlatform.buildRustPackage rec {
pname = "rnix-lsp";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "nix-community";
repo = "rnix-lsp";
rev = "v${version}";
- sha256 = "sha256-D2ItR8z4LqEH1IL53vq/wPh9Pfe3eB0KsA79aLM/BWM=";
+ sha256 = "sha256-MfD07ugYYbcRaNoLxOcH9+SPbRewNxbHJA5blCSb4EM=";
};
- cargoSha256 = "sha256-71vH8oc8DmwbwM2PgxjGmWAbyC4AByx7waHxLsr2koI=";
+ cargoSha256 = "sha256-23TJrJyfCuoOOOjZeWQnF/Ac0Xv2k6tZduuzapKvsgg=";
- checkInputs = [ nix ];
+ checkInputs = lib.optional (!stdenv.isDarwin) nix;
meta = with lib; {
description = "A work-in-progress language server for Nix, with syntax checking and basic completion";
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index da4345c0e44c..24d309eb68aa 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
- version = "0.35.7";
+ version = "0.35.8";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-rMeaKzCGY9jRrw8GaGtgm1rg3FIdaX/P+bOZRAtAI/s=";
+ sha256 = "sha256-YNPAIdN9FDUHs/5aCYJN+1/12ZYk1YJsUjjB1a09KvA=";
};
nativeBuildInputs = [ pkg-config ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
- cargoSha256 = "sha256-ZXQM2ij9Cpa5WCEHhcDc/tThfKZ7s1URmYsmqRg73m0=";
+ cargoSha256 = "sha256-xLFBF8fEbupLgFNdYC1NzM6p7O2gvsv0Utk4Et2oBDc=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
index 4416ce1b6cdc..3a36a00c73ec 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
- version = "0.2.78";
+ version = "0.2.79";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-5s+HidnVfDV0AXA+/YcXNGVjv/E9JeK0Ttng4mCVX8M=";
+ sha256 = "sha256-3kWhhzYmIo/GFieI0i7XVJIZxIaaJHHuDp38k5xcFmI=";
};
- cargoSha256 = "sha256-CbtjUFwowP/QqyAMCzmUiSib4EpRhQAmO4ekX00xYGE=";
+ cargoSha256 = "sha256-xKYdvcrx3a9AKiRU8yJ3JNQp1Q2pEufwo+in82yTV6c=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index 5d0108083655..b8508860112a 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-1jPYrZgA1Sg8Cvhfd7BULcpePHH/Buczvgu92KrkSg8=";
};
- vendorSha256 = "sha256-5GPSyBWiQZ7Yb//JjPyamqvoeMdhvtuKpzOJZVjSREw=";
+ vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE=";
doCheck = false;
diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index aea8ba6b19aa..ec75f5854b23 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
- version = "9.2.0";
+ version = "9.3.1";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
- sha256 = "sha256-NxmGMHAEVuFl/3YgcHSbg+yWHB2tRpVTWlP5p5nGtPc=";
+ sha256 = "0626i5nxymh9hh9kf1mkky165cynsrkfw402xqmf69pnyzbzn0h7";
};
# don't remove runtime deps
diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix
index 094330faffbb..bb44d9eee0b6 100644
--- a/pkgs/games/openttd/nml.nix
+++ b/pkgs/games/openttd/nml.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "openttd-nml";
- version = "0.5.3";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "OpenTTD";
repo = "nml";
rev = version;
- sha256 = "0kfnkshff3wrxsj1wpfbbw2mmgww2q80v63p5d2pp1f38x8j33w9";
+ sha256 = "0z0n4lqvnqigfjjhmmz7mvis7iivd4a8d287ya2yscfg5hznnqh2";
};
propagatedBuildInputs = with python3Packages; [ply pillow];
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 8c6724d9e3f5..35564704f68b 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -13,13 +13,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
- version = "2021.1225.0";
+ version = "2022.118.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
- sha256 = "sha256-kN5pR37b0giKGJVnJo/Mce+MWFwZiY+mZAHG/fUt0O4=";
+ sha256 = "sha256-/BzoLiQLiBcWqThzDOVb4Y7s6WhcKnCRRhAzUi5Jstk=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index e6ebf8483016..7bf9a89e50f3 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -1,12 +1,12 @@
{ fetchNuGet }: [
- (fetchNuGet { pname = "AutoMapper"; version = "10.1.1"; sha256 = "1l1p9g7f7finr8laklbm7h2c45k0swl47iq0ik68js5s6pzvd6f8"; })
+ (fetchNuGet { pname = "AutoMapper"; version = "11.0.0"; sha256 = "1ni9mmrqfbspwf7xz6by5415ci5zhg15z3f7596qqpmbn8bqg7wq"; })
(fetchNuGet { pname = "DeltaCompressionDotNet"; version = "2.0.0.0"; sha256 = "0zhj7m3zaf9wcg51385in9qg1xgkvp8yyzgq3r5k4sagm7y68aqy"; })
(fetchNuGet { pname = "DiffPlex"; version = "1.7.0"; sha256 = "09a8hkbx99iwikfl8war629945yv7i8llj9480dbc4kyp6qqlr00"; })
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; })
(fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; })
(fetchNuGet { pname = "Fody"; version = "6.6.0"; sha256 = "0cx708ah61cxmvpaq040mhqwrv937rvlmskwihg1w118729k9yv0"; })
(fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; })
- (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.39"; sha256 = "05rlw9h3ps1gx4pwdxjwpx1lajyvj1b35j3536ixfmnnvjx4v2yj"; })
+ (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.40"; sha256 = "0k1cpkfgz4v5qigvmmvlk8lv2a731kqkmx6acf3rzr8rlj3cfnc4"; })
(fetchNuGet { pname = "Humanizer"; version = "2.13.14"; sha256 = "155g2700x6sbym2jd4dshm4rf3jjr8flx6w9xnw28zrrv7r2rdy8"; })
(fetchNuGet { pname = "Humanizer.Core"; version = "2.13.14"; sha256 = "1ni4mcyhcs46ih9b8c8l3xq3iai56rdlcw0afwhji3hxwbxqbk7i"; })
(fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; })
@@ -156,14 +156,14 @@
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; })
(fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; })
(fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.1210.0"; sha256 = "0dn6fc31yllr5nizylvkfl2b603b5m9694nsn5mmkh8w43h0rkbq"; })
- (fetchNuGet { pname = "ppy.osu.Framework"; version = "2021.1225.0"; sha256 = "1md0zsjwi8zx2az42cch1wgvb5ygscncmpc4ysgz1pl6jn02v3by"; })
+ (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.118.0"; sha256 = "1c81r8s9zivj9hany0yqsza1y3nhh24zbkwwnjm0m6z4mls04l1y"; })
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.1221.0"; sha256 = "1ffxp4nsgbqw1f6nypirmc0a3h203qikbmxm2x8w3kgcfga5dx3k"; })
- (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2021.1215.0"; sha256 = "1aarb8wkzz31xa8fa6g5axwmvx89ix66ygbqq7zcyz8k9yy2ilh1"; })
+ (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.115.0"; sha256 = "0w2hnci93644ayfpgpsyxsifz38yklvn42fkgd860i3mn04lyl2z"; })
(fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; })
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.486-alpha"; sha256 = "0hp6wfjgpwdgy1ag2bpjkyalw92k6qg9pc5mriij6a5vhxzadhk3"; })
(fetchNuGet { pname = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; })
- (fetchNuGet { pname = "Realm"; version = "10.7.1"; sha256 = "058jigmsxvzb7571ll9qkf0hwmgff5zddfq4pqvnzkf87i5kd2kq"; })
- (fetchNuGet { pname = "Realm.Fody"; version = "10.7.1"; sha256 = "1m3cglh39fr84pr3nr7q1hyiq83gqj0m6h8m79wl96g5xxq5v6pa"; })
+ (fetchNuGet { pname = "Realm"; version = "10.8.0"; sha256 = "1ixpms8x9z5ia9yiqvhmgdlcrjvqrhbqnr8b9z6mlxwcms1z2f45"; })
+ (fetchNuGet { pname = "Realm.Fody"; version = "10.8.0"; sha256 = "0hj3cqan96y01k5qgs0knkqzg3rlr2794az68xqffd2vqphvqvqq"; })
(fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; })
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
@@ -185,7 +185,7 @@
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
- (fetchNuGet { pname = "Sentry"; version = "3.12.1"; sha256 = "1bqldqc0bnrxdgfxh71w3vjf3cygcn6jyrhxmjvikciirlgcs3cz"; })
+ (fetchNuGet { pname = "Sentry"; version = "3.13.0"; sha256 = "0wnivy7rhzghr94pdczv7kw72y1hv5kp6hw0fkmw1nfgnsh4qjfm"; })
(fetchNuGet { pname = "SharpCompress"; version = "0.17.1"; sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; })
(fetchNuGet { pname = "SharpCompress"; version = "0.30.1"; sha256 = "1hib2hxjrlikwsczym1qn2slaapgjw8qzd8gmid8bryaz8hv044h"; })
(fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; })
@@ -276,7 +276,6 @@
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; })
- (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; })
diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index fc32607adac7..1ff9f9d36d15 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "VASSAL";
- version = "3.6.1";
+ version = "3.6.4";
src = fetchzip {
url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
- sha256 = "sha256-elcSwm7KvDpGVBF7Gs6GFreQPyVwWBxYN0NO1N6JWDM=";
+ sha256 = "sha256-WUEpYxzNcH9kJRn4nROoaeXTe1+D4/0VRqTwc7ac1hc=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index bfe2cae5120f..ca0de2f82766 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "vice";
- version = "3.6";
+ version = "3.6.1";
src = fetchurl {
url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz";
- sha256 = "sha256-Zb/lXM5ifbm1oKx4dqkMCH6f6G6fVRfoCURsQGSi0/0=";
+ sha256 = "sha256-IN+EyFGq8vUABRCSf20xsy8mmRbTUUZcNm3Ar8ncFQw=";
};
nativeBuildInputs = [
diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index 594561593e5a..ef1d7b140144 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -10,10 +10,10 @@
}:
let
- version = "1.21";
+ version = "1.22";
prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
- sha256 = "sha256-28zKtSPuJnluVeozZSZJ5LevSY7a6ap15NTXhpwKuEg=";
+ sha256 = "sha256-wF0nPux1M8DhBiguAlTPBOf16PDCkgyjlEiGX6sqQZs=";
};
in
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-9MzOaQj+lR1F+E/yoxbL/HMOOuKOU82zkPVq7x6AH3c=";
+ sha256 = "sha256-bYLvrCw6NNCZqgLWIEObnytgD74cE9pm/Z7dgB8S5x0=";
};
# postPatch:
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 8ff8fee2b1ef..bbfbc697246e 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -243,8 +243,8 @@ let
mktplcRef = {
name = "vscode-pylance";
publisher = "MS-python";
- version = "2020.11.2";
- sha256 = "0n2dm21vgzir3hx1m3pmx7jq4zy3hdxfsandd2wv5da4fs9b5g50";
+ version = "2022.1.5";
+ sha256 = "1b5ihrac9xsq35a39vlq7krr1ffqpdjxdlhv9s056hs033kayazl";
};
buildInputs = [ nodePackages.pyright ];
@@ -1494,6 +1494,18 @@ let
};
};
+ roman.ayu-next = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "ayu-next";
+ publisher = "roman";
+ version = "1.2.9";
+ sha256 = "sha256-rwZnqvHRmMquNq9PnU176vI4g8PtS6wSNvQaZ1BMa4I=";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
rubbersheep.gi = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gi";
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index b8a017adcf42..9e21955808f8 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -66,6 +66,8 @@ stdenv.mkDerivation rec {
./busybox-in-store.patch
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
+ separateDebugInfo = true;
+
postPatch = "patchShebangs .";
configurePhase = ''
@@ -120,6 +122,8 @@ stdenv.mkDerivation rec {
makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
'';
+ makeFlags = [ "SKIP_STRIP=y" ];
+
postInstall = ''
sed -e '
1 a busybox() { '$out'/bin/busybox "$@"; }\
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index e2346cca95c7..380d76844c80 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -8,12 +8,12 @@ let
_kernel = kernel;
pythonEnv = python3.withPackages (ps: with ps; [ six ]);
in stdenv.mkDerivation rec {
- version = "2.15.1";
+ version = "2.16.2";
pname = "openvswitch";
src = fetchurl {
url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz";
- sha256 = "0vgijwycf3wvzv9v811jrfr5rlwmihlxwpf16spl6k9n6zaswysw";
+ sha256 = "sha256-A6xMMpmzjlbAtNTCejKclYsAOgjztUigo8qLmU8tSTQ=";
};
kernel = optional (_kernel != null) _kernel.dev;
diff --git a/pkgs/os-specific/linux/sgx/samples/default.nix b/pkgs/os-specific/linux/sgx/samples/default.nix
new file mode 100644
index 000000000000..f9c5ae450545
--- /dev/null
+++ b/pkgs/os-specific/linux/sgx/samples/default.nix
@@ -0,0 +1,109 @@
+{ stdenv
+, lib
+, makeWrapper
+, sgx-sdk
+, sgx-psw
+, which
+ # "SIM" or "HW"
+, sgxMode
+}:
+let
+ isSimulation = sgxMode == "SIM";
+ buildSample = name: stdenv.mkDerivation {
+ pname = name;
+ version = sgxMode;
+
+ src = sgx-sdk.out;
+ sourceRoot = "${sgx-sdk.name}/share/SampleCode/${name}";
+
+ nativeBuildInputs = [
+ makeWrapper
+ which
+ ];
+
+ buildInputs = [
+ sgx-sdk
+ ];
+
+ # The samples don't have proper support for parallel building
+ # causing them to fail randomly.
+ enableParallelBuilding = false;
+
+ buildFlags = [
+ "SGX_MODE=${sgxMode}"
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/{bin,lib}
+ install -m 755 app $out/bin
+ install *.so $out/lib
+
+ wrapProgram "$out/bin/app" \
+ --run "cd $out/lib" \
+ ${lib.optionalString (!isSimulation)
+ ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''}
+
+ runHook postInstall
+ '';
+
+ # Breaks the signature of the enclaves
+ dontFixup = true;
+
+ # We don't have access to real SGX hardware during the build
+ doInstallCheck = isSimulation;
+ installCheckPhase = ''
+ runHook preInstallCheck
+
+ pushd /
+ echo a | $out/bin/app
+ popd
+
+ runHook preInstallCheck
+ '';
+ };
+in
+{
+ cxx11SGXDemo = buildSample "Cxx11SGXDemo";
+ localAttestation = (buildSample "LocalAttestation").overrideAttrs (oldAttrs: {
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/{bin,lib}
+ install -m 755 bin/app* $out/bin
+ install bin/*.so $out/lib
+
+ for bin in $out/bin/*; do
+ wrapProgram $bin \
+ --run "cd $out/lib" \
+ ${lib.optionalString (!isSimulation)
+ ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''}
+ done
+
+ runHook postInstall
+ '';
+ });
+ powerTransition = buildSample "PowerTransition";
+ protobufSGXDemo = buildSample "ProtobufSGXDemo";
+ remoteAttestation = (buildSample "RemoteAttestation").overrideAttrs (oldAttrs: {
+ # Makefile sets rpath to point to $TMPDIR
+ preFixup = ''
+ patchelf --remove-rpath $out/bin/app
+ '';
+
+ postInstall = ''
+ install sample_libcrypto/*.so $out/lib
+ '';
+ });
+ sampleEnclave = buildSample "SampleEnclave";
+ sampleEnclavePCL = buildSample "SampleEnclavePCL";
+ sampleEnclaveGMIPP = buildSample "SampleEnclaveGMIPP";
+ sealUnseal = (buildSample "SealUnseal").overrideAttrs (oldAttrs: {
+ prePatch = ''
+ substituteInPlace App/App.cpp \
+ --replace '"sealed_data_blob.txt"' '"/tmp/sealed_data_blob.txt"'
+ '';
+ });
+ switchless = buildSample "Switchless";
+}
diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix
index 93c12da94ac3..baa4ad2a3375 100644
--- a/pkgs/os-specific/linux/sgx/sdk/default.nix
+++ b/pkgs/os-specific/linux/sgx/sdk/default.nix
@@ -3,15 +3,16 @@
, fetchFromGitHub
, fetchpatch
, fetchzip
-, callPackage
, autoconf
, automake
, binutils
+, callPackage
, cmake
, file
, gdb
, git
, libtool
+, linkFarmFromDrvs
, nasm
, ocaml
, ocamlPackages
@@ -20,6 +21,7 @@
, python3
, texinfo
, validatePkgConfig
+, writeShellApplication
, writeShellScript
, writeText
, debug ? false
@@ -262,7 +264,25 @@ stdenv.mkDerivation rec {
postHooks+=(sgxsdk)
'';
- passthru.tests = callPackage ./samples.nix { };
+ passthru.tests = callPackage ../samples { sgxMode = "SIM"; };
+
+ # Run tests in SGX hardware mode on an SGX-enabled machine
+ # $(nix-build -A sgx-sdk.runTestsHW)/bin/run-tests-hw
+ passthru.runTestsHW =
+ let
+ testsHW = lib.filterAttrs (_: v: v ? "name") (callPackage ../samples { sgxMode = "HW"; });
+ testsHWLinked = linkFarmFromDrvs "sgx-samples-hw-bundle" (lib.attrValues testsHW);
+ in
+ writeShellApplication {
+ name = "run-tests-hw";
+ text = ''
+ for test in ${testsHWLinked}/*; do
+ printf '*** Running test %s ***\n\n' "$(basename "$test")"
+ printf 'a\n' | "$test/bin/app"
+ printf '\n'
+ done
+ '';
+ };
meta = with lib; {
description = "Intel SGX SDK for Linux built with IPP Crypto Library";
diff --git a/pkgs/os-specific/linux/sgx/sdk/samples.nix b/pkgs/os-specific/linux/sgx/sdk/samples.nix
deleted file mode 100644
index 21b31f824476..000000000000
--- a/pkgs/os-specific/linux/sgx/sdk/samples.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv
-, sgx-sdk
-, which
-}:
-let
- buildSample = name: stdenv.mkDerivation rec {
- inherit name;
-
- src = sgx-sdk.out;
- sourceRoot = "${sgx-sdk.name}/share/SampleCode/${name}";
-
- buildInputs = [
- sgx-sdk
- ];
-
- # The samples don't have proper support for parallel building
- # causing them to fail randomly.
- enableParallelBuilding = false;
-
- buildFlags = [
- "SGX_MODE=SIM"
- ];
-
- installPhase = ''
- mkdir $out
- install -m 755 app $out/app
- install *.so $out/
- '';
-
- doInstallCheck = true;
- installCheckInputs = [ which ];
- installCheckPhase = ''
- pushd $out
- ./app
- popd
- '';
- };
-in
-{
- cxx11SGXDemo = buildSample "Cxx11SGXDemo";
- localAttestation = (buildSample "LocalAttestation").overrideAttrs (oldAttrs: {
- installPhase = ''
- mkdir $out
- cp -r bin/. $out/
- '';
- });
- powerTransition = (buildSample "PowerTransition").overrideAttrs (oldAttrs: {
- # Requires interaction
- doInstallCheck = false;
- });
- protobufSGXDemo = buildSample "ProtobufSGXDemo";
- remoteAttestation = (buildSample "RemoteAttestation").overrideAttrs (oldAttrs: {
- dontFixup = true;
- installCheckPhase = ''
- echo "a" | LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/sample_libcrypto ./app
- '';
- });
- sampleEnclave = buildSample "SampleEnclave";
- sampleEnclavePCL = buildSample "SampleEnclavePCL";
- sampleEnclaveGMIPP = buildSample "SampleEnclaveGMIPP";
- sealUnseal = buildSample "SealUnseal";
- switchless = buildSample "Switchless";
-}
diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix
index f367dc59401e..fb10a5369f1d 100644
--- a/pkgs/servers/alps/default.nix
+++ b/pkgs/servers/alps/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-xKfRLdfeD7lWdmC0iiq4dOIv2SmzbKH7HcAISCJgdug=";
};
- vendorSha256 = "sha256-8fmbv5uPRfzUqsYU95YzsnuFkq4cwj+LN2X3W/yBHyA=";
+ vendorSha256 = "sha256-Vg0k+YSMg6Ree/jkVV2VQ8RbSbQFUhmUN2MeTBxPeLo=";
proxyVendor = true;
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index 8057b56e9f39..2dbb076d4f1b 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "headscale";
- version = "0.12.2";
+ version = "0.12.3";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
- sha256 = "sha256-PgSjxDmPahGd2o3QBfvytMva+LHWeLPm500DsNdB77Q=";
+ sha256 = "sha256-0SIQninNnJZ6KN5RKIMJzJQZRV7ThfJZal1lhsBnTIY=";
};
- vendorSha256 = "sha256-gD4jGaR4KQiYL6+yA8g2u6cTEbfySTMErNqerw76Ook=";
+ vendorSha256 = "sha256-n5E6pzswenMJrThCys0UM2LVXKDXqCXDW7uR0V4H56w=";
ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ];
diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix
index ffeead30a293..da4715c5432c 100644
--- a/pkgs/servers/http/gitlab-pages/default.nix
+++ b/pkgs/servers/http/gitlab-pages/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gitlab-pages";
- version = "1.48.0";
+ version = "1.49.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
- sha256 = "sha256-oSimHF4qiI2zcMSx51qxs88AcrrewHIbhaRW8s4Ut7Q=";
+ sha256 = "sha256-9orJEt0w0ORHKEOpp40Aubj/pfnNO/A3oHEgWIdk+vM=";
};
- vendorSha256 = "sha256-dzYO1yAQSVJmDJvjB5XPRBiYCk+ko1n928CTtUXbHBc=";
+ vendorSha256 = "sha256-/dmEsoeB3UDOBZ/9rbnywRtpXVKaJKGF6xPeWTA4PPE=";
subPackages = [ "." ];
meta = with lib; {
diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix
index eb6f9345b2d0..9db7ef3aaca8 100644
--- a/pkgs/servers/irc/atheme/default.nix
+++ b/pkgs/servers/irc/atheme/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "atheme";
- version = "7.2.11";
+ version = "7.2.12";
src = fetchgit {
url = "https://github.com/atheme/atheme.git";
rev = "v${version}";
- sha256 = "15fs48cgzxblh2g4abl5v647ndfx9hg8cih2x67v3y7s9wz68wk2";
+ sha256 = "sha256-KAC1ZPNo4TqfVryKOYYef8cRWRgFmyEdvl1bgvpGNiM=";
leaveDotGit = true;
};
diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index 7d5ae0c74f29..48d6118add95 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "klipper";
- version = "unstable-2021-12-24";
+ version = "unstable-2022-01-09";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
- rev = "247cd753e283e70a9949e76d0ba669d99c0eb144";
- sha256 = "sha256-65wxhE/XqNK6ly+fxZFLjtImvpJlgU54RStUve40CJA=";
+ rev = "6e6ad7b5201d3452aa605f4ae852c51239c2c7d8";
+ sha256 = "sha256-cflcGweEjB0xj2LhYJzyvqFSQen2vhYXlL7lz/HoGaM=";
};
sourceRoot = "source/klippy";
diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix
new file mode 100644
index 000000000000..6d5ebbb76c0c
--- /dev/null
+++ b/pkgs/servers/misc/virtiofsd/default.nix
@@ -0,0 +1,25 @@
+{ lib, rustPlatform, fetchFromGitLab, libcap_ng, libseccomp }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "virtiofsd";
+ version = "1.0.0";
+
+ src = fetchFromGitLab {
+ owner = "virtio-fs";
+ repo = "virtiofsd";
+ rev = "v${version}";
+ sha256 = "010xf482qip91mv91wy9zjdsq0gfg1fd6iclrcry0nfnwlbigbwd";
+ };
+
+ cargoSha256 = "0bfvqbmvkf17slra5k0nnva6j6w07769k226qnbzb3947zf4x2ga";
+
+ buildInputs = [ libcap_ng libseccomp ];
+
+ meta = with lib; {
+ homepage = "https://gitlab.com/virtio-fs/virtiofsd";
+ description = "vhost-user virtio-fs device backend written in Rust";
+ maintainers = with maintainers; [ qyliss ];
+ platforms = platforms.linux;
+ license = with licenses; [ asl20 /* and */ bsd3 ];
+ };
+}
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream b/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream
deleted file mode 100644
index a18675347d58..000000000000
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-name apache-jena-fuseki
-attribute apache-jena-fuseki
-target fuseki-binary.nix
-minimize_overwrite
diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix
index 29c223a3470e..1363aea11e34 100644
--- a/pkgs/servers/serviio/default.nix
+++ b/pkgs/servers/serviio/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "serviio";
- version = "2.1";
+ version = "2.2.1";
src = fetchurl {
url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz";
- sha256 = "0mxpdyhjf4w83q8ssmvpxm95hw4x7lfkh48vvdablccfndh82x2i";
+ sha256 = "sha256-uRRWKMv4f2b1yIE9OnXDIZAmcoqw/8F0z1LOesQBsyQ=";
};
installPhase = ''
diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix
index b289177e7997..5b57ca27049f 100644
--- a/pkgs/servers/soft-serve/default.nix
+++ b/pkgs/servers/soft-serve/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-sRlEF1ee+oBnYOGSN6rDOvNr3OnfAqV+1Wx5XOyIylw=";
};
- vendorSha256 = "sha256-FukkmuBTPPhY0UTe3r1iU3nbGoMsPTcRKTLBd+VMGUk=";
+ vendorSha256 = "sha256-txC85Y5t880XGgJb7tumDgqWTdTRCXXgATAtlWXF7n8=";
doCheck = false;
diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 4e4a0640df68..dd849ef9586d 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
modRoot = "./go";
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
- vendorSha256 = "sha256-7nmpsmisrtBxdLgC9mwSDYbjtbCrGl564+deC9CaYps=";
+ vendorSha256 = "sha256-pP/KCj92Y8fEh9AXKEOxuXxMeTMcGJrYSW+OrfXvajk=";
doCheck = false;
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index 91a266427457..95ef4b0ea702 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "traefik";
- version = "2.5.7";
+ version = "2.6.0";
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
- sha256 = "sha256-CQXrAKdfNqGKXw3Ds47uq6ALsDh6JRf+94axOvLzWbE=";
+ sha256 = "sha256-+95GB4D6upo6s0K+rxpuolzF5Knind0bYCzgO33mNis=";
stripRoot = false;
};
- vendorSha256 = "sha256-aZemr1waV2hIujbI+1PrivXxa1RrT0Ams4xT4QxTQPY=";
+ vendorSha256 = "sha256-H67oCOCkS/xpkCZ4C3BuIzpUKuLvItDqC4tNSNKjv0E=";
doCheck = false;
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index d15bd0245731..83ef9ea65e19 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
- version = "2021-12-18";
+ version = "2022-01-18";
pname = "oh-my-zsh";
- rev = "904f8685f75ff5dd3f544f8c6f2cabb8e5952e9a";
+ rev = "22c11da108764336d92d03d3113c1f486cdb5911";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "Pos7LaNQllZrzBUx8a7QXi1sAVcIABQJOLUjIwGIP/U=";
+ sha256 = "Tnwy+3lCWjzDhjXtgLIiX3SxpJG6shxmmPFyeWkO2R0=";
};
installPhase = ''
diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix
index 333da40adbb0..be5c66505577 100644
--- a/pkgs/shells/zsh/zsh-history/default.nix
+++ b/pkgs/shells/zsh/zsh-history/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
- vendorSha256 = "13rc1afds5xg30faqz35haha4kxg73b5nvjirbrkc6kna0vhb54z";
+ vendorSha256 = "1863ad97y82fx0an1ysalkxnqjz3zfz228wag9a92wdssl1vwzws";
doCheck = false;
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index a6865961128a..d4d62cf527d4 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
sha256 = "sha256-5cBQFkagDfMb8xvEQgWlVbYp++mXIHl2p5TZuiaO4Rw=";
};
- vendorSha256 = "sha256-iRJjN+fG5tFhMvHHR3pnWW8Y9VWopuKVv/AgivJC4Eo=";
+ vendorSha256 = "sha256-THqVvu5eJs1ZTUQ3JxGIt7IsoMhSkeMNicBGbkPz63A=";
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 7208e4e8cdd5..ffb7b76cd48a 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-KhAS8JUM6dobcSJ/QaRhxv2jNpn6AFqiDRCdxeKHwZE=";
};
- vendorSha256 = "sha256-6eiJR7DRx3zYKT3B1wBTGSvPQwYw3815K1V/Y9aBX5E=";
+ vendorSha256 = "sha256-bUbStgIJeqzBkoSffJ8ZvqVtOMJ/mqxIIB/Fq9GhoXc=";
doCheck = false;
diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix
index 322e3535b817..9f79db859283 100644
--- a/pkgs/tools/admin/fits-cloudctl/default.nix
+++ b/pkgs/tools/admin/fits-cloudctl/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-GSdVwpYmJ3VnZaMQ8SjzcHpeefFjSaZXRcUAXEI9PKo=";
};
- vendorSha256 = "sha256-RZ4cy9XHpWRP85G4A1/qYPjt/4CZ7pgECf+rsViPjGE=";
+ vendorSha256 = "sha256-4iQxqhXMGeMgHarjVY/rCLr7Am1mniqxTkMxbcp3fGI=";
meta = with lib; {
description = "Command-line client for FI-TS Finance Cloud Native services";
diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix
index 2b7a9b0faa9a..288989f51ee4 100644
--- a/pkgs/tools/backup/kopia/default.nix
+++ b/pkgs/tools/backup/kopia/default.nix
@@ -2,16 +2,16 @@
buildGo117Module rec {
pname = "kopia";
- version = "0.10.0";
+ version = "0.10.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-445E+RiYlfDNOuw51Wdsavb52RjL3FkcrN9EeKmJ+Q8=";
+ sha256 = "sha256-SYKTkjN+O7s/LFeVJr2HFuvIuEHeqf0KrMQMYftL4U0=";
};
- vendorSha256 = "sha256-wq/9MUCeJBZjrg0SXgHYMyXodqIF3KLRHQmvi7gbv5M=";
+ vendorSha256 = "sha256-9JR0ndlxtb0jun7KSWuac2uLqwVKrwUqiV6yScBoqzs=";
doCheck = false;
diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix
index 9f5980a07e7d..30283d560f85 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/pkgs/tools/filesystems/snapraid/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "snapraid";
- version = "12.0";
+ version = "12.1";
src = fetchFromGitHub {
owner = "amadvance";
repo = "snapraid";
rev = "v${version}";
- sha256 = "sha256-CcJaxnbRvGYiQjU38qnTgNyim5aDQWmxhQv16ZT1F00=";
+ sha256 = "sha256-DaFL5YxKdL7swfiWAHNufkeQ7mNd/MdZ6E0yAtC58lc=";
};
VERSION = version;
diff --git a/pkgs/tools/inputmethods/kime/default.nix b/pkgs/tools/inputmethods/kime/default.nix
index 6cac37da7db2..68a91d2bfca7 100644
--- a/pkgs/tools/inputmethods/kime/default.nix
+++ b/pkgs/tools/inputmethods/kime/default.nix
@@ -16,18 +16,18 @@ let
in
stdenv.mkDerivation rec {
pname = "kime";
- version = "2.5.5";
+ version = "2.5.6";
src = fetchFromGitHub {
owner = "Riey";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs=";
+ sha256 = "sha256-r5luI6B4IjNTbh2tzpqabokgwkmbyXrA61+F2HDEWuo=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
- sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4=";
+ sha256 = "sha256-GvBnNPY51RPt+I73oet5tB/EE2UsEPKbelJZkSY3xNw=";
};
# Replace autostart path
diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix
index 3d691033ccbd..0028fa6b7b23 100644
--- a/pkgs/tools/inputmethods/remote-touchpad/default.nix
+++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix
@@ -9,19 +9,19 @@
buildGoModule rec {
pname = "remote-touchpad";
- version = "1.0.5";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "unrud";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2oHjx5RpuZmWcv954ZOrmHhOkQBfrDpEFqgiBFQfAuo=";
+ sha256 = "sha256-XyE8N+YVwfgxToKkhpe8zJ0e3HFDpKt7cfERxWCfbfU=";
};
buildInputs = [ libX11 libXi libXt libXtst ];
tags = [ "portal,x11" ];
- vendorSha256 = "sha256-8w3muVJwDmFKY6AFKv/x6vS6jIyR7M/wlxzAvl5ROdE=";
+ vendorSha256 = "sha256-zTx38kW/ylXXML73C2sFQciV2y3+qbO0S/ZdkiEh5Qs=";
meta = with lib; {
description = "Control mouse and keyboard from the webbrowser of a smartphone.";
diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix
index 735508fed216..aca0a6b687f5 100644
--- a/pkgs/tools/misc/bdf2sfd/default.nix
+++ b/pkgs/tools/misc/bdf2sfd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bdf2sfd";
- version = "1.1.6";
+ version = "1.1.7";
src = fetchFromGitHub {
owner = "fcambus";
repo = pname;
rev = version;
- sha256 = "sha256-f3IdTk1GEo1GlbiJMCpqwheNJrndm7aCojA+GuKMTao=";
+ sha256 = "sha256-q+FLmu2JCDTJ6zC8blkd27jAKWbNpPyKzmUj1bW1mfA=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix
index 5eff549a6517..8fd5c55c89fd 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/default.nix
+++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "cloud-sql-proxy";
- version = "1.27.1";
+ version = "1.28.0";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "cloudsql-proxy";
rev = "v${version}";
- sha256 = "sha256-xVPs7D639KY2ryDZpivineH4yZSNXi78FWk2SFKX1sk=";
+ sha256 = "sha256-XA74rZ477Mwf8u0KLkFngfwiJexS10vh++ST6VtkcVg=";
};
subPackages = [ "cmd/cloud_sql_proxy" ];
- vendorSha256 = "sha256-913GJ/rPvDavQQMqDDTe4gBXziPPeQRPpUUG3DAz96g=";
+ vendorSha256 = "sha256-ZXWhADfzvHcEW3IZlPyau5nHEXBJRH8aTvb3zCKl/LE=";
checkFlags = [ "-short" ];
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index 27eb1275a2da..1afacc4b4b89 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "git-town";
- version = "7.6.0";
+ version = "7.7.0";
goPackagePath = "github.com/git-town/git-town";
src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
rev = "v${version}";
- sha256 = "sha256-yarJWIEIZuBcXXxltkiM7LwrEM8fveD3+JVoPGarhJQ=";
+ sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc=";
};
ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ];
diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix
new file mode 100644
index 000000000000..b89868460e29
--- /dev/null
+++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix
@@ -0,0 +1,45 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+ pname = "opentelemetry-collector-contrib";
+ version = "0.43.0";
+
+ src = fetchFromGitHub {
+ owner = "open-telemetry";
+ repo = "opentelemetry-collector-contrib";
+ rev = "v${version}";
+ sha256 = "sha256-ktzP+ugG2sa0v8B1Zp47o8Bmpxv98zQyFyWf9QfQRoQ=";
+ };
+ # proxy vendor to avoid hash missmatches between linux and macOS
+ proxyVendor = true;
+ vendorSha256 = "sha256-0E52YSWlq1ebHA3kR9Qo/6ufug9R+z1cSD9AfbN/Mi0=";
+
+ subPackages = [ "cmd/otelcontribcol" ];
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/open-telemetry/opentelemetry-collector-contrib/internal/version.Version=v${version}"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib";
+ changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md";
+ description = "OpenTelemetry Collector superset with additional community collectors";
+ longDescription = ''
+ The OpenTelemetry Collector offers a vendor-agnostic implementation on how
+ to receive, process and export telemetry data. In addition, it removes the
+ need to run, operate and maintain multiple agents/collectors in order to
+ support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.)
+ sending to multiple open-source or commercial back-ends. The Contrib
+ edition provides aditional vendor specific receivers/exporters and/or
+ components that are only useful to a relatively small number of users and
+ is multiple times larger as a result.
+ '';
+ license = licenses.asl20;
+ maintainers = with maintainers; [ uri-canva jk ];
+ };
+}
diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix
index 6c83d72976d9..e0abe89359ed 100644
--- a/pkgs/tools/misc/opentelemetry-collector/default.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/default.nix
@@ -1,30 +1,52 @@
{ buildGoModule
, fetchFromGitHub
, lib
+, writeScript
}:
+let
+ otelcontribcol = writeScript "otelcontribcol" ''
+ echo 'ERROR: otelcontribcol is now in `pkgs.opentelemetry-collector-contrib`, call the collector with `otelcorecol` or move to `pkgs.opentelemetry-collector-contrib`' >&2
+ exit 1
+ '';
+in
buildGoModule rec {
pname = "opentelemetry-collector";
- version = "0.40.0";
+ version = "0.43.1";
src = fetchFromGitHub {
owner = "open-telemetry";
- repo = "opentelemetry-collector-contrib";
+ repo = "opentelemetry-collector";
rev = "v${version}";
- sha256 = "sha256-YFgAS4WReyMnzb6FOeRUXHf1LUgknH5gWObiZNKMbv8=";
+ sha256 = "sha256-hYhJv5LbebUA9Sp8/admfKWXBoOVvXdr3Mzc3qG8GlM=";
};
+ # there is a nested go.mod
+ sourceRoot = "source/cmd/otelcorecol";
+ vendorSha256 = "sha256-w5uyAVZ1TrurD4CEWTTk1fWmdlQn8eAFWZrNpISB5Rk=";
- vendorSha256 = "sha256-DTZLYF3BoQGou59KaL56pkxySsoQ0xeJ5aF/SkewziE=";
- proxyVendor = true;
+ preBuild = ''
+ # set the build version, can't be done via ldflags
+ sed -i -E 's/Version:(\s*)".*"/Version:\1"${version}"/' main.go
+ '';
- CGO_ENABLED = 0;
+ ldflags = [ "-s" "-w" ];
- subPackages = [ "cmd/otelcontribcol" ];
+ postInstall = ''
+ cp ${otelcontribcol} $out/bin/otelcontribcol
+ '';
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-collector";
- description = "OpenTelemetry Collector";
+ changelog = "https://github.com/open-telemetry/opentelemetry-collector/blob/v${version}/CHANGELOG.md";
+ description = "OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data";
+ longDescription = ''
+ The OpenTelemetry Collector offers a vendor-agnostic implementation on how
+ to receive, process and export telemetry data. In addition, it removes the
+ need to run, operate and maintain multiple agents/collectors in order to
+ support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.)
+ sending to multiple open-source or commercial back-ends.
+ '';
license = licenses.asl20;
- maintainers = [ maintainers.uri-canva ];
+ maintainers = with maintainers; [ uri-canva jk ];
};
}
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index a94a4c9bd35b..8d5d7356da52 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 = "03.03.11";
+ version = "03.03.12";
src = fetchurl {
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
- sha256 = "sha256-CCZ7CENeI8zNUgtBYesGWbqf53OCr9hBTN1ibegB4lo=";
+ sha256 = "sha256-1KpM2lobU+KsxjHpNeAxwAx3mCrU8IZyhvfYJwlUQJ4=";
};
propagatedBuildInputs = tclLibraries;
diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix
index 0a51eda48570..ec42cf7136ea 100644
--- a/pkgs/tools/misc/topicctl/default.nix
+++ b/pkgs/tools/misc/topicctl/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-bCTlKhYmMe89dYuLiZ58CPpYZiXSGqbddxugsZS5/Cs=";
};
- vendorSha256 = "sha256-1VRK8tmsbOuP5t5uJ1h+KPcS4K9D+y6UQKeUP2HPXrQ=";
+ vendorSha256 = "sha256-X6iVbljbHb9nBoXAZuy+vG8w7Alct+8BkabZlJeuUAM=";
ldflags = [
"-X main.BuildVersion=${version}"
diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/tools/misc/tz/default.nix
index 8148dfdec702..30e2fa3ece21 100644
--- a/pkgs/tools/misc/tz/default.nix
+++ b/pkgs/tools/misc/tz/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-D0rakLZ+swrDwBMcr+EJPgaYsQTWob50QteW1PoIdNk=";
};
- vendorSha256 = "sha256-gMHPWf/kFb55GyyMciLWRzvrQXUGDQ72RNkIhkMVe54=";
+ vendorSha256 = "sha256-PGsj7pLtd+xpy9Dhv6qJX5sHin4YAOdXaYj4QCSFte4=";
meta = with lib; {
description = "A time zone helper";
diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix
index 4b65a63431bd..f882ce4b5be3 100644
--- a/pkgs/tools/misc/viddy/default.nix
+++ b/pkgs/tools/misc/viddy/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-V/x969wi5u5ND9QgJfc4vtI2t1G1ETlATzeqnpHMncc=";
};
- vendorSha256 = "sha256-iSgFDTNeRPpCMxNqj2LhYV+6/eskGa58e+rT0Nhg+pE=";
+ vendorSha256 = "sha256-LtRHnZF0ynnIp77K9anljqq42BumXohDMwlU7hzSxZk=";
ldflags = [
"-s"
diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix
index 8851a4a87406..fb4a7f32f464 100644
--- a/pkgs/tools/networking/boundary/default.nix
+++ b/pkgs/tools/networking/boundary/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
- version = "0.7.1";
+ version = "0.7.3";
src =
let
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
x86_64-darwin = "darwin_amd64";
};
sha256 = selectSystem {
- x86_64-linux = "sha256-5m5ckeX3gVY82q9aQWusnq3o/+UBPJSPDdISL86OfV8=";
- aarch64-linux = "sha256-+dnQh89kg3JcDL8sucMceCMRFyUjoAIYuZtDM8AUMYw=";
- x86_64-darwin = "sha256-ZoWW8y048+5Ru3s7lUxLTMxuITFBC9AgwqafyHPDc54=";
+ x86_64-linux = "sha256-9WEvGU4VfJ1781DlvdJhpdzY4djoSRWu6ZzfOpBvKJQ=";
+ aarch64-linux = "sha256-QLjewB1FeYHVehM1U81GzyewWns40IlVEFWgzWP+2Vw=";
+ x86_64-darwin = "sha256-YxPkZnU8EBvRWBMsB0jifS63tJ7LQibgtwTbqosC/fg=";
};
in
fetchzip {
diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix
index 73a39c8e544e..82a418d5de91 100644
--- a/pkgs/tools/networking/checkip/default.nix
+++ b/pkgs/tools/networking/checkip/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-sSXl2I5vZ8PVLaZWlMl5phcqQ1k1OBy5v+X0O8nHtvw=";
};
- vendorSha256 = "sha256-4XA7B0gmFE52VoKiPLsa0urPS7IdzrTBXuU4wZv/Lag=";
+ vendorSha256 = "sha256-aiqnJ1PjrwSC6YtixNvyTxgbs8z2radcETNhKHGlPk0=";
# Requires network
doCheck = false;
diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index 81fe5cacda25..92ac3c8dc09f 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0sf2r4q57hwdakv0b4skn76b0xy7bwj2j9rpj6frs5fkk6gsi6sm";
};
- vendorSha256 = "123f9y1pfayfd5amkw5b8jzi8dbn7a16kbf7lzbmw69c1gj4gx9z";
+ vendorSha256 = "0mbzbgd53mdmq2jpg845mmphb894l6di0ds53n6r3sv777k00sgh";
doCheck = false;
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 3bb1ab38e6b3..4b8add57b2de 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -4,7 +4,7 @@ with lib;
buildGoModule rec {
pname = "flannel";
- version = "0.15.1";
+ version = "0.16.1";
rev = "v${version}";
vendorSha256 = null;
@@ -13,7 +13,7 @@ buildGoModule rec {
inherit rev;
owner = "flannel-io";
repo = "flannel";
- sha256 = "1p4rz4kdiif8i78zgxhw6dd0c1bq159f6l1idvig5apph7zi2bwm";
+ sha256 = "sha256-5NrULpbf3PStzoywLyrfM5qup43idzeHCMRSuNLXR3g=";
};
ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];
diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix
index 8a5440f6b071..a20d63af233d 100644
--- a/pkgs/tools/networking/godns/default.nix
+++ b/pkgs/tools/networking/godns/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-U8fmjcPeTcKlf721UIbA4/JYeM4l+OIyAPGNp8IPvSk=";
};
- vendorSha256 = "sha256-8fluCDKrMNnIAlJFlDAisk/P+IYHBCdl7hkSbQtgy1A=";
+ vendorSha256 = "sha256-OyqkjA90zcfqRL6pfISR/6WXbv5LwVhKDECBtlqords=";
# Some tests require internet access, broken in sandbox
doCheck = false;
diff --git a/pkgs/tools/networking/godspeed/default.nix b/pkgs/tools/networking/godspeed/default.nix
index 011d09848d8e..44cac245927f 100644
--- a/pkgs/tools/networking/godspeed/default.nix
+++ b/pkgs/tools/networking/godspeed/default.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
sha256 = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI=";
};
- vendorSha256 = "sha256-MCr1ShhkxM9CeSmqqtgAW0qv0QaIPRSOzASj8gt2ZAg=";
+ vendorSha256 = "sha256-DCDAuKvov4tkf77nJNo9mQU/bAeQasp4VBQRtLX+U6c=";
buildInputs = [
libpcap
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index fc1280be6c78..de332843c04e 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "i2p";
- version = "1.5.0";
+ version = "1.6.1";
src = fetchurl {
url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2";
- sha256 = "sha256-JuX02VsaB2aHD5ezDlfJqOmGkCecO/CRmOMO/6vsxFA=";
+ sha256 = "sha256-cZYGxMtRDeT+dPJLv6U5EacFMYIfwe55op49luqhZzM=";
};
buildInputs = [ jdk ant gettext which ];
diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix
index 12eb1a7f0a64..17e8d9b9fba2 100644
--- a/pkgs/tools/networking/tendermint/default.nix
+++ b/pkgs/tools/networking/tendermint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tendermint";
- version = "0.35.0";
+ version = "0.35.1";
src = fetchFromGitHub {
owner = "tendermint";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-fSDmwZNKAHXcMtNZlqJmUFkuFdZLkDbnn+ZrNtnszgU=";
+ sha256 = "sha256-eEvSELCzpAm9Me46U54MQEQiAPCFlBa5iG2AZMn5BbE=";
};
- vendorSha256 = "sha256-DktuZ0NUyg8LbYklxde2ZZJ8/WOyBq50E9yEHtS+Hqw=";
+ vendorSha256 = "sha256-aYY3rGm2Wvd5v1QrfhN0jWzAO9JYu4j5ZHk9UyEPjH8=";
subPackages = [ "cmd/tendermint" ];
diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix
new file mode 100644
index 000000000000..c24de3947f6d
--- /dev/null
+++ b/pkgs/tools/nix/alejandra/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "alejandra";
+ version = "unstable-2022-01-30";
+
+ src = fetchFromGitHub {
+ owner = "kamadorueda";
+ repo = "alejandra";
+ rev = "b72274b052ae06cbe60a97d623829b1458369cc2";
+ sha256 = "sha256-snq9C/a/53VivFcLNvdeKwVmPBXbcVzbbjTB+iULFUc=";
+ };
+
+ cargoSha256 = "sha256-/JzATzRhNexmyjtgjHVkw8LVyr4PdIdPJfUGXz4pZbQ=";
+
+ meta = with lib; {
+ description = "The uncompromising Nix formatter";
+ homepage = "https://github.com/kamadorueda/alejandra";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ _0x4A6F ];
+ };
+}
diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix
index fd219935aeeb..df239beb60bc 100644
--- a/pkgs/tools/nix/statix/default.nix
+++ b/pkgs/tools/nix/statix/default.nix
@@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec {
pname = "statix";
# also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix
# the version can be found in flake.nix of the source code
- version = "0.4.2";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "nerdypepper";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4hVEwm2xuuHFy38/EJLKjGuxTYCAcKRHHfFKLvqp+M0=";
+ sha256 = "sha256-68ejROWcDqc4SnivFIrbsSZDqCXEo0sXSiwpro7AmgU=";
};
- cargoSha256 = "sha256-15C/ye8nYLtriBlqbf1ul41IFtShGY2LTX10z1/08Po=";
+ cargoSha256 = "sha256-YHA97bnGHYRwSZYZ3ZViUlRQskwLPUC26FBWQyBG5Uc=";
buildFeatures = lib.optional withJson "json";
diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix
index 40f43c7b054f..0724a756b919 100644
--- a/pkgs/tools/security/aide/default.nix
+++ b/pkgs/tools/security/aide/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "aide";
- version = "0.17.3";
+ version = "0.17.4";
src = fetchurl {
url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-ousYg8r6rQVvvkPuHorgn9NsqjCgvI7f6l1HvWfEZPg=";
+ sha256 = "sha256-yBUFJG8//C52A21Dp3ISroKJW1iB2bniXBNhsam3qEY=";
};
buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ];
diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix
index 670a03c88810..9f29826808db 100644
--- a/pkgs/tools/security/cariddi/default.nix
+++ b/pkgs/tools/security/cariddi/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-PXQljC9rwlxXQ96fII3EjD4NXu61EMkYvMWqkcJZ4vU=";
};
- vendorSha256 = "sha256-yVfRjUlw90oUsbF2P6pW6FhMXok9ZwcKmAWyTFLI/cY=";
+ vendorSha256 = "sha256-zNUdglsfy6lEV54afCAoigxa3rR0qf/e3+B4PvVRIa4=";
meta = with lib; {
description = "Crawler for URLs and endpoints";
diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/tools/security/dalfox/default.nix
index 2919354db4ec..ebbdd9882b70 100644
--- a/pkgs/tools/security/dalfox/default.nix
+++ b/pkgs/tools/security/dalfox/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-QSIaqHUNsVpb1qbQLIxxjoDH1DMM1XpXxWZtImMV1yM=";
};
- vendorSha256 = "sha256-QtSWlGsbCxLpb4+TZgV0/wfSb5flGG3qHquO2maIOKU=";
+ vendorSha256 = "sha256-F0uIV4T/dCqPY/gsSOrzJTxFGlDh9NfxKhJxrftj0Lo=";
meta = with lib; {
description = "Tool for analysing parameter and XSS scanning";
diff --git a/pkgs/tools/security/extrude/default.nix b/pkgs/tools/security/extrude/default.nix
index dbe9471bf2da..e8d2b0784117 100644
--- a/pkgs/tools/security/extrude/default.nix
+++ b/pkgs/tools/security/extrude/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
hash = "sha256-7gCEBhnNU5CqC5n0KP4Dd/fmddPRwNqyMFXTrRrJjfU=";
};
- vendorSha256 = "sha256-auhRXKt5dcQ+gr3a9Wfen8/BISP17HVsIRP16sBmiZM=";
+ vendorSha256 = "sha256-8qjIYPkWtYTvl7wAnefpZAjbNSQLQFqRnGGccYZ8ZmU=";
meta = with lib; {
description = "Tool to analyse binaries for missing security features";
diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix
index d744b8b5daa0..59dc202e694a 100644
--- a/pkgs/tools/security/gau/default.nix
+++ b/pkgs/tools/security/gau/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ=";
};
- vendorSha256 = "sha256-u5ketxHPwZN2mV0uTgwJbY+ImusGZ9GTTmFAGvdH5yA=";
+ vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ=";
meta = with lib; {
description = "Tool to fetch known URLs";
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 4e770c3ead14..de625d4cb521 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.25"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.27"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index d7be1df5a86e..b25da2ff7e77 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: 4a1ba0f9095d5c6e954ba58bc71d02feefc411a5
- ref: refs/tags/6.1.25
+ revision: e8c59985fa8e2c65660f2103b75622018e99f6b3
+ ref: refs/tags/6.1.27
specs:
- metasploit-framework (6.1.25)
+ metasploit-framework (6.1.27)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@@ -31,9 +31,9 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
- metasploit-payloads (= 2.0.66)
+ metasploit-payloads (= 2.0.70)
metasploit_data_models
- metasploit_payloads-mettle (= 1.0.17)
+ metasploit_payloads-mettle (= 1.0.18)
mqtt
msgpack
nessus_rest
@@ -47,7 +47,7 @@ GIT
openvas-omp
packetfu
patch_finder
- pcaprub (= 0.12.4)
+ pcaprub
pdf-reader
pg
puma
@@ -128,13 +128,13 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
- aws-partitions (1.549.0)
+ aws-partitions (1.551.0)
aws-sdk-core (3.125.5)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.294.0)
+ aws-sdk-ec2 (1.296.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.65.0)
@@ -143,7 +143,7 @@ GEM
aws-sdk-kms (1.53.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.111.1)
+ aws-sdk-s3 (1.111.3)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@@ -216,7 +216,7 @@ GEM
domain_name (~> 0.5)
http_parser.rb (0.8.0)
httpclient (2.8.3)
- i18n (1.8.11)
+ i18n (1.9.1)
concurrent-ruby (~> 1.0)
io-console (0.5.11)
irb (1.3.6)
@@ -251,7 +251,7 @@ GEM
activemodel (~> 6.0)
activesupport (~> 6.0)
railties (~> 6.0)
- metasploit-payloads (2.0.66)
+ metasploit-payloads (2.0.70)
metasploit_data_models (5.0.4)
activerecord (~> 6.0)
activesupport (~> 6.0)
@@ -262,12 +262,12 @@ GEM
railties (~> 6.0)
recog (~> 2.0)
webrick
- metasploit_payloads-mettle (1.0.17)
+ metasploit_payloads-mettle (1.0.18)
method_source (1.0.0)
mini_portile2 (2.7.1)
minitest (5.15.0)
mqtt (0.5.0)
- msgpack (1.4.3)
+ msgpack (1.4.4)
multi_json (1.15.0)
multipart-post (2.1.1)
mustermann (1.1.1)
@@ -291,16 +291,16 @@ GEM
packetfu (1.1.13)
pcaprub
patch_finder (1.0.2)
- pcaprub (0.12.4)
- pdf-reader (2.8.0)
+ pcaprub (0.13.1)
+ pdf-reader (2.9.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
- pg (1.2.3)
+ pg (1.3.0)
public_suffix (4.0.6)
- puma (5.5.2)
+ puma (5.6.1)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.3)
@@ -334,7 +334,7 @@ GEM
rex-core
rex-struct2
rex-text
- rex-core (0.1.20)
+ rex-core (0.1.25)
rex-encoder (0.1.6)
metasm
rex-arch
@@ -379,12 +379,12 @@ GEM
ruby-macho (3.0.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
- ruby_smb (3.0.0)
+ ruby_smb (3.0.1)
bindata
openssl-ccm
openssl-cmac
rubyntlm
- windows_error
+ windows_error (>= 0.1.3)
rubyntlm (0.6.3)
rubyzip (2.3.2)
sawyer (0.8.2)
@@ -437,7 +437,7 @@ GEM
activesupport (>= 4.2, < 7.0)
xmlrpc (0.3.2)
webrick
- zeitwerk (2.5.3)
+ zeitwerk (2.5.4)
PLATFORMS
ruby
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index d9a508640ca9..8de94c7b59e3 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.1.25";
+ version = "6.1.27";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-lfTueN3s7wsyQRrulsx7TKVMhOu6//4Z6DDjR/Lm6Vw=";
+ sha256 = "sha256-nc9Oxl5dLGU60jaQdkaErW51s4QsuD977bJubd9BA3A=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index 56bc01387144..2652cd7dfb53 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02d86hv5jfs27hszd9d92q31dz3wl3s1racimkhb7nx8xg0l9ldj";
+ sha256 = "0shhwh5wra3h5vibabdkx422vzs4bwp8kmvn1x46sqscmqk8hw9p";
type = "gem";
};
- version = "1.549.0";
+ version = "1.551.0";
};
aws-sdk-core = {
groups = ["default"];
@@ -124,10 +124,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rzbd111n7pgzpgjabcxi2mpnkxf3fcxkvy4rqidyf80m4633gwy";
+ sha256 = "0f45py2sgai3d7k67kp4hb9ljf8khfz6wd33sj1pdvj55pcg7zai";
type = "gem";
};
- version = "1.294.0";
+ version = "1.296.0";
};
aws-sdk-iam = {
groups = ["default"];
@@ -154,10 +154,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pgh6zd07r9sfzkdz4bf6piq4n8gzl0f76h68l2zxchc1g9z4lqw";
+ sha256 = "085nizd80w75djrch1c38g0xchw6hsyfcg039qp27aalwhxd44b4";
type = "gem";
};
- version = "1.111.1";
+ version = "1.111.3";
};
aws-sigv4 = {
groups = ["default"];
@@ -564,10 +564,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
+ sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8";
type = "gem";
};
- version = "1.8.11";
+ version = "1.9.1";
};
io-console = {
groups = ["default"];
@@ -684,12 +684,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "4a1ba0f9095d5c6e954ba58bc71d02feefc411a5";
- sha256 = "0p79wvr4gqrhx0czxzxsxf24r9acgg69dvhs84r0pvzcvmwfxx4m";
+ rev = "e8c59985fa8e2c65660f2103b75622018e99f6b3";
+ sha256 = "0w0387gnsvmjxmxkzf1chjrpavmdhi37d41ns8x6ab2xbv34xkwx";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.1.25";
+ version = "6.1.27";
};
metasploit-model = {
groups = ["default"];
@@ -706,10 +706,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gpsxysd6lg4falybci1fwlxjmxazjx5birqppdyc9wkqha58j9r";
+ sha256 = "07vjb7kdgr2wi9b5jk7a9niapvbwi7xk4jx9a521fm6p1fhrnlnn";
type = "gem";
};
- version = "2.0.66";
+ version = "2.0.70";
};
metasploit_data_models = {
groups = ["default"];
@@ -726,10 +726,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06v72lyj08haqzs5a12ds6vadq6r2kxy50s7jxp1vxq5i2j4p2gm";
+ sha256 = "09mm8wbp7yaaqpz16bhsag3q5xd4aqx5l1n2p06zg55nph1dgy0s";
type = "gem";
};
- version = "1.0.17";
+ version = "1.0.18";
};
method_source = {
groups = ["default"];
@@ -776,10 +776,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14kg9wdfls7s63lds9blrd77n8mx780bzyh05dj8kn0aimw3l9dx";
+ sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739";
type = "gem";
};
- version = "1.4.3";
+ version = "1.4.4";
};
multi_json = {
groups = ["default"];
@@ -957,30 +957,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz";
+ sha256 = "0886fcc5bi0kc0rbma5fj3wa3hbg2nl7ivnbi2j995yzg36zq7xy";
type = "gem";
};
- version = "0.12.4";
+ version = "0.13.1";
};
pdf-reader = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y";
+ sha256 = "1fh2pq3gk5fh18g71wir98k4bz4rvihhx8qmn8zi9fz6yfqx39qj";
type = "gem";
};
- version = "2.8.0";
+ version = "2.9.0";
};
pg = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
+ sha256 = "0y16aa24ljnyhszqr6g3m0369rmx5xw6dgglipwhi6pn8dl678mr";
type = "gem";
};
- version = "1.2.3";
+ version = "1.3.0";
};
public_suffix = {
groups = ["default"];
@@ -997,10 +997,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn";
+ sha256 = "03blhf8snz59433zsv7apwqy1hg92yhkb5am9x2dpqr0c4i6hscs";
type = "gem";
};
- version = "5.5.2";
+ version = "5.6.1";
};
racc = {
groups = ["default"];
@@ -1147,10 +1147,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hy7xrd3pwyfk2199zkgfa6kz1fsx7ngf6s512gpk8gadjc8hq6j";
+ sha256 = "04w1pknswnjs02fgsqcr8dx6cz3qjmx7hs83kbhn836s4yfpyv6a";
type = "gem";
};
- version = "0.1.20";
+ version = "0.1.25";
};
rex-encoder = {
groups = ["default"];
@@ -1357,10 +1357,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1klfrp56qid5fr1kzsi62bkhpp2yn6pbv0yg4ikf0lgzg5nq781w";
+ sha256 = "0mf3mzxq83y7i8nr6bcl5yacvfz6y5p3hdmvr1m6xq0l0i9a9axy";
type = "gem";
};
- version = "3.0.0";
+ version = "3.0.1";
};
rubyntlm = {
groups = ["default"];
@@ -1627,9 +1627,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx";
+ sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem";
};
- version = "2.5.3";
+ version = "2.5.4";
};
}
diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix
index fa243e4b048f..d2496df94c72 100644
--- a/pkgs/tools/security/yubikey-agent/default.nix
+++ b/pkgs/tools/security/yubikey-agent/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send
'';
- vendorSha256 = "0cpj4nj2g0ick6p79h4pnjg7ybnyz9p26jivv0awi6bmn378nbxn";
+ vendorSha256 = "1v4ccn7ysh8ax1nkf1v9fcgsdnz6zjyh6j6ivyljyfvma1lmcrmk";
doCheck = false;
diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix
index 8a06c363faf0..476ea3dbfb50 100644
--- a/pkgs/tools/security/yubikey-touch-detector/default.nix
+++ b/pkgs/tools/security/yubikey-touch-detector/default.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
rev = version;
sha256 = "sha256-f6j+YNYASH0Adg3236QijApALd/yXJjNMYEdP0Pifw0=";
};
- vendorSha256 = "sha256-bmFbxMU3PEWpYI0eQw/1RRDP+JGfUY8kOCeTWbdVt9k=";
+ vendorSha256 = "sha256-H05EJwYDdg4lq6+psXiwujQd5g294epdRPjqviHhLWs=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix
index 22918f14145c..9613ab8d6504 100644
--- a/pkgs/tools/system/goreman/default.nix
+++ b/pkgs/tools/system/goreman/default.nix
@@ -1,18 +1,27 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- pname = "goreman";
- version = "0.2.1";
+{ lib, buildGoModule, fetchFromGitHub }:
- goPackagePath = "github.com/mattn/goreman";
- subPackages = ["."];
+buildGoModule rec {
+ pname = "goreman";
+ version = "0.3.9";
+ rev = "df1209e7cdbad10aecc0aa75d332bc32822925f5";
src = fetchFromGitHub {
owner = "mattn";
repo = "goreman";
rev = "v${version}";
- sha256 = "1h7ip788j7bkygahpp7ylgnrx9jrbhwjzqpjhd1pflmlaxcbflcy";
+ sha256 = "1irjf5i5ybdchyn42bamfq8pj3w00p633h1gg202n0vsr39h0bxw";
};
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.revision=${builtins.substring 0 7 rev}"
+ ];
+
+ vendorSha256 = "sha256-+RFh6Ppxxs7P7DWqOBeEJTvPsBgOfopMjx22hPEI1/U=";
+
+ doCheck = false;
+
meta = with lib; {
description = "foreman clone written in go language";
homepage = "https://github.com/mattn/goreman";
@@ -20,4 +29,3 @@ buildGoPackage rec {
maintainers = with maintainers; [ zimbatm ];
};
}
-
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 8303e46e4633..86ea78c4aa12 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-4kFd2ULap9kcMu81Lu0SxER7xDAnVVyi9yAVsS1yhnw=";
};
- vendorSha256 = "sha256-tZarz6xwZo9IFfKB9qGxqezYaFrPyQp3wcug5jGaElY=";
+ vendorSha256 = "sha256-MGNv1mEIOvhcpL40MuQob5Uu4qqIGhJxPZTi8BvqQ0s=";
postInstall = ''
mkdir -p $data/share/vale
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b39327eb69c8..c867261cab6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -281,7 +281,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- conftest = callPackage ../development/tools/conftest { };
+ conftest = callPackage ../development/tools/conftest {
+ buildGoModule = buildGo117Module;
+ };
corgi = callPackage ../development/tools/corgi { };
@@ -323,7 +325,9 @@ with pkgs;
eclipse-mat = callPackage ../development/tools/eclipse-mat { };
- evans = callPackage ../development/tools/evans { };
+ evans = callPackage ../development/tools/evans {
+ buildGoModule = buildGo117Module;
+ };
firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
@@ -1017,9 +1021,13 @@ with pkgs;
gofu = callPackage ../applications/misc/gofu { };
- godns = callPackage ../tools/networking/godns { };
+ godns = callPackage ../tools/networking/godns {
+ buildGoModule = buildGo117Module;
+ };
- godspeed = callPackage ../tools/networking/godspeed { };
+ godspeed = callPackage ../tools/networking/godspeed {
+ buildGoModule = buildGo117Module;
+ };
fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { };
@@ -1049,7 +1057,9 @@ with pkgs;
tnat64 = callPackage ../tools/networking/tnat64 { };
- topicctl = callPackage ../tools/misc/topicctl { };
+ topicctl = callPackage ../tools/misc/topicctl {
+ buildGoModule = buildGo117Module;
+ };
veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
@@ -1431,7 +1441,9 @@ with pkgs;
aws-sam-cli = callPackage ../development/tools/aws-sam-cli { };
- aws-vault = callPackage ../tools/admin/aws-vault { };
+ aws-vault = callPackage ../tools/admin/aws-vault {
+ buildGoModule = buildGo117Module;
+ };
aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { };
@@ -1469,19 +1481,25 @@ with pkgs;
chaos = callPackage ../tools/networking/chaos { };
- charm = callPackage ../applications/misc/charm { };
+ charm = callPackage ../applications/misc/charm {
+ buildGoModule = buildGo117Module;
+ };
chars = callPackage ../tools/text/chars {
inherit (darwin.apple_sdk.frameworks) Security;
};
- checkip = callPackage ../tools/networking/checkip { };
+ checkip = callPackage ../tools/networking/checkip {
+ buildGoModule = buildGo117Module;
+ };
ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { };
ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { };
- ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { };
+ ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock {
+ buildGoModule = buildGo117Module;
+ };
ec2-utils = callPackage ../tools/virtualization/ec2-utils { };
@@ -2352,7 +2370,9 @@ with pkgs;
asciidoc = asciidoc-full;
};
- buildpack = callPackage ../development/tools/buildpack { };
+ buildpack = callPackage ../development/tools/buildpack {
+ buildGoModule = buildGo117Module;
+ };
bottom-rs = callPackage ../tools/misc/bottom-rs { };
@@ -2762,7 +2782,9 @@ with pkgs;
ddate = callPackage ../tools/misc/ddate { };
- ddosify = callPackage ../development/tools/ddosify { };
+ ddosify = callPackage ../development/tools/ddosify {
+ buildGoModule = buildGo117Module;
+ };
dduper = callPackage ../tools/filesystems/dduper { };
@@ -2933,7 +2955,9 @@ with pkgs;
ekam = callPackage ../development/tools/build-managers/ekam { };
- eksctl = callPackage ../tools/admin/eksctl { };
+ eksctl = callPackage ../tools/admin/eksctl {
+ buildGoModule = buildGo117Module;
+ };
electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { };
@@ -2945,7 +2969,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_13;
};
- element-desktop-wayland = writeScript "element-desktop-wayland" ''
+ element-desktop-wayland = writeScriptBin "element-desktop" ''
#!/bin/sh
NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@"
'';
@@ -2992,7 +3016,9 @@ with pkgs;
eternal-terminal = callPackage ../tools/networking/eternal-terminal {};
- extrude = callPackage ../tools/security/extrude { };
+ extrude = callPackage ../tools/security/extrude {
+ buildGoModule = buildGo117Module;
+ };
f3 = callPackage ../tools/filesystems/f3 { };
@@ -3040,7 +3066,9 @@ with pkgs;
firestarter = callPackage ../applications/misc/firestarter { };
- fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { };
+ fits-cloudctl = callPackage ../tools/admin/fits-cloudctl {
+ buildGoModule = buildGo117Module;
+ };
flitter = callPackage ../tools/misc/flitter { };
@@ -3678,7 +3706,9 @@ with pkgs;
stagit = callPackage ../development/tools/stagit { };
- starboard = callPackage ../applications/networking/cluster/starboard { };
+ starboard = callPackage ../applications/networking/cluster/starboard {
+ buildGoModule = buildGo117Module;
+ };
statserial = callPackage ../tools/misc/statserial { };
@@ -4113,7 +4143,9 @@ with pkgs;
ciopfs = callPackage ../tools/filesystems/ciopfs { };
- circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
+ circleci-cli = callPackage ../development/tools/misc/circleci-cli {
+ buildGoModule = buildGo117Module;
+ };
circus = callPackage ../tools/networking/circus { };
@@ -4360,7 +4392,9 @@ with pkgs;
checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
- checkmate = callPackage ../development/tools/checkmate { };
+ checkmate = callPackage ../development/tools/checkmate {
+ buildGoModule = buildGo117Module;
+ };
civetweb = callPackage ../development/libraries/civetweb { };
@@ -4944,7 +4978,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_13;
};
- schildichat-desktop-wayland = writeScript "schildichat-desktop-wayland" ''
+ schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" ''
#!/bin/sh
NIXOS_OZONE_WL=1 exec ${schildichat-desktop}/bin/schildichat-desktop "$@"
'';
@@ -5583,7 +5617,9 @@ with pkgs;
garmintools = callPackage ../development/libraries/garmintools {};
- gau = callPackage ../tools/security/gau { };
+ gau = callPackage ../tools/security/gau {
+ buildGoModule = buildGo117Module;
+ };
gauge = callPackage ../development/tools/gauge { };
@@ -5898,7 +5934,9 @@ with pkgs;
gl2ps = callPackage ../development/libraries/gl2ps { };
- glab = callPackage ../applications/version-management/git-and-tools/glab { };
+ glab = callPackage ../applications/version-management/git-and-tools/glab {
+ buildGoModule = buildGo117Module;
+ };
glitter = callPackage ../applications/version-management/git-and-tools/glitter { };
@@ -7863,6 +7901,10 @@ with pkgs;
mole = callPackage ../tools/networking/mole { };
+ morgen = callPackage ../applications/office/morgen {
+ electron = electron_15;
+ };
+
mosh = callPackage ../tools/networking/mosh { };
mpage = callPackage ../tools/text/mpage { };
@@ -8506,7 +8548,12 @@ with pkgs;
opae = callPackage ../development/libraries/opae { };
- opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { };
+ opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector {
+ buildGoModule = buildGo117Module;
+ };
+ opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix {
+ buildGoModule = buildGo117Module;
+ };
opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };
@@ -9216,6 +9263,8 @@ with pkgs;
rep = callPackage ../development/tools/rep { };
+ repseek = callPackage ../applications/science/biology/repseek { };
+
reicast = callPackage ../misc/emulators/reicast { };
reredirect = callPackage ../tools/misc/reredirect { };
@@ -10514,7 +10563,9 @@ with pkgs;
typos = callPackage ../development/tools/typos { };
- tz = callPackage ../tools/misc/tz { };
+ tz = callPackage ../tools/misc/tz {
+ buildGoModule = buildGo117Module;
+ };
u9fs = callPackage ../servers/u9fs { };
@@ -11380,7 +11431,9 @@ with pkgs;
zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
- zsh-history = callPackage ../shells/zsh/zsh-history { };
+ zsh-history = callPackage ../shells/zsh/zsh-history {
+ buildGoModule = buildGo117Module;
+ };
zsh-history-search-multi-word = callPackage ../shells/zsh/zsh-history-search-multi-word { };
@@ -14277,7 +14330,9 @@ with pkgs;
buildozer = bazel-buildtools;
unused_deps = bazel-buildtools;
- bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { };
+ bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote {
+ buildGoModule = buildGo117Module;
+ };
bazel-watcher = callPackage ../development/tools/bazel-watcher { };
@@ -14394,7 +14449,9 @@ with pkgs;
buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { };
- bump = callPackage ../development/tools/github/bump { };
+ bump = callPackage ../development/tools/github/bump {
+ buildGoModule = buildGo117Module;
+ };
libbpf = callPackage ../os-specific/linux/libbpf { };
@@ -14700,7 +14757,9 @@ with pkgs;
doit = with python3Packages; toPythonApplication doit;
- dolt = callPackage ../servers/sql/dolt { };
+ dolt = callPackage ../servers/sql/dolt {
+ buildGoModule = buildGo117Module;
+ };
dot2tex = with python3.pkgs; toPythonApplication dot2tex;
@@ -15789,7 +15848,9 @@ with pkgs;
yq = python3.pkgs.toPythonApplication python3.pkgs.yq;
- yq-go = callPackage ../development/tools/yq-go { };
+ yq-go = callPackage ../development/tools/yq-go {
+ buildGoModule = buildGo117Module;
+ };
ytt = callPackage ../development/tools/ytt {};
@@ -20317,7 +20378,9 @@ with pkgs;
vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { };
- vale = callPackage ../tools/text/vale { };
+ vale = callPackage ../tools/text/vale {
+ buildGoModule = buildGo117Module;
+ };
valhalla = callPackage ../development/libraries/valhalla {
boost = boost.override { enablePython = true; python = python38; };
@@ -20588,9 +20651,13 @@ with pkgs;
yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
- yubikey-agent = callPackage ../tools/security/yubikey-agent { };
+ yubikey-agent = callPackage ../tools/security/yubikey-agent {
+ buildGoModule = buildGo117Module;
+ };
- yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { };
+ yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector {
+ buildGoModule = buildGo117Module;
+ };
zchunk = callPackage ../development/libraries/zchunk { };
@@ -20882,7 +20949,9 @@ with pkgs;
alerta-server = callPackage ../servers/monitoring/alerta { };
- alps = callPackage ../servers/alps {};
+ alps = callPackage ../servers/alps {
+ buildGoModule = buildGo117Module;
+ };
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
apacheHttpd = apacheHttpd_2_4;
@@ -20998,7 +21067,9 @@ with pkgs;
clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
- clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { };
+ clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup {
+ buildGoModule = buildGo117Module;
+ };
couchdb3 = callPackage ../servers/http/couchdb/3.nix {
erlang = erlangR22;
@@ -21468,7 +21539,9 @@ with pkgs;
quark = callPackage ../servers/http/quark { };
- soft-serve = callPackage ../servers/soft-serve { };
+ soft-serve = callPackage ../servers/soft-serve {
+ buildGoModule = buildGo117Module;
+ };
sympa = callPackage ../servers/mail/sympa { };
@@ -22014,6 +22087,8 @@ with pkgs;
victoriametrics = callPackage ../servers/nosql/victoriametrics { };
+ virtiofsd = callPackage ../servers/misc/virtiofsd { };
+
virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };
virtualenv = with python3Packages; toPythonApplication virtualenv;
@@ -22213,7 +22288,9 @@ with pkgs;
cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
- cariddi = callPackage ../tools/security/cariddi { };
+ cariddi = callPackage ../tools/security/cariddi {
+ buildGoModule = buildGo117Module;
+ };
checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
@@ -22236,7 +22313,9 @@ with pkgs;
coredns = callPackage ../servers/dns/coredns { };
- corerad = callPackage ../tools/networking/corerad { };
+ corerad = callPackage ../tools/networking/corerad {
+ buildGoModule = buildGo117Module;
+ };
cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
@@ -23692,6 +23771,8 @@ with pkgs;
kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {};
+ kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { };
+
kochi-substitute = callPackage ../data/fonts/kochi-substitute {};
kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
@@ -25312,7 +25393,9 @@ with pkgs;
exercism = callPackage ../applications/misc/exercism { };
- expenses = callPackage ../applications/misc/expenses { };
+ expenses = callPackage ../applications/misc/expenses {
+ buildGoModule = buildGo117Module;
+ };
fnott = callPackage ../applications/misc/fnott { };
@@ -26954,8 +27037,10 @@ with pkgs;
boost = boost175;
};
- libreoffice = hiPrio libreoffice-still;
- libreoffice-unwrapped = libreoffice.libreoffice;
+ libreoffice = if stdenv.isDarwin
+ then callPackage ../applications/office/libreoffice/darwin.nix {}
+ else hiPrio libreoffice-still;
+ libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice;
libreoffice-args = {
inherit (perlPackages) ArchiveZip IOCompress;
@@ -28186,8 +28271,7 @@ with pkgs;
plexamp = callPackage ../applications/audio/plexamp { };
- # Upstream says it supports only qt5.9 which is not packaged, and building with qt newer than 5.12 fails
- plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { };
+ plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { };
plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
@@ -30287,7 +30371,9 @@ with pkgs;
ergo = callPackage ../applications/blockchains/ergo { };
- erigon = callPackage ../applications/blockchains/erigon.nix { };
+ erigon = callPackage ../applications/blockchains/erigon.nix {
+ buildGoModule = buildGo117Module;
+ };
exodus = callPackage ../applications/blockchains/exodus { };
@@ -31815,7 +31901,9 @@ with pkgs;
conglomerate = callPackage ../applications/science/biology/conglomerate { };
- dalfox = callPackage ../tools/security/dalfox { };
+ dalfox = callPackage ../tools/security/dalfox {
+ buildGoModule = buildGo117Module;
+ };
dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
@@ -33408,6 +33496,8 @@ with pkgs;
nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { };
+ alejandra = callPackage ../tools/nix/alejandra { };
+
nixfmt = haskell.lib.compose.justStaticExecutables haskellPackages.nixfmt;
nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { };
@@ -33757,7 +33847,9 @@ with pkgs;
go-swag = callPackage ../development/tools/go-swag { };
- go-swagger = callPackage ../development/tools/go-swagger { };
+ go-swagger = callPackage ../development/tools/go-swagger {
+ buildGoModule = buildGo117Module;
+ };
jx = callPackage ../applications/networking/cluster/jx {};
@@ -33908,7 +34000,9 @@ with pkgs;
vice = callPackage ../misc/emulators/vice { };
- viddy = callPackage ../tools/misc/viddy { };
+ viddy = callPackage ../tools/misc/viddy {
+ buildGoModule = buildGo117Module;
+ };
ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { };
@@ -34244,7 +34338,9 @@ with pkgs;
zimg = callPackage ../development/libraries/zimg { };
- wtf = callPackage ../applications/misc/wtf { };
+ wtf = callPackage ../applications/misc/wtf {
+ buildGoModule = buildGo117Module;
+ };
zk-shell = callPackage ../applications/misc/zk-shell { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf500972540d..0536f366d50b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6321,6 +6321,8 @@ in {
prettytable = callPackage ../development/python-modules/prettytable { };
+ primecountpy = callPackage ../development/python-modules/primecountpy { };
+
primer3 = callPackage ../development/python-modules/primer3 { };
priority = callPackage ../development/python-modules/priority { };