diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index e96bc47b4a5..bcb5d0d02f7 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -14,6 +14,10 @@ with pkgs;
let
lib = pkgs.lib;
+ docbook_xsl_ns = pkgs.docbook-xsl-ns.override {
+ withManOptDedupPatch = true;
+ };
+
# We need to strip references to /nix/store/* from options,
# including any `extraSources` if some modules came from elsewhere,
# or else the build will fail.
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 7bcfcebe21b..ceb9ca53716 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
@@ -1680,6 +1680,13 @@
true.
+
+
+ A module for declarative configuration of openconnect VPN
+ profiles was added under
+ networking.openconnect.
+
+
The element-desktop package now has an
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index a086751a2f3..ff628d00725 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -581,6 +581,8 @@ In addition to numerous new and upgraded packages, this release has the followin
using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`
is set to `true`.
+- A module for declarative configuration of openconnect VPN profiles was added under `networking.openconnect`.
+
- The `element-desktop` package now has an `useKeytar` option (defaults to `true`),
which allows disabling `keytar` and in turn `libsecret` usage
(which binds to native credential managers / keychain libraries).
diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix
index 20bbe9ff5d9..250f714be0a 100644
--- a/nixos/lib/qemu-common.nix
+++ b/nixos/lib/qemu-common.nix
@@ -23,8 +23,8 @@ rec {
qemuBinary = qemuPkg: {
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
- armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
- aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
+ armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -machine virt,accel=kvm:tcg -cpu max";
+ aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=max,accel=kvm:tcg -cpu max";
powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 329c8685c36..2d847b6bb85 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -853,6 +853,7 @@
./services/networking/ofono.nix
./services/networking/oidentd.nix
./services/networking/onedrive.nix
+ ./services/networking/openconnect.nix
./services/networking/openvpn.nix
./services/networking/ostinato.nix
./services/networking/owamp.nix
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 7a9d9e5428a..242afd548df 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -5,18 +5,6 @@ with lib;
let
cfg = config.networking.networkmanager;
- basePackages = with pkgs; [
- modemmanager
- networkmanager
- networkmanager-fortisslvpn
- networkmanager-iodine
- networkmanager-l2tp
- networkmanager-openconnect
- networkmanager-openvpn
- networkmanager-vpnc
- networkmanager-sstp
- ] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant;
-
delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [];
enableIwd = cfg.wifi.backend == "iwd";
@@ -145,6 +133,15 @@ let
'';
};
+ packages = [
+ pkgs.modemmanager
+ pkgs.networkmanager
+ ]
+ ++ cfg.plugins
+ ++ lib.optionals (!delegateWireless && !enableIwd) [
+ pkgs.wpa_supplicant
+ ];
+
in {
meta = {
@@ -227,17 +224,33 @@ in {
'';
};
- packages = mkOption {
- type = types.listOf types.package;
+ plugins = mkOption {
+ type =
+ let
+ networkManagerPluginPackage = types.package // {
+ description = "NetworkManager plug-in";
+ check =
+ p:
+ lib.assertMsg
+ (types.package.check p
+ && p ? networkManagerPlugin
+ && lib.isString p.networkManagerPlugin)
+ ''
+ Package ‘${p.name}’, is not a NetworkManager plug-in.
+ Those need to have a ‘networkManagerPlugin’ attribute.
+ '';
+ };
+ in
+ types.listOf networkManagerPluginPackage;
default = [ ];
description = ''
- Extra packages that provide NetworkManager plugins.
+ List of NetworkManager plug-ins to enable.
+ Some plug-ins are enabled by the NetworkManager module by default.
'';
- apply = list: basePackages ++ list;
};
dhcp = mkOption {
- type = types.enum [ "dhclient" "dhcpcd" "internal" ];
+ type = types.enum [ "dhcpcd" "internal" ];
default = "internal";
description = ''
Which program (or internal library) should be used for DHCP.
@@ -380,7 +393,7 @@ in {
If you enable this option the
networkmanager_strongswan plugin will be added to
- the option
+ the option
so you don't need to to that yourself.
'';
};
@@ -399,6 +412,9 @@ in {
};
imports = [
+ (mkRenamedOptionModule
+ [ "networking" "networkmanager" "packages" ]
+ [ "networking" "networkmanager" "plugins" ])
(mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
(mkRemovedOptionModule ["networking" "networkmanager" "dynamicHosts"] ''
This option was removed because allowing (multiple) regular users to
@@ -426,31 +442,12 @@ in {
hardware.wirelessRegulatoryDatabase = true;
- environment.etc = with pkgs; {
- "NetworkManager/NetworkManager.conf".source = configFile;
-
- "NetworkManager/VPN/nm-openvpn-service.name".source =
- "${networkmanager-openvpn}/lib/NetworkManager/VPN/nm-openvpn-service.name";
-
- "NetworkManager/VPN/nm-vpnc-service.name".source =
- "${networkmanager-vpnc}/lib/NetworkManager/VPN/nm-vpnc-service.name";
-
- "NetworkManager/VPN/nm-openconnect-service.name".source =
- "${networkmanager-openconnect}/lib/NetworkManager/VPN/nm-openconnect-service.name";
-
- "NetworkManager/VPN/nm-fortisslvpn-service.name".source =
- "${networkmanager-fortisslvpn}/lib/NetworkManager/VPN/nm-fortisslvpn-service.name";
-
- "NetworkManager/VPN/nm-l2tp-service.name".source =
- "${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name";
-
- "NetworkManager/VPN/nm-iodine-service.name".source =
- "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name";
-
- "NetworkManager/VPN/nm-sstp-service.name".source =
- "${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name";
-
+ environment.etc = {
+ "NetworkManager/NetworkManager.conf".source = configFile;
}
+ // builtins.listToAttrs (map (pkg: nameValuePair "NetworkManager/${pkg.networkManagerPlugin}" {
+ source = "${pkg}/lib/NetworkManager/${pkg.networkManagerPlugin}";
+ }) cfg.plugins)
// optionalAttrs cfg.enableFccUnlock
{
"ModemManager/fcc-unlock.d".source =
@@ -460,18 +457,13 @@ in {
{
"NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript;
}
- // optionalAttrs cfg.enableStrongSwan
- {
- "NetworkManager/VPN/nm-strongswan-service.name".source =
- "${pkgs.networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name";
- }
// listToAttrs (lib.imap1 (i: s:
{
name = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
value = { mode = "0544"; inherit (s) source; };
}) cfg.dispatcherScripts);
- environment.systemPackages = cfg.packages;
+ environment.systemPackages = packages;
users.groups = {
networkmanager.gid = config.ids.gids.networkmanager;
@@ -490,14 +482,13 @@ in {
};
};
- systemd.packages = cfg.packages;
+ systemd.packages = packages;
systemd.tmpfiles.rules = [
"d /etc/NetworkManager/system-connections 0700 root root -"
"d /etc/ipsec.d 0700 root root -"
"d /var/lib/NetworkManager-fortisslvpn 0700 root root -"
- "d /var/lib/dhclient 0755 root root -"
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
];
@@ -534,8 +525,20 @@ in {
useDHCP = false;
})
+ {
+ networkmanager.plugins = with pkgs; [
+ networkmanager-fortisslvpn
+ networkmanager-iodine
+ networkmanager-l2tp
+ networkmanager-openconnect
+ networkmanager-openvpn
+ networkmanager-vpnc
+ networkmanager-sstp
+ ];
+ }
+
(mkIf cfg.enableStrongSwan {
- networkmanager.packages = [ pkgs.networkmanager_strongswan ];
+ networkmanager.plugins = [ pkgs.networkmanager_strongswan ];
})
(mkIf enableIwd {
@@ -559,10 +562,10 @@ in {
security.polkit.enable = true;
security.polkit.extraConfig = polkitConf;
- services.dbus.packages = cfg.packages
+ services.dbus.packages = packages
++ optional cfg.enableStrongSwan pkgs.strongswanNM
++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq;
- services.udev.packages = cfg.packages;
+ services.udev.packages = packages;
};
}
diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix
new file mode 100644
index 00000000000..de4b505130e
--- /dev/null
+++ b/nixos/modules/services/networking/openconnect.nix
@@ -0,0 +1,137 @@
+{ config, lib, options, pkgs, ... }:
+with lib;
+let
+ cfg = config.networking.openconnect;
+ openconnect = cfg.package;
+ pkcs11 = types.strMatching "pkcs11:.+" // {
+ name = "pkcs11";
+ description = "PKCS#11 URI";
+ };
+ interfaceOptions = {
+ options = {
+ gateway = mkOption {
+ description = "Gateway server to connect to.";
+ example = "gateway.example.com";
+ type = types.str;
+ };
+
+ protocol = mkOption {
+ description = "Protocol to use.";
+ example = "anyconnect";
+ type =
+ types.enum [ "anyconnect" "array" "nc" "pulse" "gp" "f5" "fortinet" ];
+ };
+
+ user = mkOption {
+ description = "Username to authenticate with.";
+ example = "example-user";
+ type = types.nullOr types.str;
+ };
+
+ # Note: It does not make sense to provide a way to declaratively
+ # set an authentication cookie, because they have to be requested
+ # for every new connection and would only work once.
+ passwordFile = mkOption {
+ description = ''
+ File containing the password to authenticate with. This
+ is passed to openconnect via the
+ --passwd-on-stdin option.
+ '';
+ default = null;
+ example = "/var/lib/secrets/openconnect-passwd";
+ type = types.nullOr types.path;
+ };
+
+ certificate = mkOption {
+ description = "Certificate to authenticate with.";
+ default = null;
+ example = "/var/lib/secrets/openconnect_certificate.pem";
+ type = with types; nullOr (either path pkcs11);
+ };
+
+ privateKey = mkOption {
+ description = "Private key to authenticate with.";
+ example = "/var/lib/secrets/openconnect_private_key.pem";
+ default = null;
+ type = with types; nullOr (either path pkcs11);
+ };
+
+ extraOptions = mkOption {
+ description = ''
+ Extra config to be appended to the interface config. It should
+ contain long-format options as would be accepted on the command
+ line by openconnect
+ (see https://www.infradead.org/openconnect/manual.html).
+ Non-key-value options like deflate can be used by
+ declaring them as booleans, i. e. deflate = true;.
+ '';
+ default = { };
+ example = {
+ compression = "stateless";
+
+ no-http-keepalive = true;
+ no-dtls = true;
+ };
+ type = with types; attrsOf (either str bool);
+ };
+ };
+ };
+ generateExtraConfig = extra_cfg:
+ strings.concatStringsSep "\n" (attrsets.mapAttrsToList
+ (name: value: if (value == true) then name else "${name}=${value}")
+ (attrsets.filterAttrs (_: value: value != false) extra_cfg));
+ generateConfig = name: icfg:
+ pkgs.writeText "config" ''
+ interface=${name}
+ ${optionalString (icfg.user != null) "user=${icfg.user}"}
+ ${optionalString (icfg.passwordFile != null) "passwd-on-stdin"}
+ ${optionalString (icfg.certificate != null)
+ "certificate=${icfg.certificate}"}
+ ${optionalString (icfg.privateKey != null) "sslkey=${icfg.privateKey}"}
+
+ ${generateExtraConfig icfg.extraOptions}
+ '';
+ generateUnit = name: icfg: {
+ description = "OpenConnect Interface - ${name}";
+ requires = [ "network-online.target" ];
+ after = [ "network.target" "network-online.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ Type = "simple";
+ ExecStart = "${openconnect}/bin/openconnect --config=${
+ generateConfig name icfg
+ } ${icfg.gateway}";
+ StandardInput = "file:${icfg.passwordFile}";
+
+ ProtectHome = true;
+ };
+ };
+in {
+ options.networking.openconnect = {
+ package = mkPackageOption pkgs "openconnect" { };
+
+ interfaces = mkOption {
+ description = "OpenConnect interfaces.";
+ default = { };
+ example = {
+ openconnect0 = {
+ gateway = "gateway.example.com";
+ protocol = "anyconnect";
+ user = "example-user";
+ passwordFile = "/var/lib/secrets/openconnect-passwd";
+ };
+ };
+ type = with types; attrsOf (submodule interfaceOptions);
+ };
+ };
+
+ config = {
+ systemd.services = mapAttrs' (name: value: {
+ name = "openconnect-${name}";
+ value = generateUnit name value;
+ }) cfg.interfaces;
+ };
+
+ meta.maintainers = with maintainers; [ alyaeanyx ];
+}
diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix
index 8efa177e30d..dc7853b9503 100644
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixos/modules/virtualisation/azure-common.nix
@@ -21,7 +21,11 @@ with lib;
# way to select them anyway.
boot.loader.grub.configurationLimit = 0;
- fileSystems."/".device = "/dev/disk/by-label/nixos";
+ fileSystems."/" = {
+ device = "/dev/disk/by-label/nixos";
+ fsType = "ext4";
+ autoResize = true;
+ };
# Allow root logins only using the SSH key that the user specified
# at instance creation time, ping client connections to avoid timeouts
diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix
index 60df749a142..94290ada7b3 100644
--- a/pkgs/applications/audio/jmusicbot/default.nix
+++ b/pkgs/applications/audio/jmusicbot/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "JMusicBot";
- version = "0.3.6";
+ version = "0.3.8";
src = fetchurl {
url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar";
- sha256 = "sha256-Hc3dsOADC+jVZScY19OYDkHimntMjdw/BoB3EUS/d0k=";
+ sha256 = "sha256-wzmrh9moY6oo3RqOy9Zl1X70BZlvbJkQmz8BaBIFtIM=";
};
dontUnpack = true;
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 7a8cae9bf81..13a40cee5ed 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -45,13 +45,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
- version = "7.1.0-26";
+ version = "7.1.0-29";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
- hash = "sha256-q1CL64cfyb5fN9aVYJfls+v0XRFd4jH+B8n+UJqPE1I=";
+ hash = "sha256-46fJMOIGnK5aNIcG7+8mJdZDcSFyFmhmkLcuVlnupSU=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -64,9 +64,7 @@ stdenv.mkDerivation rec {
++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ])
++ lib.optional (librsvg != null) "--with-rsvg"
++ lib.optional (liblqr1 != null) "--with-lqr"
- # libjxl is broken on aarch64 (see meta.broken in libjxl) for now,
- # let's disable it for now to unbreak the imagemagick build.
- ++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl"
+ ++ lib.optional (libjxl != null ) "--with-jxl"
++ lib.optionals (ghostscript != null)
[
"--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
@@ -92,11 +90,8 @@ stdenv.mkDerivation rec {
libxml2
libheif
djvulibre
+ libjxl
]
- # libjxl is broken on aarch64 (see meta.broken in libjxl) for now,
- # let's disable it for now to unbreak the imagemagick build.
- ++ lib.optionals (!stdenv.isAarch64)
- [ libjxl ]
++ lib.optionals (!stdenv.hostPlatform.isMinGW)
[ openexr librsvg openjpeg ]
++ lib.optionals stdenv.isDarwin [
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index d2873f64142..0385c5db9d8 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yEd";
- version = "3.21.1";
+ version = "3.22";
src = fetchzip {
url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
- sha256 = "1jw28hkd7p0n660gid8yh5y0kdcz6ycn4hsgjlf0pq48x9kv6w0c";
+ sha256 = "sha256-GHYdvWie2k9YarS9DaA4bExswV3UQ26O8+7K/6yvtac=";
};
nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];
diff --git a/pkgs/applications/misc/join-desktop/default.nix b/pkgs/applications/misc/join-desktop/default.nix
new file mode 100644
index 00000000000..0b09911ddb2
--- /dev/null
+++ b/pkgs/applications/misc/join-desktop/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, stdenv
+, fetchurl
+, alsa-lib
+, autoPatchelfHook
+, dpkg
+, gtk3
+, makeWrapper
+, mesa
+, nss
+, systemd
+, xorg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "join-desktop";
+ version = "1.1.2";
+
+ src = fetchurl {
+ url = "https://github.com/joaomgcd/JoinDesktop/releases/download/v${version}/com.joaomgcd.join_${version}_amd64.deb";
+ sha256 = "sha256-k1LX/HC3tfL4Raipo7wp/LnfrPa38x8NBeKRyHJ72CU=";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ dpkg
+ makeWrapper
+ ];
+
+ buildInputs = [
+ alsa-lib
+ gtk3
+ mesa
+ nss
+ xorg.libXScrnSaver
+ xorg.libXtst
+ ];
+
+ unpackPhase = "dpkg-deb -x $src .";
+
+ runtimeDependencies = [
+ (lib.getLib systemd)
+ # TODO: check if they are required
+ # libnotify
+ # libappindicator
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/share/join-desktop
+
+ mv usr/share/* $out/share
+ mv opt/Join\ Desktop/* $out/share/join-desktop
+
+ ln -s $out/share/join-desktop/com.joaomgcd.join $out/bin/
+
+ substituteInPlace $out/share/applications/com.joaomgcd.join.desktop \
+ --replace "/opt/Join Desktop/com.joaomgcd.join" "com.joaomgcd.join"
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/joaomgcd/JoinDesktop/";
+ description = "Desktop app for Join";
+ # on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license
+ license = licenses.free;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+
+}
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 8290a868ef0..5a12380a4ff 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "taskwarrior";
- version = "2.6.1";
+ version = "2.6.2";
src = fetchFromGitHub {
owner = "GothenburgBitFactory";
repo = "taskwarrior";
rev = "v${version}";
- sha256 = "sha256-jMZzo2cegoapEHTvfD6ThU1IsXru3iOcpyDbZxkSXzQ=";
+ sha256 = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 6dd6d98c0ef..a303dabad32 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -39,14 +39,12 @@
, glibc # gconv + locale
# Package customization:
-, gnomeSupport ? false, gnome2 ? null
-, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
, cupsSupport ? true, cups ? null
, proprietaryCodecs ? true
, pulseSupport ? false, libpulseaudio ? null
, ungoogled ? false, ungoogled-chromium
# Optional dependencies:
-, libgcrypt ? null # gnomeSupport || cupsSupport
+, libgcrypt ? null # cupsSupport
, systemdSupport ? stdenv.isLinux
, systemd
}:
@@ -154,8 +152,6 @@ let
curl
libepoxy
] ++ optional systemdSupport systemd
- ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ]
- ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio;
@@ -271,7 +267,7 @@ let
# Optional features:
use_gio = true;
- use_gnome_keyring = gnomeKeyringSupport;
+ use_gnome_keyring = false; # Superseded by libsecret
use_cups = cupsSupport;
# Feature overrides:
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index e8d9a13f9ac..5bd24faafe4 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -8,8 +8,6 @@
# package customization
# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
, channel ? "stable"
-, gnomeSupport ? false, gnome2 ? null
-, gnomeKeyringSupport ? false
, proprietaryCodecs ? true
, enableWideVine ? false
, ungoogled ? false # Whether to build chromium or ungoogled-chromium
@@ -46,7 +44,7 @@ let
mkChromiumDerivation = callPackage ./common.nix ({
inherit channel chromiumVersionAtLeast versionRange;
- inherit gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs
+ inherit proprietaryCodecs
cupsSupport pulseSupport ungoogled;
gnChromium = gn.overrideAttrs (oldAttrs: {
inherit (upstream-info.deps.gn) version;
diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py
index 85ebb8a7b93..833b6b8283d 100755
--- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py
+++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py
@@ -38,9 +38,9 @@ for entry in feed.entries:
else:
print('chromium: TODO -> ' + version + '\n')
print(url)
- if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0):
- zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content)
- if zero_days:
+ if fixes := re.search(r'This update includes .+ security fixes\.', content):
+ fixes = fixes.group(0)
+ if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content):
fixes += " " + zero_days.group(0)
print('\n' + '\n'.join(textwrap.wrap(fixes, width=72)))
if cve_list := re.findall(r'CVE-[^: ]+', content):
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index b83aae6c34b..a27752bda8a 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -19,9 +19,9 @@
}
},
"beta": {
- "version": "101.0.4951.15",
- "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y",
- "sha256bin64": "0z2rx7mw9wg5ly8wmxkflk8f9gifq4cxqvi224v9dr11qqj8gwm2",
+ "version": "101.0.4951.26",
+ "sha256": "1wpdi5l0bic0z9ydvx5vj35z6fh21b3n8dsxyvcbm0rq4fca5zcg",
+ "sha256bin64": "13mx2jxq5pjzp6dxvnzkfs83krhvpbw0pim7z4c7hhyphjc4fhzr",
"deps": {
"gn": {
"version": "2022-03-14",
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index da3b85d8993..14cb38d60ce 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helmfile";
- version = "0.143.5";
+ version = "0.144.0";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
- sha256 = "sha256-48DbN3O5HVlNpHct6uKw9CjeaDlAZqY+/Tqd4a9mmUw=";
+ sha256 = "sha256-mfRPrgnOXqfmbpvaIxJNkgkdTEJKcFycrgFmQ7YDvTU=";
};
vendorSha256 = "sha256-ddf3m0DGsjubzp/aERvhfJ51UKKSNMC1Xu7ybyif8HA=";
diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix
index 7e12f18a78c..c04785027ca 100644
--- a/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/pkgs/applications/networking/cluster/talosctl/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
# nixpkgs-update: no auto update
src = fetchFromGitHub {
- owner = "talos-systems";
+ owner = "siderolabs";
repo = "talos";
rev = "v${version}";
inherit sha256;
@@ -26,14 +26,16 @@ buildGoModule rec {
mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG
in
[
- "-X ${versionPkg}.Name=Talos"
+ "-X ${versionPkg}.Name=Client"
"-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do
"-X ${versionPkg}.Tag=${src.rev}"
"-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS
"-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS
- "-X ${imagesPkgs}.Username=talos-systems" # USERNAME
+ "-X ${imagesPkgs}.Username=siderolabs" # USERNAME
"-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY
"-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS
+ "-s"
+ "-w"
];
subPackages = [ "cmd/talosctl" ];
@@ -51,7 +53,7 @@ buildGoModule rec {
meta = with lib; {
description = "A CLI for out-of-band management of Kubernetes nodes created by Talos";
- homepage = "https://github.com/talos-systems/talos";
+ homepage = "https://www.talos.dev/";
license = licenses.mpl20;
maintainers = with maintainers; [ flokli ];
};
diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix
index 12871719172..df0ae08eede 100644
--- a/pkgs/applications/networking/cluster/waypoint/default.nix
+++ b/pkgs/applications/networking/cluster/waypoint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "waypoint";
- version = "0.7.2";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ek3WOL1sNPAIkZN/cWDSmlNtN41VL3SKb7Qb4kew8vo=";
+ sha256 = "sha256-NRR/N61QdBF4jaioF7+X3xOdvaJ8COEzXL4hVHYSqW4=";
};
- vendorSha256 = "sha256-a0O36zyQQSVrGXWpTdCkAAwNAXU23pcFJBB+o2KYnWw=";
+ vendorSha256 = "sha256-57/MzO5TulGKMkGdQRoFNKIKF7upJiPazF0+Ovt/LG8=";
nativeBuildInputs = [ go-bindata installShellFiles ];
diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
index 5fe90d50a31..baa4613b173 100644
--- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "kdeltachat";
- version = "unstable-2022-01-02";
+ version = "unstable-2022-03-20";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
- rev = "ec545c8208c870c44312558f91c79e6ffce4444e";
- hash = "sha256-s/dJ2ahdUK7ODKsna+tl81e+VQLkCAELb/iEXf9WlIM=";
+ rev = "8cce6d20b49e917929521a13caed30e81037c868";
+ hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
index ce5dc0e266e..f46a918d3c6 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
@@ -7,7 +7,6 @@
, ninja
, clang
, python3
-, wrapGAppsHook
, wrapQtAppsHook
, removeReferencesTo
, extra-cmake-modules
@@ -27,7 +26,6 @@
, tl-expected
, hunspell
, glibmm
-, webkitgtk
, jemalloc
, rnnoise
, abseil-cpp
@@ -65,7 +63,6 @@
, IOSurface
, Metal
, MetalKit
-, withWebKit ? false
}:
with lib;
@@ -113,9 +110,6 @@ stdenv.mkDerivation rec {
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
- '' + optionalString (stdenv.isLinux && withWebKit) ''
- substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \
- --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"'
'' + optionalString stdenv.isDarwin ''
substituteInPlace Telegram/CMakeLists.txt \
--replace 'COMMAND iconutil' 'COMMAND png2icns' \
@@ -124,10 +118,6 @@ stdenv.mkDerivation rec {
--replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png"
'';
- # We want to run wrapProgram manually (with additional parameters)
- dontWrapGApps = stdenv.isLinux;
- dontWrapQtApps = stdenv.isLinux && withWebKit;
-
nativeBuildInputs = [
pkg-config
cmake
@@ -139,8 +129,6 @@ stdenv.mkDerivation rec {
# to build bundled libdispatch
clang
extra-cmake-modules
- ] ++ optionals (stdenv.isLinux && withWebKit) [
- wrapGAppsHook
];
buildInputs = [
@@ -166,8 +154,6 @@ stdenv.mkDerivation rec {
glibmm
jemalloc
wayland
- ] ++ optionals (stdenv.isLinux && withWebKit) [
- webkitgtk
] ++ optionals stdenv.isDarwin [
Cocoa
CoreFoundation
@@ -225,13 +211,6 @@ stdenv.mkDerivation rec {
remove-references-to -t ${tg_owt.dev} $out/bin/$binName
'';
- postFixup = optionalString (stdenv.isLinux && withWebKit) ''
- # We also use gappsWrapperArgs from wrapGAppsHook.
- wrapProgram $out/bin/kotatogram-desktop \
- "''${gappsWrapperArgs[@]}" \
- "''${qtWrapperArgs[@]}"
- '';
-
passthru = {
inherit tg_owt;
};
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix
new file mode 100644
index 00000000000..435268cdf62
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }:
+
+with lib;
+
+stdenv.mkDerivation {
+ pname = "${kotatogram-desktop.pname}-with-webkit";
+ version = kotatogram-desktop.version;
+ nativeBuildInputs = [ makeWrapper ];
+ dontUnpack = true;
+ installPhase = ''
+ mkdir -p $out
+ cp -r ${kotatogram-desktop}/share $out
+ '';
+ postFixup = ''
+ mkdir -p $out/bin
+ makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \
+ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \
+ --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ webkitgtk ]}
+ '';
+ meta = kotatogram-desktop.meta // {
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix
index 3c43715dd98..c15a5377173 100644
--- a/pkgs/applications/networking/instant-messengers/zulip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix
@@ -5,12 +5,12 @@
let
pname = "zulip";
- version = "5.9.0";
+ version = "5.9.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
- hash = "sha256-qiGkZuGJsKuquMuAcO+9wbU4KW++uyOb4TKb9lCgZmI=";
+ hash = "sha256-hUi4t7WdZG6GmNQfUcG4E9qGJDdPIMbglJzwR7tFNVQ=";
name="${pname}-${version}.AppImage";
};
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 31d0ce461d0..e4088c3c460 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,16 +4,16 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
- version = "1.19.1";
+ version = "1.19.2";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "sha256-/CRDdKUeLQ/jSLrd44Tjbb0lfgFFnJkpmFEYZJFQHY8=";
+ sha256 = "sha256-Zday5lBsRCl00vnnXNKu6VMlq8zmwgI0I+73Pir7ss4=";
};
- vendorSha256 = "sha256-GBDGckGewo5Yp8zwAKwwXkSP5lx0fQR4AHQFkzO7Q0Q=";
+ vendorSha256 = "sha256-2yK0eE34cA7U1nDWRp/JigFpeveipmCuL4jP+94T3Sg=";
doCheck = false;
diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix
index b42fed8da28..44caca2fa2c 100644
--- a/pkgs/applications/science/biology/eggnog-mapper/default.nix
+++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix
@@ -1,29 +1,43 @@
-{ lib, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }:
+{ lib
+, autoPatchelfHook
+, fetchFromGitHub
+, python3Packages
+, wget
+, zlib
+}:
-python27Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "eggnog-mapper";
- version = "1.0.3";
+ version = "2.1.7";
src = fetchFromGitHub {
owner = "eggnogdb";
- repo = "eggnog-mapper";
+ repo = pname;
rev = version;
- sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv";
+ hash = "sha256-auVD/r8m3TAB1KYMQ7Sae23eDg6LRx/daae0505cjwU=";
};
- patches = (fetchpatch {
- url = "https://github.com/eggnogdb/eggnog-mapper/commit/6972f601ade85b65090efca747d2302acb58507f.patch";
- sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf";
- });
+ postPatch = ''
+ # Not a great solution...
+ substituteInPlace setup.cfg \
+ --replace "==" ">="
+ '';
- nativeBuildInputs = [ makeWrapper ];
- propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ];
+ nativeBuildInputs = [
+ autoPatchelfHook
+ ];
- # make emapper find diamond & hmmer
- makeWrapperArgs = [
- ''--prefix PATH ':' "${diamond}/bin"''
- ''--prefix PATH ':' "${hmmer}/bin"''
- ];
+ buildInputs = [
+ zlib
+ ];
+
+ propagatedBuildInputs = [
+ wget
+ ] ++ (with python3Packages; [
+ biopython
+ psutil
+ XlsxWriter
+ ]);
# Tests rely on some of the databases being available, which is not bundled
# with this package as (1) in total, they represent >100GB of data, and (2)
diff --git a/pkgs/applications/science/engineering/brmodelo/default.nix b/pkgs/applications/science/engineering/brmodelo/default.nix
new file mode 100644
index 00000000000..c0573ae131d
--- /dev/null
+++ b/pkgs/applications/science/engineering/brmodelo/default.nix
@@ -0,0 +1,109 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, openjdk8
+, ant
+, makeWrapper
+, makeDesktopItem
+, copyDesktopItems
+}:
+
+stdenv.mkDerivation rec {
+ pname = "brmodelo";
+ version = "3.31";
+
+ src = fetchFromGitHub {
+ owner = "chcandido";
+ repo = pname;
+ rev = version;
+ sha256 = "09qrhqhv264x8phnf3pnb0cwq75l7xdsj9xkwlvhry81nxz0d5v0";
+ };
+
+ nativeBuildInputs = [ ant makeWrapper copyDesktopItems ];
+
+ buildInputs = [ openjdk8 ];
+
+ patches = [
+ # Fixes for building with Ant.
+ # https://github.com/chcandido/brModelo/pull/22
+ (fetchpatch {
+ name = "fix-self-closing-element-not-allowed.patch";
+ url = "https://github.com/yuuyins/brModelo/commit/0d712b74fd5d29d67be07480ed196da28a77893b.patch";
+ sha256 = "sha256-yy03arE6xetotzyvpToi9o9crg3KnMRn1J70jDUvSXE=";
+ })
+ (fetchpatch {
+ name = "fix-tag-closing.patch";
+ url = "https://github.com/yuuyins/brModelo/commit/e8530ff75f024cf6effe0408ed69985405e9709c.patch";
+ sha256 = "sha256-MNuh/ORbaAkB5qDSlA/nPrXN+tqzz4oOglVyEtSangI=";
+ })
+ (fetchpatch {
+ name = "fix-bad-use-greater-than.patch";
+ url = "https://github.com/yuuyins/brModelo/commit/498a6ef8129daff5a472b318f93c8f7f2897fc7f.patch";
+ sha256 = "sha256-MmAwYUmx38DGRsiSxCWCObtpqxk0ykUQiDSC76bCpFc=";
+ })
+ (fetchpatch {
+ name = "fix-param-errors.patch";
+ url = "https://github.com/yuuyins/brModelo/commit/8a508aaba0bcffe13a3f95cff495230beea36bc4.patch";
+ sha256 = "sha256-qME9gZChSMzu1vs9HaosD+snb+jlOrQLY97meNoA8oU=";
+ })
+
+ # Add SVG icons.
+ # https://github.com/chcandido/brModelo/pull/23
+ (fetchpatch {
+ name = "add-brmodelo-logo-icons-svg.patch";
+ url = "https://github.com/yuuyins/brModelo/commit/f260b82b664fad3325bbf3ebd7a15488d496946b.patch";
+ sha256 = "sha256-UhgcWxsHkNFS1GgaRnmlZohjDR8JwHof2cIb3SBetYs=";
+ })
+ ];
+
+ buildPhase = ''
+ ant
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "brmodelo";
+ desktopName = "brModelo";
+ genericName = "Entity-relationship diagramming tool";
+ exec = "brmodelo";
+ icon = "brmodelo";
+ comment = meta.description;
+ categories = [ "Development" "Education" "Database" "2DGraphics" "ComputerScience" "DataVisualization" "Engineering" "Java" ];
+ })
+ ];
+
+ installPhase = ''
+ install -d $out/bin $out/share/doc/${pname} $out/share/java
+
+ cp -rv ./dist/javadoc $out/share/doc/${pname}/
+
+ install -Dm755 ./dist/brModelo.jar -t $out/share/java/
+ # NOTE: The standard Java GUI toolkit has a
+ # hard-coded list of "non-reparenting" window managers,
+ # which cause issues while running brModelo
+ # in WMs that are not in that list (e.g. XMonad).
+ # Solution/Workaround: set the environment variable
+ # _JAVA_AWT_WM_NONREPARENTING=1.
+ makeWrapper ${openjdk8}/bin/java $out/bin/brmodelo \
+ --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \
+ --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \
+ --add-flags "-jar $out/share/java/brModelo.jar"
+
+ runHook postInstall
+ '';
+
+ postInstall = ''
+ for size in 16 24 32 48 64 128 256; do
+ install -Dm644 ./src/imagens/icone_"$size"x"$size".svg \
+ $out/share/icons/hicolor/"$size"x"$size"/apps/brmodelo.svg
+ done
+ '';
+
+ meta = with lib; {
+ description = "Entity-relationship diagram tool for making conceptual and logical database models";
+ homepage = "https://github.com/chcandido/brModelo";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ yuu ];
+ };
+}
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index f9931c7d4c9..41adb1cfbe6 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "calc";
- version = "2.14.0.14";
+ version = "2.14.1.0";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
- sha256 = "sha256-93J4NaED2XEsVxlY6STpwlS9FI8I60NIAZvDT45xxV0=";
+ sha256 = "sha256-C1YWZS4x7htUWF3MhRLQIYChL4rdwJxASdPQjttUr0A=";
};
postPatch = ''
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 4f68eb6ae78..9571588040b 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
- version = "4.1.0";
+ version = "4.1.1";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
- sha256 = "sha256-EOiExp8JBc3SybSiBVbuRxBqTujzLjysWM0v94goups=";
+ sha256 = "sha256-itYNKcdWYMoqlvZ7CYJ6WMv7rS/y1SVdt3O7ahkjPOk=";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix
index bee2be729d1..2050517894b 100644
--- a/pkgs/applications/science/medicine/xmedcon/default.nix
+++ b/pkgs/applications/science/medicine/xmedcon/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "xmedcon";
- version = "0.21.2";
+ version = "0.22.0";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "0svff8rc3j2p47snaq1hx9mv4ydmxawpb0hf3d165g1ccjwvmm6m";
+ sha256 = "sha256-Ui7XoLSzTMPIFW/3nARCmvlGF+1l7pmcnKsnvn3NFJE=";
};
buildInputs = [
diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix
index b3647e0f1b6..6a1bdc3de16 100644
--- a/pkgs/applications/science/misc/cwltool/default.nix
+++ b/pkgs/applications/science/misc/cwltool/default.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
- version = "3.1.20220221074232";
+ version = "3.1.20220224085855";
format = "setuptools";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = version;
- sha256 = "sha256-hUdwtqYHcfyJ68LzwwCXAxr7YIkJm64brb+kA/WJqU8=";
+ sha256 = "sha256-7+1xOV5Lodqtku0wX1urAEHsCcYKM3Vcd5RDg4DdVow=";
};
postPatch = ''
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
index 049a2aa2c1d..daabe71bebb 100644
--- a/pkgs/applications/version-management/git-sizer/default.nix
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -1,20 +1,29 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, testVersion, git-sizer }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "git-sizer";
- version = "1.3.0";
-
- goPackagePath = "github.com/github/git-sizer";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "github";
repo = pname;
rev = "v${version}";
- sha256 = "0kmyvai5xfalm56ywa6mhdvvjnacdzwcyz28bw0pz9a4gyf1mgvh";
+ sha256 = "sha256-On7QBTzKfnuuzwMQ8m1odxGqfIKL+EDg5V05Kxuhmqw=";
+ };
+
+ vendorSha256 = "sha256-oRlsD99XiI/0ZWibjyRcycmGab+vMbXrV5hIdIyUDYg=";
+
+ ldflags = [ "-s" "-w" "-X main.BuildVersion=${version}" ];
+
+ doCheck = false;
+
+ passthru.tests.vesion = testVersion {
+ package = git-sizer;
};
meta = with lib; {
description = "Compute various size metrics for a Git repository";
+ homepage = "https://github.com/github/git-sizer";
license = licenses.mit;
maintainers = with maintainers; [ matthewbauer ];
};
diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix
new file mode 100644
index 00000000000..a99a9f64d86
--- /dev/null
+++ b/pkgs/applications/virtualization/kvmtool/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, lib }:
+
+stdenv.mkDerivation {
+ pname = "kvmtool";
+ version = "unstable-2022-04-04";
+
+ src = fetchgit {
+ url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git";
+ rev = "5657dd3e48b41bc6db38fa657994bc0e030fd31f";
+ sha256 = "1y1j44lk9957f2dmyrscbxl4zncp4ibvvcdj6bwylb8jsvmd5fs2";
+ };
+
+ enableParallelBuilding = true;
+ makeFlags = [ "prefix=${placeholder "out"}" ];
+
+ meta = with lib; {
+ description = "A lightweight tool for hosting KVM guests";
+ homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ astro ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index b78880824c7..e1b43e39c60 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -1,11 +1,11 @@
{ lib, fetchzip }:
let
- version = "0.63.1";
+ version = "0.64";
in fetchzip {
name = "sudo-font-${version}";
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
- sha256 = "sha256-z/1Y2eJMrQ+43UIt4HWcLwjYs+hfCY/g4iRxJ+yBAqw=";
+ sha256 = "sha256-ewLTeIVY76eq5mHTnjIsJ5Q2CMuBqXJzxvjZTONPsr8=";
postFetch = ''
mkdir -p $out/share/fonts/
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 735dfdb4f81..2f9d22e57d8 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }:
+{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash, withManOptDedupPatch ? false }:
let
@@ -36,6 +36,10 @@ let
src = ./catalog-legacy-uris.patch;
inherit legacySuffix suffix version;
})
+ ] ++ lib.optionals withManOptDedupPatch [
+ # Fixes https://github.com/NixOS/nixpkgs/issues/166304
+ # https://github.com/docbook/xslt10-stylesheets/pull/241
+ ./fix-man-options-duplication.patch
];
propagatedBuildInputs = [ findXMLCatalogs ];
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch
new file mode 100644
index 00000000000..304d9781e6a
--- /dev/null
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch
@@ -0,0 +1,11 @@
+--- a/manpages/lists.xsl
++++ b/manpages/lists.xsl
+@@ -110,7 +110,7 @@
+ .RE
+
+
+-
++
+
+
+ gawk != null;
+, mimiSupport ? false, gawk }:
let
# A much better xdg-open
@@ -24,8 +22,10 @@ stdenv.mkDerivation rec {
pname = "xdg-utils";
version = "unstable-2020-10-21";
- src = fetchgit {
- url = "https://gitlab.freedesktop.org/xdg/${pname}.git";
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "xdg";
+ repo = "xdg-utils";
rev = "d11b33ec7f24cfb1546f6b459611d440013bdc72";
sha256 = "sha256-8PtXfI8hRneEpnUvIV3M+6ACjlkx0w/NEiJFdGbbHnQ=";
};
diff --git a/pkgs/applications/misc/xdragon/default.nix b/pkgs/tools/X11/xdragon/default.nix
similarity index 79%
rename from pkgs/applications/misc/xdragon/default.nix
rename to pkgs/tools/X11/xdragon/default.nix
index 39f291a8849..7061a8f0a1c 100644
--- a/pkgs/applications/misc/xdragon/default.nix
+++ b/pkgs/tools/X11/xdragon/default.nix
@@ -2,19 +2,19 @@
stdenv.mkDerivation rec {
pname = "xdragon";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "mwh";
repo = "dragon";
rev = "v${version}";
- sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra";
+ sha256 = "sha256-wqG6idlVvdN+sPwYgWu3UL0la5ssvymZibiak3KeV7M=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk3 ];
- installFlags = [ "PREFIX=${placeholder "out"}/bin" ];
+ installFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = ''
ln -s $out/bin/dragon $out/bin/xdragon
'';
diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix
index f0d90cde98a..56d4213481c 100644
--- a/pkgs/tools/admin/chamber/default.nix
+++ b/pkgs/tools/admin/chamber/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "chamber";
- version = "2.10.8";
+ version = "2.10.9";
src = fetchFromGitHub {
owner = "segmentio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-rU9xywEa9E1VG1CaRGHzjXTL+0erlgP1thDTYBz+oLM=";
+ sha256 = "sha256-rOOpwLoEiTS41VIPvqoq8yGP4GOOCOJNFfLLxt9mfvM=";
};
CGO_ENABLED = 0;
diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock
index 19305c7d137..be99ed9bdc3 100644
--- a/pkgs/tools/admin/fastlane/Gemfile.lock
+++ b/pkgs/tools/admin/fastlane/Gemfile.lock
@@ -1,60 +1,80 @@
GEM
remote: https://rubygems.org/
specs:
- CFPropertyList (3.0.3)
- addressable (2.7.0)
+ CFPropertyList (3.0.5)
+ rexml
+ addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
+ artifactory (3.0.15)
atomos (0.1.3)
- aws-eventstream (1.1.0)
- aws-partitions (1.414.0)
- aws-sdk-core (3.110.0)
+ aws-eventstream (1.2.0)
+ aws-partitions (1.558.0)
+ aws-sdk-core (3.126.2)
aws-eventstream (~> 1, >= 1.0.2)
- aws-partitions (~> 1, >= 1.239.0)
+ aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.40.0)
- aws-sdk-core (~> 3, >= 3.109.0)
+ aws-sdk-kms (1.54.0)
+ aws-sdk-core (~> 3, >= 3.126.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.87.0)
- aws-sdk-core (~> 3, >= 3.109.0)
+ aws-sdk-s3 (1.112.0)
+ aws-sdk-core (~> 3, >= 3.126.0)
aws-sdk-kms (~> 1)
- aws-sigv4 (~> 1.1)
- aws-sigv4 (1.2.2)
+ aws-sigv4 (~> 1.4)
+ aws-sigv4 (1.4.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
- claide (1.0.3)
+ claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
- commander-fastlane (4.4.6)
- highline (~> 1.7.2)
+ commander (4.6.0)
+ highline (~> 2.0.0)
declarative (0.0.20)
- declarative-option (0.1.0)
- digest-crc (0.6.3)
+ digest-crc (0.6.4)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.6)
- emoji_regex (3.2.1)
- excon (0.78.1)
- faraday (1.3.0)
+ emoji_regex (3.2.3)
+ excon (0.91.0)
+ faraday (1.10.0)
+ faraday-em_http (~> 1.0)
+ faraday-em_synchrony (~> 1.0)
+ faraday-excon (~> 1.1)
+ faraday-httpclient (~> 1.0)
+ faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
- multipart-post (>= 1.2, < 3)
- ruby2_keywords
+ faraday-net_http_persistent (~> 1.0)
+ faraday-patron (~> 1.0)
+ faraday-rack (~> 1.0)
+ faraday-retry (~> 1.0)
+ ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
- faraday-net_http (1.0.0)
- faraday_middleware (1.0.0)
+ faraday-em_http (1.0.0)
+ faraday-em_synchrony (1.0.0)
+ faraday-excon (1.1.0)
+ faraday-httpclient (1.0.1)
+ faraday-multipart (1.0.3)
+ multipart-post (>= 1.2, < 3)
+ faraday-net_http (1.0.1)
+ faraday-net_http_persistent (1.2.0)
+ faraday-patron (1.0.0)
+ faraday-rack (1.0.0)
+ faraday-retry (1.0.3)
+ faraday_middleware (1.2.0)
faraday (~> 1.0)
- fastimage (2.2.1)
- fastlane (2.171.0)
+ fastimage (2.2.6)
+ fastlane (2.204.3)
CFPropertyList (>= 2.3, < 4.0.0)
- addressable (>= 2.3, < 3.0.0)
+ addressable (>= 2.8, < 3.0.0)
+ artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
- commander-fastlane (>= 4.4.6, < 5.0.0)
+ commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
@@ -63,18 +83,20 @@ GEM
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
- google-api-client (>= 0.37.0, < 0.39.0)
- google-cloud-storage (>= 1.15.0, < 2.0.0)
- highline (>= 1.7.2, < 2.0.0)
+ google-apis-androidpublisher_v3 (~> 0.3)
+ google-apis-playcustomapp_v1 (~> 0.1)
+ google-cloud-storage (~> 1.31)
+ highline (~> 2.0)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (~> 2.0.0)
+ naturally (~> 2.2)
+ optparse (~> 0.1.1)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
- slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0)
@@ -84,73 +106,85 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
- google-api-client (0.38.0)
+ google-apis-androidpublisher_v3 (0.16.0)
+ google-apis-core (>= 0.4, < 2.a)
+ google-apis-core (0.4.2)
addressable (~> 2.5, >= 2.5.1)
- googleauth (~> 0.9)
- httpclient (>= 2.8.1, < 3.0)
+ googleauth (>= 0.16.2, < 2.a)
+ httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
- retriable (>= 2.0, < 4.0)
- signet (~> 0.12)
- google-cloud-core (1.5.0)
+ retriable (>= 2.0, < 4.a)
+ rexml
+ webrick
+ google-apis-iamcredentials_v1 (0.10.0)
+ google-apis-core (>= 0.4, < 2.a)
+ google-apis-playcustomapp_v1 (0.7.0)
+ google-apis-core (>= 0.4, < 2.a)
+ google-apis-storage_v1 (0.11.0)
+ google-apis-core (>= 0.4, < 2.a)
+ google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
- google-cloud-env (1.4.0)
+ google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
- google-cloud-errors (1.0.1)
- google-cloud-storage (1.29.2)
- addressable (~> 2.5)
+ google-cloud-errors (1.2.0)
+ google-cloud-storage (1.36.1)
+ addressable (~> 2.8)
digest-crc (~> 0.4)
- google-api-client (~> 0.33)
- google-cloud-core (~> 1.2)
- googleauth (~> 0.9)
+ google-apis-iamcredentials_v1 (~> 0.1)
+ google-apis-storage_v1 (~> 0.1)
+ google-cloud-core (~> 1.6)
+ googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
- googleauth (0.14.0)
+ googleauth (1.1.1)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
- signet (~> 0.14)
- highline (1.7.10)
- http-cookie (1.0.3)
+ signet (>= 0.16, < 2.a)
+ highline (2.0.3)
+ http-cookie (1.0.4)
domain_name (~> 0.5)
httpclient (2.8.3)
- jmespath (1.4.0)
- json (2.5.1)
- jwt (2.2.2)
+ jmespath (1.6.0)
+ json (2.6.1)
+ jwt (2.3.0)
memoist (0.16.2)
mini_magick (4.11.0)
- mini_mime (1.0.2)
+ mini_mime (1.1.2)
multi_json (1.15.0)
multipart-post (2.0.0)
nanaimo (0.3.0)
- naturally (2.2.0)
- os (1.1.1)
+ naturally (2.2.1)
+ optparse (0.1.1)
+ os (1.1.4)
plist (3.6.0)
public_suffix (4.0.6)
- rake (13.0.3)
- representable (3.0.4)
+ rake (13.0.6)
+ representable (3.1.1)
declarative (< 0.1.0)
- declarative-option (< 0.2.0)
+ trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
+ rexml (3.2.5)
rouge (2.0.7)
- ruby2_keywords (0.0.2)
- rubyzip (2.3.0)
+ ruby2_keywords (0.0.5)
+ rubyzip (2.3.2)
security (0.1.3)
- signet (0.14.0)
- addressable (~> 2.3)
- faraday (>= 0.17.3, < 2.0)
+ signet (0.16.1)
+ addressable (~> 2.8)
+ faraday (>= 0.17.5, < 3.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.8)
CFPropertyList
naturally
- slack-notifier (2.3.2)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
+ trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.1)
tty-spinner (0.9.3)
@@ -158,15 +192,17 @@ GEM
uber (0.1.0)
unf (0.1.4)
unf_ext
- unf_ext (0.0.7.7)
- unicode-display_width (1.7.0)
+ unf_ext (0.0.8)
+ unicode-display_width (1.8.0)
+ webrick (1.7.0)
word_wrap (1.0.0)
- xcodeproj (1.19.0)
+ xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
+ rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix
index e747537b241..52583ebc8cf 100644
--- a/pkgs/tools/admin/fastlane/gemset.nix
+++ b/pkgs/tools/admin/fastlane/gemset.nix
@@ -5,10 +5,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
- version = "2.7.0";
+ version = "2.8.0";
+ };
+ artifactory = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls";
+ type = "gem";
+ };
+ version = "3.0.15";
};
atomos = {
groups = ["default"];
@@ -25,20 +35,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5";
+ sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
type = "gem";
};
- version = "1.1.0";
+ version = "1.2.0";
};
aws-partitions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dy7y0zgc53cz1qiifx74glixkjd96nk8p6qrq1n5cdylnlpng8k";
+ sha256 = "0q5c8jjnlz6dlkxwsm6cj9n1z08pylvibsx8r42z50ws0jw2f7jm";
type = "gem";
};
- version = "1.414.0";
+ version = "1.558.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -46,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4";
+ sha256 = "19xi4dr675f7x9dmk1fc10jmjdgv45j3dn9k44m5xavd3qnpzx7v";
type = "gem";
};
- version = "3.110.0";
+ version = "3.126.2";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -57,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4";
+ sha256 = "0h2mn5ywrla2wqsvzvp9m8jhzr93ywqmyi2l0b538hrq6pmdhjq2";
type = "gem";
};
- version = "1.40.0";
+ version = "1.54.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -68,10 +78,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7";
+ sha256 = "09fc16hdvripmpn1bj5bayqvmfz0pj2l1h2w954id9c9ar7vv7f5";
type = "gem";
};
- version = "1.87.0";
+ version = "1.112.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@@ -79,10 +89,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5";
+ sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
type = "gem";
};
- version = "1.2.2";
+ version = "1.4.0";
};
babosa = {
groups = ["default"];
@@ -95,24 +105,25 @@
version = "1.0.4";
};
CFPropertyList = {
+ dependencies = ["rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
+ sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
type = "gem";
};
- version = "3.0.3";
+ version = "3.0.5";
};
claide = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+ sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.0";
};
colored = {
groups = ["default"];
@@ -134,16 +145,16 @@
};
version = "3.1.2";
};
- commander-fastlane = {
+ commander = {
dependencies = ["highline"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65";
+ sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx";
type = "gem";
};
- version = "4.4.6";
+ version = "4.6.0";
};
declarative = {
groups = ["default"];
@@ -155,26 +166,16 @@
};
version = "0.0.20";
};
- declarative-option = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
- type = "gem";
- };
- version = "0.1.0";
- };
digest-crc = {
dependencies = ["rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a";
+ sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2";
type = "gem";
};
- version = "0.6.3";
+ version = "0.6.4";
};
domain_name = {
dependencies = ["unf"];
@@ -202,31 +203,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s";
+ sha256 = "0jsnrkfy345v66jlm2xrz8znivfnamg3mfzkddn414bndf2vxn7c";
type = "gem";
};
- version = "3.2.1";
+ version = "3.2.3";
};
excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r";
+ sha256 = "0391r0nz1bbcph9dmdi4n0gwn2f64y8pffxa9zm8wjkqlynhhx74";
type = "gem";
};
- version = "0.78.1";
+ version = "0.91.0";
};
faraday = {
- dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
+ dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
+ sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4";
type = "gem";
};
- version = "1.3.0";
+ version = "1.10.0";
};
faraday-cookie_jar = {
dependencies = ["faraday" "http-cookie"];
@@ -239,47 +240,138 @@
};
version = "0.0.7";
};
+ faraday-em_http = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ faraday-em_synchrony = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ faraday-excon = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ faraday-httpclient = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ faraday-multipart = {
+ dependencies = ["multipart-post"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
faraday-net_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d";
+ sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ faraday-net_http_persistent = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ faraday-patron = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
type = "gem";
};
version = "1.0.0";
};
+ faraday-rack = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ faraday-retry = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
faraday_middleware = {
dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r";
+ sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
type = "gem";
};
- version = "1.0.0";
+ version = "1.2.0";
};
fastimage = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j";
+ sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr";
type = "gem";
};
- version = "2.2.1";
+ version = "2.2.6";
};
fastlane = {
- dependencies = ["CFPropertyList" "addressable" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
+ dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h921zfck75f5b50z9jxnhanf8q9d58n122ffnpd1980q5w912rp";
+ sha256 = "1akkqh0px6xb47zxdmmi5w3dhm4692yd7jkizv0fq54pivz40d80";
type = "gem";
};
- version = "2.171.0";
+ version = "2.204.3";
};
gh_inspector = {
groups = ["default"];
@@ -291,16 +383,60 @@
};
version = "1.1.3";
};
- google-api-client = {
- dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
+ google-apis-androidpublisher_v3 = {
+ dependencies = ["google-apis-core"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1";
+ sha256 = "00qx111vfdh9xs74j26k19kap8iga4d94fc5iqw5lbrrviqwxmv6";
type = "gem";
};
- version = "0.38.0";
+ version = "0.16.0";
+ };
+ google-apis-core = {
+ dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19v15vkgg86k79l51gfs7fab4h7fkv8358ckmkyp33jgsx3zr17b";
+ type = "gem";
+ };
+ version = "0.4.2";
+ };
+ google-apis-iamcredentials_v1 = {
+ dependencies = ["google-apis-core"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yibminaffzz5npq605m0vqc024dcybiw7xk5vr0jxzlsh8nxvhn";
+ type = "gem";
+ };
+ version = "0.10.0";
+ };
+ google-apis-playcustomapp_v1 = {
+ dependencies = ["google-apis-core"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15wnkbn6kzijbyqkqrh7s6apjf5630yvf2v8zy93zk0x87n2drcd";
+ type = "gem";
+ };
+ version = "0.7.0";
+ };
+ google-apis-storage_v1 = {
+ dependencies = ["google-apis-core"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m2f4i9bbhwz0r3pkcliv6mx29lz5vvbd623jxkdik5ls8g92grm";
+ type = "gem";
+ };
+ version = "0.11.0";
};
google-cloud-core = {
dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -308,10 +444,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1";
+ sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za";
type = "gem";
};
- version = "1.5.0";
+ version = "1.6.0";
};
google-cloud-env = {
dependencies = ["faraday"];
@@ -319,31 +455,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i";
+ sha256 = "0ajc3w4wqg46ywcbmb5fz1q6gfm6g7874s9h31i1r038kz2bzfag";
type = "gem";
};
- version = "1.4.0";
+ version = "1.5.0";
};
google-cloud-errors = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67";
+ sha256 = "0nakfswnck6grjpyhckzl40qccyys3sy999h5axk0rldx96fnivd";
type = "gem";
};
- version = "1.0.1";
+ version = "1.2.0";
};
google-cloud-storage = {
- dependencies = ["addressable" "digest-crc" "google-api-client" "google-cloud-core" "googleauth" "mini_mime"];
+ dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dy5f00jsnd6id7bkc03pl2d6c78rl3lkysdn0f90padys5id1k5";
+ sha256 = "1g8nkvrpxqs9c061n2rd26waq6vwdws5siirgga1rx0n9v50chfp";
type = "gem";
};
- version = "1.29.2";
+ version = "1.36.1";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -351,20 +487,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6";
+ sha256 = "0bzqdvva06ydn3kzivbcfqxc5mfkz8xvazlpmp7zvkl3i5s5djr7";
type = "gem";
};
- version = "0.14.0";
+ version = "1.1.1";
};
highline = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
+ sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
type = "gem";
};
- version = "1.7.10";
+ version = "2.0.3";
};
http-cookie = {
dependencies = ["domain_name"];
@@ -372,10 +508,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+ sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
type = "gem";
};
- version = "1.0.3";
+ version = "1.0.4";
};
httpclient = {
groups = ["default"];
@@ -392,30 +528,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+ sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr";
type = "gem";
};
- version = "1.4.0";
+ version = "1.6.0";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
+ sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz";
type = "gem";
};
- version = "2.5.1";
+ version = "2.6.1";
};
jwt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n";
+ sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838";
type = "gem";
};
- version = "2.2.2";
+ version = "2.3.0";
};
memoist = {
groups = ["default"];
@@ -442,10 +578,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
+ sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
type = "gem";
};
- version = "1.0.2";
+ version = "1.1.2";
};
multi_json = {
groups = ["default"];
@@ -482,20 +618,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dzqdawqr4agx7zr1fr5zxdwl8vb5rhpz57l1lk7d2y46ha6l4l7";
+ sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59";
type = "gem";
};
- version = "2.2.0";
+ version = "2.2.1";
+ };
+ optparse = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j9l5a1zszvrlggp1ldx82i4kkqx34g4g3amwp488s499w5l1cvj";
+ type = "gem";
+ };
+ version = "0.1.1";
};
os = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
+ sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap";
type = "gem";
};
- version = "1.1.1";
+ version = "1.1.4";
};
plist = {
groups = ["default"];
@@ -522,21 +668,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
+ sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem";
};
- version = "13.0.3";
+ version = "13.0.6";
};
representable = {
- dependencies = ["declarative" "declarative-option" "uber"];
+ dependencies = ["declarative" "trailblazer-option" "uber"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
+ sha256 = "09xwzz94ryp57wyjrqysiz1sslnxd4r4m9wayy63jb7f8qfx1kys";
type = "gem";
};
- version = "3.0.4";
+ version = "3.1.1";
};
retriable = {
groups = ["default"];
@@ -548,6 +694,16 @@
};
version = "3.1.2";
};
+ rexml = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+ type = "gem";
+ };
+ version = "3.2.5";
+ };
rouge = {
groups = ["default"];
platforms = [];
@@ -563,20 +719,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
+ sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
- version = "0.0.2";
+ version = "0.0.5";
};
rubyzip = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
+ sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
type = "gem";
};
- version = "2.3.0";
+ version = "2.3.2";
};
security = {
groups = ["default"];
@@ -594,10 +750,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp";
+ sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1";
type = "gem";
};
- version = "0.14.0";
+ version = "0.16.1";
};
simctl = {
dependencies = ["CFPropertyList" "naturally"];
@@ -610,16 +766,6 @@
};
version = "1.6.8";
};
- slack-notifier = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv";
- type = "gem";
- };
- version = "2.3.2";
- };
terminal-notifier = {
groups = ["default"];
platforms = [];
@@ -641,6 +787,16 @@
};
version = "1.8.0";
};
+ trailblazer-option = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
tty-cursor = {
groups = ["default"];
platforms = [];
@@ -698,17 +854,27 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
+ sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
type = "gem";
};
- version = "0.0.7.7";
+ version = "0.0.8";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
+ sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ webrick = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
type = "gem";
};
version = "1.7.0";
@@ -724,15 +890,15 @@
version = "1.0.0";
};
xcodeproj = {
- dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
+ dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
+ sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4";
type = "gem";
};
- version = "1.19.0";
+ version = "1.21.0";
};
xcpretty = {
dependencies = ["rouge"];
diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index 9b96f1c0a8e..9d9f2535a04 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -1,17 +1,19 @@
-{ lib, rustPlatform, fetchFromGitea, testVersion, garage }:
+{ lib, rustPlatform, fetchFromGitea, protobuf, testVersion, garage }:
rustPlatform.buildRustPackage rec {
pname = "garage";
- version = "0.6.1";
+ version = "0.7.0";
src = fetchFromGitea {
domain = "git.deuxfleurs.fr";
owner = "Deuxfleurs";
repo = "garage";
rev = "v${version}";
- sha256 = "sha256-BEFxPU4yPtctN7H+EcxJpXnf4tyqBseskls0ZA9748k=";
+ sha256 = "sha256-gs0TW431YUrdsdJ+PYrJgnLiBmDPYnUR0iVnQ/YqIfU=";
};
- cargoSha256 = "sha256-/mOH7VOfIHEydnJUUSts44aGb8tS1/Faxiu4pQDeobY=";
+ cargoSha256 = "sha256-XGSenT2q3VXNcIT1Lg1e5HTOkEdOb1o3H07ahteQM/o=";
+
+ nativeBuildInputs = [ protobuf ];
passthru = {
tests.version = testVersion { package = garage; };
diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix
index a4680dff6f6..cb415a2c53e 100644
--- a/pkgs/tools/graphics/pngcheck/default.nix
+++ b/pkgs/tools/graphics/pngcheck/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
homepage = "http://pmt.sourceforge.net/pngcrush";
description = "Verifies the integrity of PNG, JNG and MNG files";
license = licenses.free;
- platforms = with platforms; [ unix ];
+ platforms = platforms.unix;
maintainers = with maintainers; [ starcraft66 ];
};
}
diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/tools/misc/melody/default.nix
new file mode 100644
index 00000000000..7dfc7eab4fd
--- /dev/null
+++ b/pkgs/tools/misc/melody/default.nix
@@ -0,0 +1,21 @@
+{ lib, stdenv, fetchCrate, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "melody";
+ version = "0.13.9";
+
+ src = fetchCrate {
+ pname = "melody_cli";
+ inherit version;
+ sha256 = "1vqiciridm0pbh5yf42p2jfis908p6r9q3jaqy2hx3f5aggbf09q";
+ };
+
+ cargoSha256 = "1gf2km06qzvc0xv4vfxm6vdp3c5lgcjwwl92f4frga3cx51vbrzh";
+
+ meta = with lib; {
+ description = "Language that compiles to regular expressions";
+ homepage = "https://github.com/yoav-lavi/melody";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jyooru ];
+ };
+}
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index a27674290d6..b595cf10294 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -9,22 +9,23 @@
, nixosTests
, Security
, Foundation
+, Cocoa
}:
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "1.3.0";
+ version = "1.5.4";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-mqUE4JzNBhvtDpT2LM23eHX8q93wtPqA+/zr/PxEDiE=";
+ sha256 = "sha256-nLzqfSRmA+D310MDvX+g8nNsoaiSixG+j+g87CPzYMs=";
};
nativeBuildInputs = [ installShellFiles pkg-config ];
- buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation ];
+ buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ];
postInstall = ''
for shell in bash fish zsh; do
@@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec {
done
'';
- cargoSha256 = "sha256-hQNDiayVT4UgbxcxdXssi/evPvwgyvG/UOFyEHj7jpo=";
+ cargoSha256 = "sha256-FXzAvO11NIr6dxF2OeV5XJWHG2kgZiASuBnoC6mSps8=";
preCheck = ''
HOME=$TMPDIR
diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix
index 45a5edd6ae5..7370a21512d 100644
--- a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix
+++ b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tmux-mem-cpu-load";
- version = "3.5.1";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "thewtex";
repo = "tmux-mem-cpu-load";
rev = "v${version}";
- sha256 = "sha256-4ZMF+RacZL9dJRCz63XPNuigTKHOW+ZcA4vB4jsnASc=";
+ sha256 = "sha256-1smhlp30y0qihm+d9RcCKY1CFbPm5gzago+OIQQT5jE=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix
index 7bc78803167..2fc816e1ab3 100644
--- a/pkgs/tools/misc/vial/default.nix
+++ b/pkgs/tools/misc/vial/default.nix
@@ -1,12 +1,12 @@
{ lib, fetchurl, appimageTools }:
let
name = "vial-${version}";
- version = "0.4.2";
+ version = "0.5";
pname = "Vial";
src = fetchurl {
url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
- sha256 = "sha256-T3aSwv/qTJHR/Fa6qU1fWbp3duvny4lC+9jBwQzpw2w=";
+ sha256 = "sha256-11IA8WeDFnukm6kskjA6Qu4+rPoLTBjz6NIixAIOH5U=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 10418d97810..1d1a01d17cf 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -1,15 +1,19 @@
{ stdenv, fetchurl, fetchpatch, perl, file, nettools, iputils, iproute2, makeWrapper
, coreutils, gnused, openldap ? null
, buildPackages, lib
+
+# client and relay are end of life, remove after 4.4.3
+, withClient ? false
+, withRelay ? false
}:
stdenv.mkDerivation rec {
pname = "dhcp";
- version = "4.4.2-P1";
+ version = "4.4.3";
src = fetchurl {
url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz";
- sha256 = "06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh";
+ sha256 = "sha256-Dj7GtMKgXsAUiHS82ZmmbQVRg3jXdCH2B/sLydATWBg=";
};
patches =
@@ -18,20 +22,6 @@ stdenv.mkDerivation rec {
# patch, the hostname doesn't get set properly if the old
# hostname (i.e. before reboot) is equal to the new hostname.
./set-hostname.patch
-
- (fetchpatch {
- # upstream build fix against -fno-common compilers like >=gcc-10
- url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/6c7e61578b1b449272dbb40dd8b98d03dad8a57a.patch";
- sha256 = "1g37ix0yf9zza8ri8bg438ygcjviniblfyb20y4gzc8lysy28m8b";
- })
-
- # Fix parallel build failure, the patch is pending upstream inclusion:
- # https://gitlab.isc.org/isc-projects/dhcp/-/merge_requests/76
- (fetchpatch {
- name = "parallel-make.patch";
- url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/46d101b97c5a3b19a3f63f7b60e5f88994a64e22.patch";
- sha256 = "1y3nsmqjzcg4bhp1xmqp47v7rkl3bpcildkx6mlrg255yvxapmdp";
- })
];
nativeBuildInputs = [ perl makeWrapper ];
@@ -77,6 +67,10 @@ stdenv.mkDerivation rec {
--replace /sbin/ip ${iproute2}/sbin/ip
wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
"${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin"
+ '' + lib.optionalString (!withClient) ''
+ rm $out/sbin/{dhclient,dhclient-script,.dhclient-script-wrapped}
+ '' + lib.optionalString (!withRelay) ''
+ rm $out/sbin/dhcrelay
'';
preConfigure =
@@ -103,5 +97,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.isc.org/dhcp/";
license = licenses.mpl20;
platforms = platforms.unix;
+ knownVulnerabilities = lib.optional (withClient || withRelay) "The client and relay component of the dhcp package have reached their end of life";
};
}
diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix
index 494fb946ea6..61cb7bd6382 100644
--- a/pkgs/tools/networking/nebula/default.nix
+++ b/pkgs/tools/networking/nebula/default.nix
@@ -13,8 +13,6 @@ buildGoModule rec {
vendorSha256 = "5Yv2t5vdUNCcCo2KAm1xCkRVrt6gIasKHLqH7VVPDuU=";
- doCheck = false;
-
subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
ldflags = [ "-X main.Build=${version}" ];
diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index 2c984da8737..86195ba8692 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -12,7 +12,7 @@
, polkit
, gnutls
, ppp
-, dhcp
+, dhcpcd
, iptables
, nftables
, python3
@@ -96,9 +96,9 @@ stdenv.mkDerivation rec {
"-Dresolvconf=${openresolv}/bin/resolvconf"
# DHCP clients
- "-Ddhclient=${dhcp}/bin/dhclient"
- # Upstream prefers dhclient, so don't add dhcpcd to the closure
- "-Ddhcpcd=no"
+ # ISC DHCP client has reached it's end of life, so stop using it
+ "-Ddhclient=no"
+ "-Ddhcpcd=${dhcpcd}/bin/dhcpcd"
"-Ddhcpcanon=no"
# Miscellaneous
diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix
index e9608741816..f7e98b2b92f 100644
--- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix
+++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix
@@ -73,6 +73,7 @@ stdenv.mkDerivation rec {
attrPath = "networkmanager-fortisslvpn";
versionPolicy = "odd-unstable";
};
+ networkManagerPlugin = "VPN/nm-fortisslvpn-service.name";
};
meta = with lib; {
diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix
index e56d9411b39..8c8d0dd6a32 100644
--- a/pkgs/tools/networking/networkmanager/iodine/default.nix
+++ b/pkgs/tools/networking/networkmanager/iodine/default.nix
@@ -48,6 +48,7 @@ in stdenv.mkDerivation {
packageName = pname;
attrPath = "networkmanager-iodine";
};
+ networkManagerPlugin = "VPN/nm-iodine-service.name";
};
meta = with lib; {
diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix
index 5f00c1fa9d8..88ccad59bd1 100644
--- a/pkgs/tools/networking/networkmanager/l2tp/default.nix
+++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru = {
+ networkManagerPlugin = "VPN/nm-l2tp-service.name";
+ };
+
meta = with lib; {
description = "L2TP plugin for NetworkManager";
inherit (networkmanager.meta) platforms;
diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix
index e0199784b2b..2c095ff804d 100644
--- a/pkgs/tools/networking/networkmanager/openconnect/default.nix
+++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix
@@ -69,6 +69,7 @@ stdenv.mkDerivation rec {
attrPath = "networkmanager-openconnect";
versionPolicy = "odd-unstable";
};
+ networkManagerPlugin = "VPN/nm-openconnect-service.name";
};
meta = with lib; {
diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix
index 92391e0374b..2e46d623960 100644
--- a/pkgs/tools/networking/networkmanager/openvpn/default.nix
+++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix
@@ -67,6 +67,7 @@ stdenv.mkDerivation rec {
attrPath = "networkmanager-openvpn";
versionPolicy = "odd-unstable";
};
+ networkManagerPlugin = "VPN/nm-openvpn-service.name";
};
meta = with lib; {
diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix
index f4866234438..8b75db6495f 100644
--- a/pkgs/tools/networking/networkmanager/sstp/default.nix
+++ b/pkgs/tools/networking/networkmanager/sstp/default.nix
@@ -54,6 +54,7 @@ in stdenv.mkDerivation {
packageName = pname;
attrPath = "networkmanager-sstp";
};
+ networkManagerPlugin = "VPN/nm-sstp-service.name";
};
meta = with lib; {
diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix
index cebcec35a31..be0dcf234ff 100644
--- a/pkgs/tools/networking/networkmanager/strongswan/default.nix
+++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
"--with-nm-plugindir=$(out)/lib/NetworkManager"
];
+ passthru = {
+ networkManagerPlugin = "VPN/nm-strongswan-service.name";
+ };
+
PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN";
meta = with lib; {
diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix
index d81dbf08816..a63039b2dea 100644
--- a/pkgs/tools/networking/networkmanager/vpnc/default.nix
+++ b/pkgs/tools/networking/networkmanager/vpnc/default.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
attrPath = "networkmanager-vpnc";
versionPolicy = "odd-unstable";
};
+ networkManagerPlugin = "VPN/nm-vpnc-service.name";
};
meta = with lib; {
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
index e6703c748fc..e1497ab0852 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0ijsylc7a4jlpxsqa0jq1w1c7333id8pcakzl7a5749ria1xp0l5";
};
- prePatch = ''
+ postPatch = ''
sed -i '20i#include ' src/ntpd.h
sed -i '19i#include ' src/log.c
'';
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
- homepage = "http://www.openntpd.org/";
+ homepage = "https://www.openntpd.org/";
license = licenses.bsd3;
description = "OpenBSD NTP daemon (Debian port)";
platforms = platforms.all;
diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix
index fd4cdbaf977..399aeefd9c3 100644
--- a/pkgs/tools/networking/smartdns/default.nix
+++ b/pkgs/tools/networking/smartdns/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "smartdns";
- version = "36";
+ version = "36.1";
src = fetchFromGitHub {
owner = "pymumu";
repo = pname;
rev = "Release${version}";
- sha256 = "sha256-sjrRPmTJRCUnMrA08M/VdYhL7/OfQY30/t1loLPSrlQ=";
+ sha256 = "sha256-5pAt7IjgbCCGaHeSoQvuoc6KPD9Yn5iXL1CAawgBeY0=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix
index 9f0dfe7c388..5433fb67745 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/pkgs/tools/networking/subfinder/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "subfinder";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-RzZlr0mscJgOGWOn4RU9SOr/WkKOrY39cIUKFKxis6Y=";
+ sha256 = "sha256-t5bIIb31gb6f7hVeiTmMut0wXl40/Du4W9lnB49jlFA=";
};
- vendorSha256 = "sha256-P98giu0a5FLBsE87XVTurYNGnNk8JUfz1awY49OBj9M=";
+ vendorSha256 = "sha256-lyqjODNk7R6mvSl/I1zFgXvs4m60D4gwfgJ6ocoOHhc=";
modRoot = "./v2";
diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index e79c376ab79..34399a78c5d 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -1,18 +1,16 @@
{ lib, stdenv, fetchFromGitHub, curl }:
stdenv.mkDerivation rec {
- version = "1.11.4";
+ version = "2.8.1";
pname = "clib";
src = fetchFromGitHub {
rev = version;
owner = "clibs";
repo = "clib";
- sha256 = "0cxldyx5bsld8gdasqpqlnzyap294hlkgcjyw3vlzlxcb0izjy8i";
+ sha256 = "sha256-AzPpGwtZemKX2r/XKyNTJ+lVwU1QUxkB2OywtCwTAWs=";
};
- hardeningDisable = [ "fortify" ];
-
makeFlags = [ "PREFIX=$(out)" ];
buildInputs = [ curl ];
diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix
index b1f5d8b56c3..84a5cef2b46 100644
--- a/pkgs/tools/security/aws-iam-authenticator/default.nix
+++ b/pkgs/tools/security/aws-iam-authenticator/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "aws-iam-authenticator";
- version = "0.5.5";
+ version = "0.5.6";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5QtNAcInp1mUE8SHUUMS8/XURbPx/q8xMsvEEo/rnCs=";
+ sha256 = "sha256-tKvFcCPjxwX424zv100gLRjWRtVgCw2ILyXP8XEUiTA=";
};
# Upstream has inconsistent vendoring, see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377
diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index 0885c1d2de6..ae94b6e2547 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "sslscan";
- version = "2.0.12";
+ version = "2.0.13";
src = fetchFromGitHub {
owner = "rbsec";
repo = "sslscan";
rev = version;
- sha256 = "sha256-lFb+W2PSmXzzNhG+yNmnDNqtUc0TsDYYnsBnKdsiPSo=";
+ sha256 = "sha256-boXp26f8jiw73lMLwUMuAuDBRIw8JzokYadbKx/VeSg=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix
index 0b6bf003e5b..bf1bacede8d 100644
--- a/pkgs/tools/system/skeema/default.nix
+++ b/pkgs/tools/system/skeema/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "skeema";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "skeema";
repo = "skeema";
rev = "v${version}";
- sha256 = "1a75vixrpidim641809nj931r73zvbj2rsls7d80z7w87maav51m";
+ sha256 = "sha256-DHdc6Le4WhL5QC/hqtbtq7rdBdLiRflDNnXQY2l2aJ8=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix
index b665c182332..19c8e516e96 100644
--- a/pkgs/tools/text/goawk/default.nix
+++ b/pkgs/tools/text/goawk/default.nix
@@ -1,4 +1,5 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, lib, stdenv }:
+
buildGoModule rec {
pname = "goawk";
version = "1.16.0";
@@ -12,8 +13,18 @@ buildGoModule rec {
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
- # checks do not pass at the moment
- doCheck = false;
+ postPatch = ''
+ substituteInPlace goawk_test.go \
+ --replace "TestCommandLine" "SkipCommandLine" \
+ --replace "TestDevStdout" "SkipDevStdout" \
+ --replace "TestFILENAME" "SkipFILENAME" \
+ --replace "TestWildcards" "SkipWildcards"
+
+ substituteInPlace interp/interp_test.go \
+ --replace "TestShellCommand" "SkipShellCommand"
+ '';
+
+ doCheck = (stdenv.system != "aarch64-darwin");
meta = with lib; {
description = "A POSIX-compliant AWK interpreter written in Go";
diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/tools/text/runiq/default.nix
index 6d7bb5e7eb0..7b1e99978a4 100644
--- a/pkgs/tools/text/runiq/default.nix
+++ b/pkgs/tools/text/runiq/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "runiq";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchCrate {
inherit pname version;
- sha256 = "0xhd1z8mykxg9kiq8nw5agy1jxfk414czq62xm1s13ssig3h7jqj";
+ sha256 = "sha256-WPQgTQICZ0DFr+7D99UGMx+I78376IC6iIJ3tCsj0Js=";
};
- cargoSha256 = "1g4yfz5xq9lqwh0ggyn8kn8bnzrqfmh7kx455md5ranrqqh0x5db";
+ cargoSha256 = "sha256-QKtrd690eoPXyd5CQg5/yAiTDk297y60XaUdoeFAe0c=";
meta = with lib; {
description = "An efficient way to filter duplicate lines from input, à la uniq";
diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix
index 61da0d86e33..d40eb2e07ae 100644
--- a/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -1,15 +1,21 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, nix-update-script, nixosTests }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "rootlesskit";
- version = "0.11.1";
- goPackagePath = "github.com/rootless-containers/rootlesskit";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "rootless-containers";
repo = "rootlesskit";
rev = "v${version}";
- sha256 = "15k0503077ang9ywvmhpr1l7ax0v3wla0x8n6lqpmd71w0j2zm5r";
+ hash = "sha256-Tml6zTc9l3O8qB+NSKlClWl5lj1rkiDHwI5exxBL83A=";
+ };
+
+ vendorSha256 = "sha256-CpDPa1LAinvXCnVYbn9ZXuEjyHHlDU4bzZ2R+ctoCzQ=";
+
+ passthru = {
+ updateScript = nix-update-script { attrPath = pname; };
+ tests = nixosTests.docker-rootless;
};
meta = with lib; {
diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix
index 02c63c55a76..c1d67489829 100644
--- a/pkgs/tools/wayland/wl-mirror/default.nix
+++ b/pkgs/tools/wayland/wl-mirror/default.nix
@@ -26,13 +26,13 @@ in
stdenv.mkDerivation rec {
pname = "wl-mirror";
- version = "0.9.2";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "Ferdi265";
repo = "wl-mirror";
rev = "v${version}";
- hash = "sha256-W/8DApyd7KtrOrP7Qj6oPKXxLrVzHDuIMOdg+k5ngr4=";
+ hash = "sha256-ygzSLbzn4P/BdYbqUDduUGwSbRHeU/OBYOX2uznVy1g=";
};
patchPhase = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 09208dd45f3..897005fecae 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -310,11 +310,13 @@ mapAliases ({
docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22
docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12
docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22
+ doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its depedencies where removed."; # Added 2022-03-30
docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22
dolphinEmu = dolphin-emu; # Added 2021-11-10
dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10
dotnet-netcore = dotnet-runtime; # Added 2021-10-07
double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22
+ dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;
draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14
dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03
dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b746e502f24..7f596c04718 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3008,10 +3008,6 @@ with pkgs;
dpic = callPackage ../tools/graphics/dpic { };
- dragon-drop = callPackage ../tools/X11/dragon-drop {
- gtk = gtk3;
- };
-
dstp = callPackage ../development/tools/dstp { };
dsvpn = callPackage ../applications/networking/dsvpn { };
@@ -9064,11 +9060,7 @@ with pkgs;
pm2 = nodePackages.pm2;
- pngcheck = callPackage ../tools/graphics/pngcheck {
- zlib = zlib.override {
- static = true;
- };
- };
+ pngcheck = callPackage ../tools/graphics/pngcheck { };
pngcrush = callPackage ../tools/graphics/pngcrush { };
@@ -14561,6 +14553,12 @@ with pkgs;
# FHS sys dirs presumably only have stuff for the build platform
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
};
+ binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils {
+ autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook;
+ # FHS sys dirs presumably only have stuff for the build platform
+ noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
+ withAllTargets = true;
+ };
binutils = wrapBintoolsWith {
bintools = binutils-unwrapped;
};
@@ -16280,6 +16278,7 @@ with pkgs;
boost174
boost175
boost177
+ boost178
;
boost15x = boost159;
@@ -21211,8 +21210,6 @@ with pkgs;
dex2jar = callPackage ../development/tools/java/dex2jar { };
- doh-proxy = callPackage ../servers/dns/doh-proxy { };
-
doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -24299,7 +24296,7 @@ with pkgs;
stdmanpages = callPackage ../data/documentation/std-man-pages { };
starship = callPackage ../tools/misc/starship {
- inherit (darwin.apple_sdk.frameworks) Security Foundation;
+ inherit (darwin.apple_sdk.frameworks) Security Foundation Cocoa;
};
stig = callPackage ../applications/networking/p2p/stig { };
@@ -24771,6 +24768,8 @@ with pkgs;
jnetmap = callPackage ../applications/networking/jnetmap {};
+ join-desktop = callPackage ../applications/misc/join-desktop { };
+
libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix {
boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found
};
@@ -25599,6 +25598,8 @@ with pkgs;
kerbrute = callPackage ../tools/security/kerbrute { };
+ kvmtool = callPackage ../applications/virtualization/kvmtool { };
+
exrdisplay = callPackage ../applications/graphics/exrdisplay { };
exrtools = callPackage ../applications/graphics/exrtools { };
@@ -27058,6 +27059,8 @@ with pkgs;
abseil-cpp = abseil-cpp_202111;
};
+ kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix {};
+
kpt = callPackage ../applications/networking/cluster/kpt { };
krane = callPackage ../applications/networking/cluster/krane { };
@@ -27499,6 +27502,8 @@ with pkgs;
melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { };
+ melody = callPackage ../tools/misc/melody { };
+
melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { };
meme-image-generator = callPackage ../applications/graphics/meme-image-generator { };
@@ -32815,6 +32820,10 @@ with pkgs;
lingeling = callPackage ../applications/science/logic/lingeling {};
+ ### SCIENCE / ENGINEERING
+
+ brmodelo = callPackage ../applications/science/engineering/brmodelo { };
+
### SCIENCE / ELECTRONICS
adms = callPackage ../applications/science/electronics/adms { };
@@ -34027,7 +34036,7 @@ with pkgs;
sift = callPackage ../tools/text/sift { };
- xdragon = lowPrio (callPackage ../applications/misc/xdragon { });
+ xdragon = lowPrio (callPackage ../tools/X11/xdragon { });
xlockmore = callPackage ../misc/screensavers/xlockmore { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index f259b7cc7f6..cbbde9c8802 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -33,6 +33,7 @@ in
### Deprecated aliases - for backward compatibility
mapAliases ({
+ aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
asyncio-nats-client = nats-py; # added 2022-02-08
bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 78c579c3c6b..b675f935537 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -289,8 +289,6 @@ in {
aiogithubapi = callPackage ../development/python-modules/aiogithubapi { };
- aioh2 = callPackage ../development/python-modules/aioh2 { };
-
aioharmony = callPackage ../development/python-modules/aioharmony { };
aiohomekit = callPackage ../development/python-modules/aiohomekit { };