Merge master into haskell-updates

main
github-actions[bot] 2 years ago committed by GitHub
commit 972d9f8aec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      maintainers/maintainer-list.nix
  2. 8
      nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
  3. 17
      nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
  4. 2
      nixos/doc/manual/release-notes/rl-2205.section.md
  5. 6
      nixos/doc/manual/release-notes/rl-2211.section.md
  6. 3
      nixos/modules/config/i18n.nix
  7. 4
      nixos/modules/misc/ids.nix
  8. 6
      nixos/modules/misc/nixpkgs.nix
  9. 2
      nixos/modules/module-list.nix
  10. 3
      nixos/modules/profiles/minimal.nix
  11. 1
      nixos/modules/rename.nix
  12. 162
      nixos/modules/services/databases/riak.nix
  13. 58
      nixos/modules/services/hardware/argonone.nix
  14. 3
      nixos/modules/services/matrix/appservice-irc.nix
  15. 28
      nixos/modules/services/misc/gitlab.nix
  16. 1
      nixos/tests/all-tests.nix
  17. 3
      nixos/tests/matrix/appservice-irc.nix
  18. 18
      nixos/tests/riak.nix
  19. 50
      nixos/tests/systemd-networkd-vrf.nix
  20. 22
      nixos/tests/traefik.nix
  21. 4
      pkgs/applications/audio/easyeffects/default.nix
  22. 4
      pkgs/applications/audio/tidal-hifi/default.nix
  23. 4
      pkgs/applications/emulators/atari800/default.nix
  24. 8
      pkgs/applications/graphics/solvespace/default.nix
  25. 182
      pkgs/applications/graphics/synfigstudio/default.nix
  26. 11
      pkgs/applications/misc/1password/default.nix
  27. 4
      pkgs/applications/misc/binance/default.nix
  28. 94
      pkgs/applications/misc/hollywood/default.nix
  29. 67
      pkgs/applications/misc/hollywood/nixos-paths.patch
  30. 6
      pkgs/applications/misc/josm/default.nix
  31. 4
      pkgs/applications/misc/logseq/default.nix
  32. 2
      pkgs/applications/misc/logseq/update.sh
  33. 4
      pkgs/applications/misc/octoprint/plugins.nix
  34. 16
      pkgs/applications/misc/organicmaps/default.nix
  35. 6
      pkgs/applications/networking/blocky/default.nix
  36. 7
      pkgs/applications/networking/browsers/firefox/wrapper.nix
  37. 4
      pkgs/applications/networking/cluster/argocd/default.nix
  38. 23
      pkgs/applications/networking/cluster/cilium/default.nix
  39. 4
      pkgs/applications/networking/cluster/cmctl/default.nix
  40. 8
      pkgs/applications/networking/cluster/fluxcd/default.nix
  41. 4
      pkgs/applications/networking/cluster/fn-cli/default.nix
  42. 4
      pkgs/applications/networking/cluster/helm-docs/default.nix
  43. 17
      pkgs/applications/networking/cluster/temporal-cli/default.nix
  44. 8
      pkgs/applications/networking/cluster/velero/default.nix
  45. 4
      pkgs/applications/networking/flexget/default.nix
  46. 4
      pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
  47. 2
      pkgs/applications/networking/instant-messengers/teamspeak/client.nix
  48. 4
      pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
  49. 4
      pkgs/applications/networking/remote/anydesk/default.nix
  50. 4
      pkgs/applications/networking/sniffers/sngrep/default.nix
  51. 22
      pkgs/applications/networking/syncthing-gtk/paths.patch
  52. 4
      pkgs/applications/office/portfolio/default.nix
  53. 4
      pkgs/applications/office/qownnotes/default.nix
  54. 4
      pkgs/applications/radio/gnuradio/3.9.nix
  55. 4
      pkgs/applications/radio/gnuradio/default.nix
  56. 2
      pkgs/applications/science/math/mathematica/generic.nix
  57. 6
      pkgs/applications/science/robotics/betaflight-configurator/default.nix
  58. 6
      pkgs/applications/terminal-emulators/wezterm/default.nix
  59. 8
      pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix
  60. 69
      pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch
  61. 16
      pkgs/applications/version-management/gitlab/data.json
  62. 14
      pkgs/applications/version-management/gitlab/default.nix
  63. 4
      pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
  64. 8
      pkgs/applications/version-management/gitlab/gitaly/default.nix
  65. 4
      pkgs/applications/version-management/gitlab/gitaly/gemset.nix
  66. 6
      pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
  67. 4
      pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
  68. 48
      pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
  69. 159
      pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
  70. 261
      pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
  71. 2
      pkgs/applications/video/vlc/default.nix
  72. 8
      pkgs/applications/window-managers/i3/status-rust.nix
  73. 14
      pkgs/data/fonts/victor-mono/default.nix
  74. 4
      pkgs/development/libraries/cpp-utilities/default.nix
  75. 4
      pkgs/development/libraries/doctest/default.nix
  76. 5
      pkgs/development/libraries/jarowinkler-cpp/default.nix
  77. 4
      pkgs/development/libraries/java/commons/daemon/default.nix
  78. 5
      pkgs/development/libraries/libkqueue/default.nix
  79. 12
      pkgs/development/libraries/ncurses/default.nix
  80. 4
      pkgs/development/libraries/olm/default.nix
  81. 12
      pkgs/development/libraries/rapidfuzz-cpp/default.nix
  82. 4
      pkgs/development/libraries/science/math/m4rie/default.nix
  83. 1
      pkgs/development/libraries/v8/8_x.nix
  84. 1
      pkgs/development/libraries/v8/default.nix
  85. 17
      pkgs/development/ocaml-modules/pbkdf/default.nix
  86. 1
      pkgs/development/python-modules/aioswitcher/default.nix
  87. 6
      pkgs/development/python-modules/audible/default.nix
  88. 4
      pkgs/development/python-modules/aws-lambda-builders/default.nix
  89. 4
      pkgs/development/python-modules/bimmer-connected/default.nix
  90. 4
      pkgs/development/python-modules/gdown/default.nix
  91. 17
      pkgs/development/python-modules/jarowinkler/default.nix
  92. 4
      pkgs/development/python-modules/manuel/default.nix
  93. 4
      pkgs/development/python-modules/miniaudio/default.nix
  94. 4
      pkgs/development/python-modules/mitogen/default.nix
  95. 6
      pkgs/development/python-modules/param/default.nix
  96. 6
      pkgs/development/python-modules/pygmt/default.nix
  97. 4
      pkgs/development/python-modules/pyroute2-core/default.nix
  98. 4
      pkgs/development/python-modules/pyroute2-ethtool/default.nix
  99. 4
      pkgs/development/python-modules/pyroute2-ipdb/default.nix
  100. 4
      pkgs/development/python-modules/pyroute2-ipset/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -78,6 +78,13 @@
fingerprint = "2536 9E86 1AA5 9EB7 4C47 B138 6510 870A 77F4 9A99";
}];
};
_0xC45 = {
email = "jason@0xc45.com";
name = "Jason Vigil";
github = "0xC45";
githubId = 56617252;
matrix = "@oxc45:matrix.org";
};
_1000101 = {
email = "b1000101@pm.me";
github = "1000101";

@ -146,6 +146,14 @@
a kernel module for mounting the Apple File System (APFS).
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://gitlab.com/DarkElvenAngel/argononed">argonone</link>,
a replacement daemon for the Raspberry Pi Argon One power
button and cooler. Available at
<link xlink:href="options.html#opt-services.hardware.argonone.enable">services.hardware.argonone</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/JustArchiNET/ArchiSteamFarm">ArchiSteamFarm</link>,

@ -189,6 +189,16 @@
changed and support for single hypen arguments was dropped.
</para>
</listitem>
<listitem>
<para>
<literal>i18n.supportedLocales</literal> is now by default
only generated with the default locale set in
<literal>i18n.defaultLocale</literal>. This got copied over
from the minimal profile and reduces the final system size by
200MB. If you require all locales installed set the option to
<literal>[ &quot;all&quot; ]</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>isPowerPC</literal> predicate, found on
@ -223,6 +233,13 @@
this version for the entire lifecycle of the 22.11 release.
</para>
</listitem>
<listitem>
<para>
riak package removed along with
<literal>services.riak</literal> module, due to lack of
maintainer to update the package.
</para>
</listitem>
<listitem>
<para>
(Neo)Vim can not be configured with

@ -61,6 +61,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS).
- [argonone](https://gitlab.com/DarkElvenAngel/argononed), a replacement daemon for the Raspberry Pi Argon One power button and cooler. Available at [services.hardware.argonone](options.html#opt-services.hardware.argonone.enable).
- [ArchiSteamFarm](https://github.com/JustArchiNET/ArchiSteamFarm), a C# application with primary purpose of idling Steam cards from multiple accounts simultaneously. Available as [services.archisteamfarm](#opt-services.archisteamfarm.enable).
- [BaGet](https://loic-sharma.github.io/BaGet/), a lightweight NuGet and symbol server. Available at [services.baget](#opt-services.baget.enable).

@ -80,6 +80,10 @@ In addition to numerous new and upgraded packages, this release has the followin
and [changelog](https://ngrok.com/docs/ngrok-agent/changelog). Notably, breaking changes are that the config file format has
changed and support for single hypen arguments was dropped.
- `i18n.supportedLocales` is now by default only generated with the default locale set in `i18n.defaultLocale`.
This got copied over from the minimal profile and reduces the final system size by 200MB.
If you require all locales installed set the option to ``[ "all" ]``.
- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
- The Barco ClickShare driver/client package `pkgs.clickshare-csc1` and the option `programs.clickshare-csc1.enable` have been removed,
@ -89,6 +93,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- PHP 7.4 is no longer supported due to upstream not supporting this
version for the entire lifecycle of the 22.11 release.
- riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
Use `configure.packages` instead.

@ -53,7 +53,8 @@ with lib;
supportedLocales = mkOption {
type = types.listOf types.str;
default = ["all"];
default = [ (config.i18n.defaultLocale + "/UTF-8") ];
defaultText = literalExpression "[ (config.i18n.defaultLocale + \"/UTF-8\") ]";
example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"];
description = ''
List of locales that the system should support. The value

@ -236,7 +236,7 @@ in
gitit = 202;
riemanntools = 203;
subsonic = 204;
riak = 205;
# riak = 205; # unused, remove 2022-07-22
#shout = 206; # dynamically allocated as of 2021-09-18
gateone = 207;
namecoin = 208;
@ -553,7 +553,7 @@ in
gitit = 202;
riemanntools = 203;
subsonic = 204;
riak = 205;
# riak = 205;#unused, removed 2022-06-22
#shout = 206; #unused
gateone = 207;
namecoin = 208;

@ -69,9 +69,9 @@ let
}'';
legacyOptionsDefined =
optional opt.system.isDefined opt.system
++ (optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem)
++ (optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem)
optional (opt.localSystem.highestPrio < (mkDefault {}).priority) opt.system
++ optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem
++ optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem
;
defaultPkgs =

@ -365,7 +365,6 @@
./services/databases/pgmanage.nix
./services/databases/postgresql.nix
./services/databases/redis.nix
./services/databases/riak.nix
./services/databases/victoriametrics.nix
./services/desktops/accountsservice.nix
./services/desktops/bamf.nix
@ -430,6 +429,7 @@
./services/games/terraria.nix
./services/hardware/acpid.nix
./services/hardware/actkbd.nix
./services/hardware/argonone.nix
./services/hardware/auto-cpufreq.nix
./services/hardware/bluetooth.nix
./services/hardware/bolt.nix

@ -8,9 +8,6 @@ with lib;
{
environment.noXlibs = mkDefault true;
# This isn't perfect, but let's expect the user specifies an UTF-8 defaultLocale
i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];
documentation.enable = mkDefault false;
documentation.nixos.enable = mkDefault false;

@ -97,6 +97,7 @@ with lib;
(mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.")
# Do NOT add any option renames here, see top of the file
];

@ -1,162 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.riak;
in
{
###### interface
options = {
services.riak = {
enable = mkEnableOption "riak";
package = mkOption {
type = types.package;
default = pkgs.riak;
defaultText = literalExpression "pkgs.riak";
description = ''
Riak package to use.
'';
};
nodeName = mkOption {
type = types.str;
default = "riak@127.0.0.1";
description = ''
Name of the Erlang node.
'';
};
distributedCookie = mkOption {
type = types.str;
default = "riak";
description = ''
Cookie for distributed node communication. All nodes in the
same cluster should use the same cookie or they will not be able to
communicate.
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/db/riak";
description = ''
Data directory for Riak.
'';
};
logDir = mkOption {
type = types.path;
default = "/var/log/riak";
description = ''
Log directory for Riak.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Additional text to be appended to <filename>riak.conf</filename>.
'';
};
extraAdvancedConfig = mkOption {
type = types.lines;
default = "";
description = ''
Additional text to be appended to <filename>advanced.config</filename>.
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
environment.etc."riak/riak.conf".text = ''
nodename = ${cfg.nodeName}
distributed_cookie = ${cfg.distributedCookie}
platform_log_dir = ${cfg.logDir}
platform_etc_dir = /etc/riak
platform_data_dir = ${cfg.dataDir}
${cfg.extraConfig}
'';
environment.etc."riak/advanced.config".text = ''
${cfg.extraAdvancedConfig}
'';
users.users.riak = {
name = "riak";
uid = config.ids.uids.riak;
group = "riak";
description = "Riak server user";
};
users.groups.riak.gid = config.ids.gids.riak;
systemd.services.riak = {
description = "Riak Server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [
pkgs.util-linux # for `logger`
pkgs.bash
];
environment.HOME = "${cfg.dataDir}";
environment.RIAK_DATA_DIR = "${cfg.dataDir}";
environment.RIAK_LOG_DIR = "${cfg.logDir}";
environment.RIAK_ETC_DIR = "/etc/riak";
preStart = ''
if ! test -e ${cfg.logDir}; then
mkdir -m 0755 -p ${cfg.logDir}
chown -R riak ${cfg.logDir}
fi
if ! test -e ${cfg.dataDir}; then
mkdir -m 0700 -p ${cfg.dataDir}
chown -R riak ${cfg.dataDir}
fi
'';
serviceConfig = {
ExecStart = "${cfg.package}/bin/riak console";
ExecStop = "${cfg.package}/bin/riak stop";
StandardInput = "tty";
User = "riak";
Group = "riak";
PermissionsStartOnly = true;
# Give Riak a decent amount of time to clean up.
TimeoutStopSec = 120;
LimitNOFILE = 65536;
};
unitConfig.RequiresMountsFor = [
"${cfg.dataDir}"
"${cfg.logDir}"
"/etc/riak"
];
};
};
}

@ -0,0 +1,58 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.hardware.argonone;
in
{
options.services.hardware.argonone = {
enable = lib.mkEnableOption "the driver for Argon One Raspberry Pi case fan and power button";
package = lib.mkOption {
type = lib.types.package;
default = pkgs.argononed;
defaultText = "pkgs.argononed";
description = ''
The package implementing the Argon One driver
'';
};
};
config = lib.mkIf cfg.enable {
hardware.i2c.enable = true;
hardware.deviceTree.overlays = [
{
name = "argononed";
dtboFile = "${cfg.package}/boot/overlays/argonone.dtbo";
}
{
name = "i2c1-okay-overlay";
dtsText = ''
/dts-v1/;
/plugin/;
/ {
compatible = "brcm,bcm2711";
fragment@0 {
target = <&i2c1>;
__overlay__ {
status = "okay";
};
};
};
'';
}
];
environment.systemPackages = [ cfg.package ];
systemd.services.argononed = {
description = "Argon One Raspberry Pi case Daemon Service";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "forking";
ExecStart = "${cfg.package}/bin/argononed";
PIDFile = "/run/argononed.pid";
Restart = "on-failure";
};
};
};
meta.maintainers = with lib.maintainers; [ misterio77 ];
}

@ -153,6 +153,9 @@ in {
systemd.services.matrix-appservice-irc = {
description = "Matrix-IRC bridge";
before = [ "matrix-synapse.service" ]; # So the registration can be used by Synapse
after = lib.optionals (cfg.settings.database.engine == "postgres") [
"postgresql.service"
];
wantedBy = [ "multi-user.target" ];
preStart = ''

@ -13,6 +13,22 @@ let
else
pkgs.postgresql_12;
# Git 2.36.1 seemingly contains a commit-graph related bug which is
# easily triggered through GitLab, so we downgrade it to 2.35.x
# until this issue is solved. See
# https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101.
gitPackage =
let
version = "2.35.3";
in
pkgs.git.overrideAttrs (oldAttrs: rec {
inherit version;
src = pkgs.fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "sha256-FenbT5vy7Z//MMtioAxcfAkBAV9asEjNtOiwTd7gD6I=";
};
});
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
@ -41,7 +57,7 @@ let
prometheus_listen_addr = "localhost:9236"
[git]
bin_path = "${pkgs.git}/bin/git"
bin_path = "${gitPackage}/bin/git"
[gitaly-ruby]
dir = "${cfg.packages.gitaly.ruby}"
@ -137,7 +153,7 @@ let
};
workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
gitlab_kas.secret_file = "${cfg.statePath}/.gitlab_kas_secret";
git.bin_path = "git";
git.bin_path = "${gitPackage}/bin/git";
monitoring = {
ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
sidekiq_exporter = {
@ -1275,7 +1291,7 @@ in {
});
path = with pkgs; [
postgresqlPackage
git
gitPackage
ruby
openssh
nodejs
@ -1306,7 +1322,7 @@ in {
path = with pkgs; [
openssh
procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
git
gitPackage
cfg.packages.gitaly.rubyEnv
cfg.packages.gitaly.rubyEnv.wrappedRuby
gzip
@ -1351,7 +1367,7 @@ in {
partOf = [ "gitlab.target" ];
path = with pkgs; [
exiftool
git
gitPackage
gnutar
gzip
openssh
@ -1412,7 +1428,7 @@ in {
environment = gitlabEnv;
path = with pkgs; [
postgresqlPackage
git
gitPackage
openssh
nodejs
procps

@ -472,7 +472,6 @@ in {
restartByActivationScript = handleTest ./restart-by-activation-script.nix {};
restic = handleTest ./restic.nix {};
retroarch = handleTest ./retroarch.nix {};
riak = handleTest ./riak.nix {};
robustirc-bridge = handleTest ./robustirc-bridge.nix {};
roundcube = handleTest ./roundcube.nix {};
rspamd = handleTest ./rspamd.nix {};

@ -193,6 +193,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
testScript = ''
import pathlib
import os
start_all()
@ -206,7 +207,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
with subtest("copy the registration file"):
appservice.copy_from_vm("/var/lib/matrix-appservice-irc/registration.yml")
homeserver.copy_from_host(
pathlib.Path(os.environ.get("out", os.getcwd())) / "registration.yml", "/"
str(pathlib.Path(os.environ.get("out", os.getcwd())) / "registration.yml"), "/"
)
homeserver.succeed("chmod 444 /registration.yml")

@ -1,18 +0,0 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "riak";
meta = with lib.maintainers; {
maintainers = [ Br1ght0ne ];
};
nodes.machine = {
services.riak.enable = true;
services.riak.package = pkgs.riak;
};
testScript = ''
machine.start()
machine.wait_for_unit("riak")
machine.wait_until_succeeds("riak ping 2>&1")
'';
})

@ -138,18 +138,18 @@ in {
};
testScript = ''
def compare_tables(expected, actual):
assert (
expected == actual
), """
Routing tables don't match!
Expected:
{}
Actual:
{}
""".format(
expected, actual
)
import json
def compare(raw_json, to_compare):
data = json.loads(raw_json)
assert len(raw_json) >= len(to_compare)
for i, row in enumerate(to_compare):
actual = data[i]
assert len(row.keys()) > 0
for key, value in row.items():
assert value == actual[key], f"""
In entry {i}, value {key}: got: {actual[key]}, expected {value}
"""
start_all()
@ -178,14 +178,28 @@ in {
# Check that networkd properly configures the main routing table
# and the routing tables for the VRF.
with subtest("check vrf routing tables"):
compare_tables(
client_ipv4_table, client.succeed("ip -4 route list | head -n2").strip()
compare(
client.succeed("ip --json -4 route list"),
[
{"dst": "192.168.1.2", "dev": "vrf1", "metric": 100},
{"dst": "192.168.2.3", "dev": "vrf2", "metric": 100}
]
)
compare_tables(
vrf1_table, client.succeed("ip -4 route list table 23 | head -n4").strip()
compare(
client.succeed("ip --json -4 route list table 23"),
[
{"dst": "192.168.1.0/24", "dev": "eth1", "prefsrc": "192.168.1.1"},
{"type": "local", "dst": "192.168.1.1", "dev": "eth1", "prefsrc": "192.168.1.1"},
{"type": "broadcast", "dev": "eth1", "prefsrc": "192.168.1.1", "dst": "192.168.1.255"}
]
)
compare_tables(
vrf2_table, client.succeed("ip -4 route list table 42 | head -n4").strip()
compare(
client.succeed("ip --json -4 route list table 42"),
[
{"dst": "192.168.2.0/24", "dev": "eth2", "prefsrc": "192.168.2.1"},
{"type": "local", "dst": "192.168.2.1", "dev": "eth2", "prefsrc": "192.168.2.1"},
{"type": "broadcast", "dev": "eth2", "prefsrc": "192.168.2.1", "dst": "192.168.2.255"}
]
)
# Ensure that other nodes are reachable via ICMP through the VRF.

@ -11,14 +11,20 @@ import ./make-test-python.nix ({ pkgs, ... }: {
environment.systemPackages = [ pkgs.curl ];
};
traefik = { config, pkgs, ... }: {
virtualisation.oci-containers.containers.nginx = {
extraOptions = [
"-l" "traefik.enable=true"
"-l" "traefik.http.routers.nginx.entrypoints=web"
"-l" "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)"
];
image = "nginx-container";
imageFile = pkgs.dockerTools.examples.nginx;
virtualisation.oci-containers = {
backend = "docker";
containers.nginx = {
extraOptions = [
"-l"
"traefik.enable=true"
"-l"
"traefik.http.routers.nginx.entrypoints=web"
"-l"
"traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)"
];
image = "nginx-container";
imageFile = pkgs.dockerTools.examples.nginx;
};
};
networking.firewall.allowedTCPPorts = [ 80 ];

@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "easyeffects";
version = "6.2.5";
version = "6.2.6";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
sha256 = "sha256-LvTvNBo3aUGUD4vA04YtINFBjTplhmkxj3FlbTZDTA0=";
sha256 = "sha256-1kXYh2Qk0Wj0LgHTcRVAKro7LAPV/UM5i9VmHjmxTx0=";
};
nativeBuildInputs = [

@ -36,11 +36,11 @@
stdenv.mkDerivation rec {
pname = "tidal-hifi";
version = "4.0.0";
version = "4.0.1";
src = fetchurl {
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
sha256 = "19gx9x3v5ywlvg5vyqgj6pghzwinby0i8isavfrix798pfr98j5z";
sha256 = "1azxdr2m84ci6ppzy0j17wmza7prlnw055fks6s4i77sjw45rhlq";
};
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];

@ -4,13 +4,13 @@
with lib;
stdenv.mkDerivation rec {
pname = "atari800";
version = "4.2.0";
version = "5.0.0";
src = fetchFromGitHub {
owner = "atari800";
repo = "atari800";
rev = "ATARI800_${replaceChars ["."] ["_"] version}";
sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy";
sha256 = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg=";
};
nativeBuildInputs = [ autoreconfHook ];

@ -7,6 +7,7 @@
, at-spi2-core
, cairo
, dbus
, eigen
, freetype
, fontconfig
, glew
@ -18,6 +19,7 @@
, libpng
, libselinux
, libsepol
, libspnav
, libthai
, libxkbcommon
, pangomm
@ -29,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "solvespace";
version = "3.0";
version = "3.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE=";
hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA=";
fetchSubmodules = true;
};
@ -49,6 +51,7 @@ stdenv.mkDerivation rec {
at-spi2-core
cairo
dbus
eigen
freetype
fontconfig
glew
@ -60,6 +63,7 @@ stdenv.mkDerivation rec {
libpng
libselinux
libsepol
libspnav
libthai
libxkbcommon
pangomm

@ -1,122 +1,136 @@
{ lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config
, imagemagick, intltool, autoreconfHook, which, gnome
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, autoreconfHook
, wrapGAppsHook
, boost
, cairo
, gettext
, glibmm
, gtk3
, gtkmm3
, libjack2
, libsigcxx
, libxmlxx
, mlt
, pango
, imagemagick
, intltool
, gnome
, harfbuzz
, freetype
, fribidi
, openexr
, fftw
}:
let
version = "1.0.2";
version = "1.5.1";
src = fetchFromGitHub {
owner = "synfig";
repo = "synfig";
rev = "v${version}";
hash = "sha256-9vBYESaSgW/1FWH2uFBvPiYvxLlX0LLNnd4S7ACJcwI=";
};
ETL = stdenv.mkDerivation {
name = "ETL-0.04.19";
src = fetchFromGitHub {
repo = "synfig";
owner = "synfig";
rev = version;
sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc";
};
pname = "ETL";
inherit version src;
postUnpack = "sourceRoot=\${sourceRoot}/ETL/";
sourceRoot = "source/ETL";
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [
pkg-config
autoreconfHook
];
buildInputs = [
glibmm
];
};
synfig = stdenv.mkDerivation {
pname = "synfig";
inherit version;
src = fetchFromGitHub {
repo = "synfig";
owner = "synfig";
rev = version;
sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc";
};
inherit version src;
postUnpack = "sourceRoot=\${sourceRoot}/synfig-core/";
sourceRoot = "source/synfig-core";
configureFlags = [
"--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.out}/lib"
];
nativeBuildInputs = [ pkg-config autoreconfHook gettext ];
nativeBuildInputs = [
pkg-config
autoreconfHook
gettext
intltool
];
buildInputs = [
ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango
ETL
boost
cairo
glibmm
mlt
libsigcxx
libxmlxx
pango
imagemagick
harfbuzz
freetype
fribidi
openexr
fftw
];
meta.broken = true;
};
in
stdenv.mkDerivation {
pname = "synfigstudio";
inherit version;
inherit version src;
src = fetchFromGitHub {
repo = "synfig";
owner = "synfig";
rev = version;
sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc";
};
postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/";
sourceRoot = "source/synfig-studio";
postPatch = ''
for i in \
brushlib/brushlib.hpp \
gui/canvasview.cpp \
gui/compview.cpp \
gui/docks/dock_canvasspecific.cpp \
gui/docks/dock_children.cpp \
gui/docks/dock_curves.cpp \
gui/docks/dock_history.cpp \
gui/docks/dock_keyframes.cpp \
gui/docks/dock_layergroups.cpp \
gui/docks/dock_layers.cpp \
gui/docks/dock_metadata.cpp \
gui/docks/dock_params.cpp \
gui/docks/dock_timetrack.cpp \
gui/docks/dock_toolbox.cpp \
gui/docks/dockable.cpp \
gui/docks/dockdialog.cpp \
gui/docks/dockmanager.h \
gui/duck.h \
gui/duckmatic.cpp \
gui/duckmatic.h \
gui/instance.cpp \
gui/instance.h \
gui/states/state_stroke.h \
gui/states/state_zoom.cpp \
gui/widgets/widget_curves.cpp \
gui/workarea.cpp \
gui/workarearenderer/workarearenderer.h \
synfigapp/action_system.h \
synfigapp/canvasinterface.h \
synfigapp/instance.h \
synfigapp/main.h \
synfigapp/uimanager.h
do
substituteInPlace src/"$i" --replace '#include <sigc++/object.h>' '#include <sigc++/sigc++.h>'
substituteInPlace src/"$i" --replace '#include <sigc++/hide.h>' '#include <sigc++/adaptors/hide.h>'
substituteInPlace src/"$i" --replace '#include <sigc++/retype.h>' '#include <sigc++/adaptors/retype.h>'
done
patchShebangs images/splash_screen_development.sh
'';
preConfigure = "./bootstrap.sh";
preConfigure = ''
./bootstrap.sh
'';
nativeBuildInputs = [ pkg-config autoreconfHook gettext makeWrapper ];
nativeBuildInputs = [
pkg-config
autoreconfHook
gettext
wrapGAppsHook
];
buildInputs = [
ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
libjack2 libsigcxx libxmlxx mlt-qt5
synfig which gnome.adwaita-icon-theme
ETL
synfig
boost
cairo
glibmm
gtk3
gtkmm3
imagemagick
intltool
libjack2
libsigcxx
libxmlxx
mlt
gnome.adwaita-icon-theme
openexr
fftw
];
postInstall = ''
wrapProgram "$out/bin/synfigstudio" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
enableParallelBuilding = true;
passthru = {
# Expose libraries and cli tools
inherit ETL synfig;
};
meta = with lib; {
description = "A 2D animation program";
homepage = "http://www.synfig.org";

@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.4.1";
version = "2.5.1";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-ANRYE1BoezrcDxZrQYp/OPdtn4J+FmC/PLSIP5Amm18=" "zip";
i686-linux = fetch "linux_386" "sha256-w3anr76uj/Z+ilZ+LUGOB1CoKkvxcD+v8c8lVADPwRY=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-axZ+XDIMJlAicnYTIXgcaoT+Zcg6xvHlchl/ng7V9GY=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-/DnrQ4fwbc2ELtsEClvzA9kTrse3pMgGLbhiKZ3gphA=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip";
i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;
@ -48,6 +48,7 @@ stdenv.mkDerivation {
'';
postInstall = ''
HOME=$TMPDIR
installShellCompletion --cmd ${mainProgram} \
--bash <($out/bin/${mainProgram} completion bash) \
--fish <($out/bin/${mainProgram} completion fish) \

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "binance";
version = "1.35.0";
version = "1.36.0";
src = fetchurl {
url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ=";
sha256 = "sha256-Q1cvEQ/yxytzrPfiyeTZSCPecnmSdhy+ds/gtie4vwo=";
};
nativeBuildInputs = [

@ -0,0 +1,94 @@
{ stdenv
, fetchFromGitHub
, makeWrapper
, lib
, coreutils
, apg
, atop
, bmon
, cmatrix
, pygments
, moreutils
, util-linux
, jp2a
, man
, mplayer
, openssh
, tree
, mlocate
, findutils
, ccze
, ncurses
, python3
, wget
, libcaca
, newsboat
, rsstail
, w3m
, ticker
, tmux
}:
stdenv.mkDerivation {
pname = "hollywood";
version = "1.22";
src = fetchFromGitHub {
owner = "dustinkirkland";
repo = "hollywood";
rev = "35275a68c37bbc39d8b2b0e4664a0c2f5451e5f6";
sha256 = "sha256-faIm1uXERvIDZ6SK6uarVkWGNJskAroHgq5Cg7nUZc4=";
};
nativeBuildInputs = [ makeWrapper ];
patches = [ ./nixos-paths.patch ];
postPatch = ''
rm lib/hollywood/speedometer
rm bin/wallstreet
rm -r lib/wallstreet
'';
dontBuild = true;
installPhase =
let pathDeps = [
tmux
coreutils
ncurses
jp2a
mlocate
apg
atop
bmon
cmatrix
pygments
moreutils
util-linux
jp2a
man
mplayer
openssh
tree
findutils
ccze
];
in ''
runHook preInstall
mkdir -p $out
cp -r bin $out/bin
cp -r lib $out/lib
cp -r share $out/share
wrapProgram $out/bin/hollywood --prefix PATH : ${lib.makeBinPath pathDeps}
runHook postInstall
'';
meta = {
description = "Fill your console with Hollywood melodrama technobabble";
homepage = "https://a.hollywood.computer/";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.anselmschueler ];
};
}

@ -0,0 +1,67 @@
diff --git a/bin/hollywood b/bin/hollywood
index 6f1ee68..09bc4ea 100755
--- a/bin/hollywood
+++ b/bin/hollywood
@@ -74,7 +74,7 @@ if [ -z "$TMUX" ]; then
else
tmux_launcher=tmux
fi
- $tmux_launcher new-session -d -s $PKG "/bin/bash"
+ $tmux_launcher new-session -d -s $PKG "/usr/bin/env bash"
$tmux_launcher send-keys -t $PKG "$0 $1"
$tmux_launcher send-keys -t $PKG Enter
exec $tmux_launcher attach-session -t $PKG
diff --git a/lib/hollywood/code b/lib/hollywood/code
index 532ce73..3448447 100755
--- a/lib/hollywood/code
+++ b/lib/hollywood/code
@@ -19,7 +19,7 @@ command -v view >/dev/null 2>&1 || exit 1
trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
while true; do
- FILES=$(locate -l 4096 "/usr/*.java" "/usr/*.c" "/usr/*.cpp" 2>/dev/null | sort -R)
+ FILES=$(locate -l 4096 "/usr/*.java" "/run/current-system/sw/*.java" "/usr/*.c" "/run/current-system/sw/*.c" "/usr/*.cpp" "/run/current-system/sw/*.cpp" 2>/dev/null | sort -R)
for f in $FILES; do
[ -r "$f" ] || continue
[ -s "$f" ] || continue
diff --git a/lib/hollywood/hexdump b/lib/hollywood/hexdump
index f2fb0bd..db059f5 100755
--- a/lib/hollywood/hexdump
+++ b/lib/hollywood/hexdump
@@ -19,8 +19,8 @@ command -v ccze >/dev/null 2>&1 || exit 1
trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
while true; do
- for f in $(ls /usr/bin/ | sort -R); do
- head -c 4096 "/usr/bin/$f" | hexdump -C | ccze -A -c default=green -c dir="bold green"
+ for f in $(find /usr/bin/ /run/current-system/sw/bin/ | sort -R); do
+ head -c 4096 "$f" | hexdump -C | ccze -A -c default=green -c dir="bold green"
sleep 0.7
done
done
diff --git a/lib/hollywood/jp2a b/lib/hollywood/jp2a
index e87b950..6541f80 100755
--- a/lib/hollywood/jp2a
+++ b/lib/hollywood/jp2a
@@ -19,7 +19,7 @@ command -v jp2a >/dev/null 2>&1 || exit 1
trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
while true; do
- FILES=$(locate -l 4096 "/usr/*jpg" 2>/dev/null | sort -R)
+ FILES=$(locate -l 4096 "/usr/*jpg" "/run/current-system/sw/*jpg" 2>/dev/null | sort -R)
for f in $FILES; do
[ -r "$f" ] || continue
[ -s "$f" ] || continue
diff --git a/lib/hollywood/man b/lib/hollywood/man
index 2d42513..f4d8bbb 100755
--- a/lib/hollywood/man
+++ b/lib/hollywood/man
@@ -19,7 +19,7 @@ command -v ccze >/dev/null 2>&1 || exit 1
trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
while true; do
- FILES=$(ls /usr/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096)
+ FILES=$(ls /usr/share/man/man1/ /run/current-system/sw/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096)
for f in $FILES; do
man "$f" | ccze -A
sleep 0.2

@ -3,15 +3,15 @@
}:
let
pname = "josm";
version = "18427";
version = "18463";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "sha256-SsoeKfpWi41sd77LfaQW0OcHnyf8iLolKWF74dhalpY=";
sha256 = "sha256-++8XtzAykJ+85Kvzy3xgaZoKaVlJwz+Ct1xb/QkC1Gc=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
sha256 = "sha256-cz3OT03StvJy9XYBiPxx+nz36O0cg+XrL/uc52/G/1c=";
sha256 = "sha256-n7GlUWYOAXw4G59SBsO8HZ1OaiUWwzOsiURPFBYq31E=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.7.0";
version = "0.7.5";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "sha256-oXNSd0ZU2ZsMK51tq8iq2sfuLg0ZHaiXhpJpWZkEmeY=";
sha256 = "sha256-uMlvpEEzanJ3zTEZKNE2zEfqvGC4IWL97b0AkTfwZeU=";
name = "${pname}-${version}.AppImage";
};

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq '.[0].tag_name' --raw-output)"
version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq 'map(select(.prerelease == false)) | .[0].tag_name' --raw-output)"
update-source-version logseq "$version"

@ -311,8 +311,8 @@ in
src = fetchFromGitHub {
owner = "jneilliii";
repo = "OctoPrint-STLViewer";
rev = version;
sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b";
rev = "refs/tags/${version}";
sha256 = "sha256-S7zjEbyo59OJpa7INCv1o4ybQ+Sy6a3EJ5AJ6wiBe1Y=";
};
meta = with lib; {

@ -8,7 +8,6 @@
, which
, python3
, rsync
, makeWrapper
, qtbase
, qtsvg
, libGLU
@ -20,13 +19,13 @@
mkDerivation rec {
pname = "organicmaps";
version = "2022.05.31-10";
version = "2022.06.18-2";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc=";
sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI=";
fetchSubmodules = true;
};
@ -45,7 +44,6 @@ mkDerivation rec {
which
python3
rsync
makeWrapper
];
# Most dependencies are vendored
@ -64,16 +62,6 @@ mkDerivation rec {
bash ./configure.sh
'';
# Tell the program that the read-only and the read-write data locations
# are different, and create the read-write one.
# https://github.com/organicmaps/organicmaps/issues/2387
postInstall = ''
wrapProgram $out/bin/OMaps \
--add-flags "-resources_path $out/share/organicmaps/data" \
--add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \
--run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"'
'';
meta = with lib; {
# darwin: "invalid application of 'sizeof' to a function type"
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;

@ -6,20 +6,20 @@
buildGoModule rec {
pname = "blocky";
version = "0.18";
version = "0.19";
src = fetchFromGitHub {
owner = "0xERR0R";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rFHDoNrEmMSNEc3RLdSeRk9mF05drUYfJFQKHAk5alE=";
sha256 = "sha256-jOOakRuiNbdCGmbaQFuHcLsHhV26jaQY+1GgDj9ocs0=";
};
# needs network connection and fails at
# https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
doCheck = false;
vendorSha256 = "sha256-rrqDjh5e3KX5+saYjnMPG0bhr5YEOPfz0QCRf6omNZI=";
vendorSha256 = "sha256-fsMBL9qyhIrV6eAsqpSaNniibMdYRVBnl2KCzStvMGQ=";
meta = with lib; {
description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features.";

@ -97,12 +97,15 @@ let
nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []);
requiresSigning = browser ? MOZ_REQUIRE_SIGNING
-> toString browser.MOZ_REQUIRE_SIGNING != "";
# Check that every extension has a unqiue .name attribute
# and an extid attribute
extensions = if nameArray != (lib.unique nameArray) then
throw "Firefox addon name needs to be unique"
else if ! (lib.hasSuffix "esr" browser.name) then
throw "Nix addons are only supported in Firefox ESR"
else if requiresSigning && !lib.hasSuffix "esr" browser.name then
throw "Nix addons are only supported without signature enforcement (eg. Firefox ESR)"
else builtins.map (a:
if ! (builtins.hasAttr "extid" a) then
throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon"

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "argocd";
version = "2.4.0";
version = "2.4.2";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
sha256 = "sha256-U3i3shXsItQQlkFl/DrGdSHY2AAhaYV5WX3B+6TlOPw=";
sha256 = "sha256-zc99YKh5hNa4oRoKJcGWqNrDb3LqIwXWzYOsmGKVsL8=";
};
vendorSha256 = "sha256-j/35tvfUCcuFN8NGIjWgna1W0Q4CyhMLcOlepTAUl0w=";

@ -2,22 +2,39 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.11.7";
version = "0.11.10";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4+4E7v/b74DDekqymH8PR7/GfH3GGzSQFQk24VJisQ0=";
sha256 = "sha256-BkcnChxUceWGG5hBOHvzZokgcw8T/vvNwIEtHkLfUJA=";
};
vendorSha256 = null;
subPackages = [ "cmd/cilium" ];
ldflags = [
"-s" "-w"
"-X github.com/cilium/cilium-cli/internal/cli/cmd.Version=${version}"
];
# Required to workaround install check error:
# 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied
HOME = "$TMPDIR";
doInstallCheck = true;
installCheckPhase = ''
$out/bin/cilium version | grep ${version} > /dev/null
'';
meta = with lib; {
description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium";
license = licenses.asl20;
homepage = "https://www.cilium.io/";
maintainers = with maintainers; [ humancalico ];
maintainers = with maintainers; [ humancalico bryanasdev000 ];
mainProgram = "cilium";
};
}

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cmctl";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "cert-manager";
repo = "cert-manager";
rev = "v${version}";
sha256 = "sha256-h7GyzjVrfyMHY7yuNmmsym6KGKCQr5R71gjPBTUeMCg=";
sha256 = "sha256-IR+z3+f9Pa7wQAP4EVya7fb7FnndaUY7F2ckTzpEuCA=";
};
vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI=";

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.31.1";
sha256 = "1dhs96r9yi37i5q9wqg7198f6kl59jlj3g1q76r0snqyl16g2jwf";
manifestsSha256 = "0wwlwai1hhz69kgaccw3w8ad6bwdd46pm4ns8nqm04927b0b2dqb";
version = "0.31.2";
sha256 = "1w373gwxxvnqsfm5r63r1bcmlrii5wy6yhbs5li0bw2anhnb0iir";
manifestsSha256 = "0lqfrry1kg52ikyhzgwg57zqzq24aspp2d7whyzir3dglvf999lb";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-sPyz6ISFLe+6CJoAcG17KSfo63vuTj30IWw+S2NCszY=";
vendorSha256 = "sha256-Z7O/ReEZwmK5KKAHzi4B3d31ynA51XzbTKsrzCXAFPo=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fn";
version = "0.6.17";
version = "0.6.20";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
sha256 = "sha256-u/YISLlZFYlAUejSlaH7POA2WwKURPN8phFU86/caXU=";
sha256 = "sha256-HeyWMzxSga6T2/BRVwrmgb3utjnVTJk3zhhcVfq8/Cc=";
};
vendorSha256 = null;

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helm-docs";
version = "1.8.1";
version = "1.10.0";
src = fetchFromGitHub {
owner = "norwoodj";
repo = "helm-docs";
rev = "v${version}";
sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw=";
sha256 = "sha256-V7Qw20PPoAEXl/XAMj/WSM73fLdp/gH4G3ipx49p06o=";
};
vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw=";

@ -1,26 +1,17 @@
{ lib, fetchFromGitHub, fetchpatch, buildGoModule, testers, temporal-cli }:
{ lib, fetchFromGitHub, buildGoModule, testers, temporal-cli }:
buildGoModule rec {
pname = "temporal-cli";
version = "1.16.1";
version = "1.16.2";
src = fetchFromGitHub {
owner = "temporalio";
repo = "tctl";
rev = "v${version}";
sha256 = "sha256-WNdu/62/VmxTmzAvzx3zIlcAAlEmpN0yKzQOSUtrL8s=";
sha256 = "sha256-KLcCFQJlFeioIhqrbkhgoNPcbAYvy1ESG8x9Y/I7+nw=";
};
patches = [
# Fix tests
(fetchpatch {
name = "fix-tests.patch";
url = "https://github.com/temporalio/tctl/pull/203/commits/2b113da137a3a925e8fbd7c18bdaaefc31397db4.patch";
sha256 = "sha256-HFPwbmLZ2uPHzaHvYoB4MTZvMVyzvUKggA76/bh50DQ=";
})
];
vendorSha256 = "sha256-WF3T+HNisfR0JoKkHCC77kmHmsGZ9NfQ7UCwOmpCG/o=";
vendorSha256 = "sha256-kczmoP32/V0HHeC3Mr+giuMB+McVTNeC2F+t1ohY4/U=";
ldflags = [ "-s" "-w" ];

@ -2,23 +2,25 @@
buildGoModule rec {
pname = "velero";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "velero";
rev = "v${version}";
sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58=";
sha256 = "sha256-zoHMyOhHEunJ8LirUxOT1qNY3jB28BEiQ+3GdqriTtQ=";
};
ldflags = [
"-s" "-w"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
];
vendorSha256 = "sha256-DyQ+MHRNZFg80Yz/SCxhnF4NVbIsyhz4mApx0+kgHoA=";
vendorSha256 = "sha256-PDXufnddHEA0qCfzJ0O+h3u50gWNkQAnWMZjSVQ0oHc=";
excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ];

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.17";
version = "3.3.18";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-xVHk6fQBY8EQsZJDZYoQ+WXDpLGJrRTVR6xhF1DWv0I=";
hash = "sha256-vZOeWxCcrTRT28Bn2r/I7/ojQ6uUV3xZlAZLbrAH5tc=";
};
postPatch = ''

@ -24,7 +24,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.46.0"; # Please backport all updates to the stable channel.
version = "5.47.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "sha256-zy9nETD82KguML0MXe8hlB4m+fBCMmJ1z/2Neq6QvEU=";
sha256 = "sha256-aQpylo4/pbHP2an1w6DEhRmU3uvntN/tnYhvaWtNGGg=";
};
nativeBuildInputs = [

@ -93,6 +93,8 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/ts3client \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \
'' /* wayland is currently broken, remove when TS3 fixes that */ + ''
--set QT_QPA_PLATFORM xcb \
--set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
'';

@ -71,7 +71,7 @@ let
in
env.mkDerivation rec {
pname = "telegram-desktop";
version = "4.0.0";
version = "4.0.2";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -80,7 +80,7 @@ env.mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "16j5rvlqr2bb1dkc7cc920ylhw3sp4qnqvm1aznnnjzcimqb8xf0";
sha256 = "07fhm36394171w0rvay1x9x1br3z36z4dlpi57bkq23dvi331pxj";
};
postPatch = ''

@ -18,14 +18,14 @@ let
in stdenv.mkDerivation rec {
pname = "anydesk";
version = "6.1.1";
version = "6.2.0";
src = fetchurl {
urls = [
"https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz"
"https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz"
];
sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh";
sha256 = "k85nQH2FWyEXDgB+Pd4yStfNCjkiIGE2vA/YTXLaK4o=";
};
passthru = {

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "sngrep";
version = "1.4.10";
version = "1.5.0";
src = fetchFromGitHub {
owner = "irontec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es=";
sha256 = "sha256-GxC9+O72GHE8Tc6FReO7EdpZTSaqn9mBpZCYaKybJls=";
};
nativeBuildInputs = [

@ -1,22 +0,0 @@
--- a/syncthing_gtk/configuration.py
+++ b/syncthing_gtk/configuration.py
@@ -30,7 +30,7 @@
"autokill_daemon" : (int, 2), # 0 - never kill, 1 - always kill, 2 - ask
"daemon_priority" : (int, 0), # uses nice values
"max_cpus" : (int, 0), # 0 for all cpus
- "syncthing_binary" : (str, "/usr/bin/syncthing"),
+ "syncthing_binary" : (str, "@syncthing@"),
"syncthing_arguments" : (str, ""),
"minimize_on_start" : (bool, False),
"folder_as_path" : (bool, True),
--- a/syncthing_gtk/tools.py
+++ b/syncthing_gtk/tools.py
@@ -303,7 +303,7 @@
return False
# signal 0 doesn't kill anything, but killall exits with 1 if
# named process is not found
- p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"])
+ p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"])
p.communicate()
return p.returncode == 0
else:

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.58.4";
version = "0.58.5";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "sha256-Png9OcO5dzoeKp826FwdM7zkovuOnSYMnGw5weT2eJU=";
sha256 = "sha256-7olUx0JmztNb6uFsxKwOkBqkbMEiy2vb+iHqBe5I1PM=";
};
nativeBuildInputs = [

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
version = "22.5.0";
version = "22.6.1";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
sha256 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd";
sha256 = "c5b2075d42298d28f901ad2df8eb65f5a61aa59727fae9eeb1f92dac1b63d8ba";
};
nativeBuildInputs = [ qmake qttools ];

@ -46,13 +46,13 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.9";
minor = "6";
minor = "7";
patch = "0";
}
}:
let
sourceSha256 = "sha256-0JODgv9MNOkHDQYTVCZMzjr/G542+NvGP9wlH9iwLeg=";
sourceSha256 = "sha256-6HEvQsV2JCkgNvBYsy1jfSTUIwEnrKJTzXNIVcPeWFQ=";
featuresInfo = {
# Needed always
basic = {

@ -48,13 +48,13 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.10";
minor = "2";
minor = "3";
patch = "0";
}
}:
let
sourceSha256 = "sha256-WcfmW39wHhFdpbdBSjOfuDkxL8/fuMjjJoLUyCUud/o=";
sourceSha256 = "sha256-pH0nvZBUto9jXSN6fXD5vP1lIBwCMuFAvF2qT5dYsHU=";
featuresInfo = {
# Needed always
basic = {

@ -121,6 +121,8 @@ in stdenv.mkDerivation {
"--set USE_WOLFRAM_LD_LIBRARY_PATH 1"
# Fix xkeyboard config path for Qt
"--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb"
# wayland isn't supported
"--set QT_QPA_PLATFORM xcb"
] ++ lib.optionals cudaSupport [
"--set CUDA_PATH ${cudaEnv}"
"--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so"

@ -13,10 +13,10 @@ let
in
stdenv.mkDerivation rec {
inherit pname;
version = "10.7.2";
version = "10.8.0";
src = fetchurl {
url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip";
sha256 = "sha256-FDmtFRUupPKiHeF3Xvh/VagqMo+FJi8I7mhTz0VDs3o=";
url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip";
sha256 = "sha256-Xn0ga2Z1UKd++TriL47ulV6idVTNBR8uiSW7FnL7r1g=";
};
nativeBuildInputs = [ wrapGAppsHook unzip ];

@ -28,14 +28,14 @@
rustPlatform.buildRustPackage rec {
pname = "wezterm";
version = "20220408-101518-b908e2dd";
version = "20220624-141144-bd1b7c5d";
src = fetchFromGitHub {
owner = "wez";
repo = pname;
rev = version;
fetchSubmodules = true;
sha256 = "sha256-kuuoD+hqgj7QXFRIxa112oc4idtcK0ptFACDpI0bzGY=";
sha256 = "sha256-7VuNOJ4xqTxumLft7wRj4zdN8Y2ZSYtXr/KuqaLNOgw=";
};
postPatch = ''
@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
rm -r wezterm-ssh/tests
'';
cargoSha256 = "sha256-iIb2zLUZpn23ooEiOP+yQMYUUmvef/KqvjzgLOFmjs0=";
cargoSha256 = "sha256-YvQ0APyPiYwISE/pDD2s+UgYFj4CKPdolb14FrNpocU=";
nativeBuildInputs = [
pkg-config

@ -10,15 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "git-quickfix";
version = "0.0.5";
version = "0.1.0";
src = fetchFromGitHub {
owner = "siedentop";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg=";
sha256 = "sha256-IAjet/bDG/Hf/whS+yrEQSquj8s5DEmFis+5ysLLuxs=";
};
doCheck = false;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
Security
@ -26,7 +28,7 @@ rustPlatform.buildRustPackage rec {
libiconv
];
cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE=";
cargoSha256 = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI=";
meta = with lib; {
description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch";

@ -0,0 +1,69 @@
From 7d833508e3bc4c737834e9edf1c429d36f67a38c Mon Sep 17 00:00:00 2001
From: "M. A" <mak@nyantec.com>
Date: Sat, 25 Jun 2022 13:34:42 +0000
Subject: [PATCH] Remove geo from database.yml
---
config/database.yml.postgresql | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index 5329a8e9fd7..a4daab1fd0c 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -18,13 +18,6 @@ production:
# port: 8600
# record: secondary.postgresql.service.consul
# interval: 300
- geo:
- adapter: postgresql
- encoding: unicode
- database: gitlabhq_geo_production
- username: git
- password: "secure password"
- host: localhost
#
# Development specific
@@ -39,13 +32,6 @@ development:
host: localhost
variables:
statement_timeout: 15s
- geo:
- adapter: postgresql
- encoding: unicode
- database: gitlabhq_geo_development
- username: postgres
- password: "secure password"
- host: localhost
#
# Staging specific
@@ -58,13 +44,6 @@ staging:
username: git
password: "secure password"
host: localhost
- geo:
- adapter: postgresql
- encoding: unicode
- database: gitlabhq_geo_staging
- username: git
- password: "secure password"
- host: localhost
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
@@ -80,10 +59,3 @@ test: &test
prepared_statements: false
variables:
statement_timeout: 15s
- geo:
- adapter: postgresql
- encoding: unicode
- database: gitlabhq_geo_test
- username: postgres
- password:
- host: localhost
--
2.36.0

@ -1,14 +1,14 @@
{
"version": "15.0.2",
"repo_hash": "sha256-B5zD8yBY6d+jkIghuxShsR73+2X7Jd9mai1ouraEM44=",
"yarn_hash": "1a8k3x3b9sirzicqkwmr10m27n593iljfh8awdc9700akbj155lr",
"version": "15.1.0",
"repo_hash": "sha256-vOPI9kxdJlQNmI/DZueFcbvZPy2/0d+2CYM/RBAkIcU=",
"yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.0.2-ee",
"rev": "v15.1.0-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.0.2",
"GITLAB_PAGES_VERSION": "1.58.0",
"GITLAB_SHELL_VERSION": "14.3.0",
"GITLAB_WORKHORSE_VERSION": "15.0.2"
"GITALY_SERVER_VERSION": "15.1.0",
"GITLAB_PAGES_VERSION": "1.59.0",
"GITLAB_SHELL_VERSION": "14.7.4",
"GITLAB_WORKHORSE_VERSION": "15.1.0"
}
}

@ -59,9 +59,17 @@ let
nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ];
# Since version 12.6.0, the rake tasks need the location of git,
# so we have to apply the location patches here too.
patches = [ ./remove-hardcoded-locations.patch ];
patches = [
# Since version 12.6.0, the rake tasks need the location of git,
# so we have to apply the location patches here too.
./remove-hardcoded-locations.patch
# Gitlab edited the default database config since [1] and the
# installer complains about valid keywords only being "main" and "ci".
#
# [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028
./Remove-geo-from-database.yml.patch
];
# One of the patches uses this variable - if it's unset, execution
# of rake tasks fails.
GITLAB_LOG_PATH = "log";

@ -115,7 +115,7 @@ GEM
minitest (5.15.0)
msgpack (1.3.3)
multipart-post (2.1.1)
nokogiri (1.13.3)
nokogiri (1.13.6)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.20.0)
@ -249,4 +249,4 @@ DEPENDENCIES
timecop
BUNDLED WITH
2.1.4
2.3.15

@ -11,8 +11,8 @@ let
gemdir = ./.;
};
version = "15.0.2";
package_version = "v14";
version = "15.1.0";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
in
@ -24,10 +24,10 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-jwPXar16FOq0xCg3xUXH72YPmoVa91ae3bgz95ZmYo4=";
sha256 = "sha256-rhMQRskum4c5bQL1sE7O4gMxIGX7q3bntuV1HkttA8M=";
};
vendorSha256 = "sha256-/tHKWo09ZV31TSIqlOk36V3y7gNikziUJHf+nS1gHEw=";
vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww=";
passthru = {
inherit rubyEnv;

@ -493,10 +493,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi";
type = "gem";
};
version = "1.13.3";
version = "1.13.6";
};
octokit = {
dependencies = ["faraday" "sawyer"];

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.3.0";
version = "14.7.4";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-SFoNtWcY0iJREsA+vZRsVJHmNb2vNvOiBJnochxA/Us=";
sha256 = "sha256-kLIjlMwoK1AlhvP38OspXnIWbdOcaLl4r05PiUmqnWw=";
};
buildInputs = [ ruby ];
patches = [ ./remove-hardcoded-locations.patch ];
vendorSha256 = "sha256-eSzJon8o7ktV3rFuTE1A4tzdkBzWBZf1JxnrcMj5s00=";
vendorSha256 = "sha256-f2IkdkTZhve/cYKSH+N2Y5bXFSHuQ8t4hjfReyKTPUU=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.0.2";
version = "15.1.0";
src = fetchFromGitLab {
owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-7hNwBCDMdiiOliZa/lkYLo8gyAksAU0HanCSyaAMYLs=";
vendorSha256 = "sha256-cF2wVii/uBqlUQvrbDyPlv4tnfKA45deb/sE0c9U7Tk=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

@ -4,7 +4,7 @@ source 'https://rubygems.org'
gem 'rails', '~> 6.1.4.7'
gem 'bootsnap', '~> 1.9.4', require: false
gem 'bootsnap', '~> 1.12.0', require: false
# Responders respond_to and respond_with
gem 'responders', '~> 3.0'
@ -17,7 +17,7 @@ gem 'view_component', '~> 2.50.0'
gem 'default_value_for', '~> 3.4.0'
# Supported DBs
gem 'pg', '~> 1.1'
gem 'pg', '~> 1.3.0'
gem 'rugged', '~> 1.2'
gem 'grape-path-helpers', '~> 1.7.0'
@ -55,7 +55,7 @@ gem 'omniauth-authentiq', '~> 0.3.3'
gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect'
gem 'omniauth-salesforce', '~> 1.0.5'
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.16.0'
gem 'rack-oauth2', '~> 1.19.0'
gem 'jwt', '~> 2.1.0'
# Kerberos authentication. EE-only
@ -97,10 +97,10 @@ gem 'net-ldap', '~> 0.16.3'
# API
gem 'grape', '~> 1.5.2'
gem 'grape-entity', '~> 0.10.0'
gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
gem 'rack-cors', '~> 1.1.0', require: 'rack/cors'
# GraphQL API
gem 'graphql', '~> 1.11.10'
gem 'graphql', '~> 1.13.12'
gem 'graphiql-rails', '~> 1.8'
gem 'apollo_upload_server', '~> 2.1.0'
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
@ -121,7 +121,7 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick', '~> 4.10.1'
# for backups
gem 'fog-aws', '~> 3.12'
gem 'fog-aws', '~> 3.14'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0'
@ -130,7 +130,7 @@ gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm'
gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm'
# for Google storage
gem 'google-api-client', '~> 0.33'
@ -167,10 +167,10 @@ gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
gem 'asciidoctor-kroki', '~> 0.5.0', require: false
gem 'rouge', '~> 3.27.0'
gem 'rouge', '~> 3.29.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.12'
gem 'nokogiri', '~> 1.13.6'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@ -181,9 +181,9 @@ gem 'diffy', '~> 3.3'
gem 'diff_match_patch', '~> 0.1.0'
# Application server
gem 'rack', '~> 2.2.3'
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
gem 'rack', '~> 2.2.3.0'
# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base'
group :puma do
gem 'puma', '~> 5.6.2', require: false
@ -219,7 +219,7 @@ gem 'ruby-progressbar', '~> 1.10'
gem 'settingslogic', '~> 2.0.9'
# Linear-time regex library for untrusted regular expressions
gem 're2', '~> 1.2.0'
gem 're2', '~> 1.4.0'
# Misc
@ -301,7 +301,7 @@ gem 'base32', '~> 0.3.0'
gem 'gitlab-license', '~> 2.1.0'
# Protect against bruteforcing
gem 'rack-attack', '~> 6.3.0'
gem 'rack-attack', '~> 6.6.0'
# Sentry integration
gem 'sentry-raven', '~> 3.1'
@ -311,12 +311,12 @@ gem 'sentry-sidekiq', '~> 5.1.1'
# PostgreSQL query parsing
#
gem 'pg_query', '~> 2.1'
gem 'pg_query', '~> 2.1.0'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.22.0'
gem 'gitlab-labkit', '~> 0.23.0'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0'
@ -344,7 +344,7 @@ gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client'
gem 'warning', '~> 1.2.0'
group :development do
gem 'lefthook', '~> 0.7.0', require: false
gem 'lefthook', '~> 0.8.0', require: false
gem 'rubocop'
gem 'solargraph', '~> 0.44.3', require: false
@ -381,7 +381,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 7.0.0', require: false
gem 'gitlab-styles', '~> 7.1.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -402,10 +402,12 @@ group :development, :test do
gem 'test_file_finder', '~> 0.1.3'
gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup'
gem 'pact', '~> 1.12'
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 3.0', require: false
gem 'gitlab-dangerfiles', '~> 3.4.0', require: false
end
group :development, :test, :coverage do
@ -477,13 +479,13 @@ gem 'sys-filesystem', '~> 1.4.3'
gem 'net-ntp'
# SSH keys support
gem 'ssh_data', '~> 1.2'
gem 'ssh_data', '~> 1.3'
# Spamcheck GRPC protocol definitions
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 14.10.0-rc1'
gem 'gitaly', '~> 15.1.0-rc1'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
@ -503,7 +505,7 @@ gem 'gitlab-experiment', '~> 0.7.1'
# Structured logging
gem 'lograge', '~> 0.5'
gem 'grape_logging', '~> 1.7'
gem 'grape_logging', '~> 1.8'
# DNS Lookup
gem 'gitlab-net-dns', '~> 0.9.1'
@ -545,3 +547,5 @@ gem 'ipaddress', '~> 0.8.3'
gem 'parslet', '~> 1.8'
gem 'ipynbdiff', '0.4.7'
gem 'ed25519', '~> 1.3.0'

@ -143,8 +143,8 @@ GEM
rack (>= 0.9.0)
bindata (2.4.10)
binding_ninja (0.2.3)
bootsnap (1.9.4)
msgpack (~> 1.0)
bootsnap (1.12.0)
msgpack (~> 1.2)
bootstrap_form (4.2.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
@ -214,10 +214,10 @@ GEM
creole (0.5.0)
crystalball (0.7.0)
git
css_parser (1.7.0)
css_parser (1.11.0)
addressable
daemons (1.3.1)
danger (8.5.0)
danger (8.6.1)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
@ -306,6 +306,7 @@ GEM
e2mmap (0.1.0)
ecma-re-validator (0.3.0)
regexp_parser (~> 2.0)
ed25519 (1.3.0)
elasticsearch (7.13.3)
elasticsearch-api (= 7.13.3)
elasticsearch-transport (= 7.13.3)
@ -360,7 +361,7 @@ GEM
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-http-cache (2.2.0)
faraday-http-cache (2.4.0)
faraday (>= 0.8)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
@ -387,6 +388,8 @@ GEM
rake
ffi-yajl (2.3.4)
libyajl2 (~> 1.2)
filelock (1.1.1)
find_a_port (1.0.1)
flipper (0.21.0)
flipper-active_record (0.21.0)
activerecord (>= 5.0, < 7)
@ -402,11 +405,10 @@ GEM
fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
fog-aws (3.12.0)
fog-aws (3.14.0)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-core (2.1.0)
builder
excon (~> 0.58)
@ -458,7 +460,7 @@ GEM
rails (>= 3.2.0)
git (1.7.0)
rchardet (~> 1.8)
gitaly (14.10.0.pre.rc1)
gitaly (15.1.0.pre.rc1)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab (4.16.1)
@ -466,21 +468,21 @@ GEM
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (3.0.0)
gitlab-dangerfiles (3.4.0)
danger (>= 8.4.5)
danger-gitlab (>= 8.0.0)
rake
gitlab-experiment (0.7.1)
activesupport (>= 3.0)
request_store (>= 1.0)
gitlab-fog-azure-rm (1.2.0)
gitlab-fog-azure-rm (1.3.0)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
fog-core (= 2.1.0)
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.22.0)
gitlab-labkit (0.23.0)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
grpc (>= 1.37)
@ -505,7 +507,7 @@ GEM
openid_connect (~> 1.2)
gitlab-sidekiq-fetcher (0.8.0)
sidekiq (~> 6.1)
gitlab-styles (7.0.0)
gitlab-styles (7.1.0)
rubocop (~> 0.91, >= 0.91.1)
rubocop-gitlab-security (~> 0.1.1)
rubocop-graphql (~> 0.10)
@ -564,7 +566,7 @@ GEM
grape (~> 1.3)
rake (> 12)
ruby2_keywords (~> 0.0.2)
grape_logging (1.8.3)
grape_logging (1.8.4)
grape
rack
graphiql-rails (1.8.0)
@ -574,7 +576,7 @@ GEM
faraday (>= 1.0)
faraday_middleware
graphql-client
graphql (1.11.10)
graphql (1.13.12)
graphql-client (0.17.0)
activesupport (>= 3.0)
graphql (~> 1.10)
@ -715,7 +717,7 @@ GEM
rest-client (~> 2.0)
launchy (2.5.0)
addressable (~> 2.7)
lefthook (0.7.5)
lefthook (0.8.0)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (2.0.0)
@ -777,7 +779,7 @@ GEM
faraday (>= 0.9, < 2.0.0)
faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.7.6)
msgpack (1.5.1)
msgpack (1.5.2)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
@ -798,7 +800,7 @@ GEM
netrc (0.11.0)
nio4r (2.5.8)
no_proxy_fix (0.1.2)
nokogiri (1.13.3)
nokogiri (1.13.6)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
notiffany (0.1.3)
@ -852,8 +854,8 @@ GEM
addressable (~> 2.3)
nokogiri (~> 1.7, >= 1.7.1)
omniauth (~> 1.2)
omniauth-dingtalk-oauth2 (1.0.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-dingtalk-oauth2 (1.0.1)
omniauth-oauth2 (~> 1.7)
omniauth-facebook (4.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.4.0)
@ -908,22 +910,45 @@ GEM
rubypants (~> 0.2)
orm_adapter (0.5.0)
os (1.1.1)
parallel (1.20.1)
parser (3.0.3.2)
pact (1.59.0)
pact-mock_service (~> 3.0, >= 3.3.1)
pact-support (~> 1.15)
rack-test (>= 0.6.3, < 2.0.0)
rspec (~> 3.0)
term-ansicolor (~> 1.0)
thor (>= 0.20, < 2.0)
webrick (~> 1.3)
pact-mock_service (3.6.2)
filelock (~> 1.1)
find_a_port (~> 1.0.1)
json
pact-support (~> 1.12, >= 1.12.0)
rack (~> 2.0)
rspec (>= 2.14)
term-ansicolor (~> 1.0)
thor (>= 0.19, < 2.0)
webrick (~> 1.3)
pact-support (1.15.1)
awesome_print (~> 1.1)
randexp (~> 0.1.7)
rspec (>= 2.14)
term-ansicolor (~> 1.0)
parallel (1.22.1)
parser (3.1.2.0)
ast (~> 2.4.1)
parslet (1.8.2)
pastel (0.8.0)
tty-color (~> 0.5)
peek (1.1.0)
railties (>= 4.0.0)
pg (1.2.3)
pg_query (2.1.1)
google-protobuf (>= 3.17.1)
pg (1.3.5)
pg_query (2.1.3)
google-protobuf (>= 3.19.2)
plist (3.6.0)
png_quantizator (0.2.1)
po_to_json (1.0.1)
json (>= 1.6.0)
premailer (1.11.1)
premailer (1.16.0)
addressable
css_parser (>= 1.6.0)
htmlentities (>= 4.0.0)
@ -947,7 +972,7 @@ GEM
pry (~> 0.13.0)
tty-markdown
tty-prompt
public_suffix (4.0.6)
public_suffix (4.0.7)
puma (5.6.2)
nio4r (~> 2.0)
puma_worker_killer (0.3.1)
@ -956,14 +981,14 @@ GEM
pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6)
racc (1.6.0)
rack (2.2.3)
rack (2.2.3.1)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (6.3.0)
rack-attack (6.6.1)
rack (>= 1.0, < 3)
rack-cors (1.0.6)
rack (>= 1.6.0)
rack-oauth2 (1.16.0)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-oauth2 (1.19.0)
activesupport
attr_required
httpclient
@ -973,7 +998,7 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.5.2)
rack-timeout (0.6.0)
rails (6.1.4.7)
actioncable (= 6.1.4.7)
actionmailbox (= 6.1.4.7)
@ -1007,8 +1032,9 @@ GEM
method_source
rake (>= 0.13)
thor (~> 1.0)
rainbow (3.0.0)
rainbow (3.1.1)
rake (13.0.6)
randexp (0.1.7)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
@ -1019,7 +1045,7 @@ GEM
rbtree (0.4.4)
rchardet (1.8.0)
rdoc (6.3.2)
re2 (1.2.0)
re2 (1.4.0)
recaptcha (4.13.1)
json
recursive-open-struct (1.1.3)
@ -1035,7 +1061,7 @@ GEM
redis-store (>= 1.2, < 2)
redis-store (1.9.0)
redis (>= 4, < 5)
regexp_parser (2.2.1)
regexp_parser (2.5.0)
regexp_property_values (1.0.0)
representable (3.0.4)
declarative (< 0.1.0)
@ -1057,7 +1083,7 @@ GEM
rexml (3.2.5)
rinku (2.0.0)
rotp (6.2.0)
rouge (3.27.0)
rouge (3.29.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@ -1112,11 +1138,11 @@ GEM
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
rubocop-ast (1.18.0)
parser (>= 3.1.1.0)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
rubocop-graphql (0.13.0)
rubocop-graphql (0.14.3)
rubocop (>= 0.87, < 2)
rubocop-performance (1.9.2)
rubocop (>= 0.90.0, < 2.0)
@ -1253,7 +1279,7 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
ssh_data (1.2.0)
ssh_data (1.3.0)
ssrf_filter (1.0.7)
stackprof (0.2.15)
state_machines (0.5.0)
@ -1272,11 +1298,14 @@ GEM
activesupport (>= 3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
sync (0.5.0)
sys-filesystem (1.4.3)
ffi (~> 1.1)
sysexits (1.2.0)
tanuki_emoji (0.6.0)
temple (0.8.2)
term-ansicolor (1.7.1)
tins (~> 1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
terser (1.0.2)
@ -1295,6 +1324,8 @@ GEM
timecop (0.9.1)
timeliness (0.3.10)
timfel-krb5-auth (0.8.3)
tins (1.31.0)
sync
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
@ -1341,7 +1372,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.8)
unicode-display_width (1.7.0)
unicode-display_width (1.8.0)
unicode_utils (1.4.0)
uniform_notifier (1.13.0)
unleash (3.2.2)
@ -1403,7 +1434,7 @@ GEM
nokogiri (~> 1.8)
yajl-ruby (1.4.1)
yard (0.9.26)
zeitwerk (2.5.4)
zeitwerk (2.6.0)
PLATFORMS
ruby
@ -1435,7 +1466,7 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
benchmark-memory (~> 0.1)
better_errors (~> 2.9.0)
bootsnap (~> 1.9.4)
bootsnap (~> 1.12.0)
bootstrap_form (~> 4.2.0)
browser (~> 4.2)
bullet (~> 6.1.3)
@ -1464,6 +1495,7 @@ DEPENDENCIES
discordrb-webhooks (~> 3.4)
doorkeeper (~> 5.5.0.rc2)
doorkeeper-openid_connect (~> 1.7.5)
ed25519 (~> 1.3.0)
elasticsearch-api (= 7.13.3)
elasticsearch-model (~> 7.2)
elasticsearch-rails (~> 7.2)
@ -1481,7 +1513,7 @@ DEPENDENCIES
flipper-active_support_cache_store (~> 0.21.0)
flowdock (~> 0.7)
fog-aliyun (~> 0.3)
fog-aws (~> 3.12)
fog-aws (~> 3.14)
fog-core (= 2.1.0)
fog-google (~> 1.15)
fog-local (~> 0.6)
@ -1492,13 +1524,13 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 14.10.0.pre.rc1)
gitaly (~> 15.1.0.pre.rc1)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 3.0)
gitlab-dangerfiles (~> 3.4.0)
gitlab-experiment (~> 0.7.1)
gitlab-fog-azure-rm (~> 1.2.0)
gitlab-labkit (~> 0.22.0)
gitlab-fog-azure-rm (~> 1.3.0)
gitlab-labkit (~> 0.23.0)
gitlab-license (~> 2.1.0)
gitlab-license_finder (~> 6.0)
gitlab-mail_room (~> 0.0.9)
@ -1506,7 +1538,7 @@ DEPENDENCIES
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.9.0)
gitlab-sidekiq-fetcher (= 0.8.0)
gitlab-styles (~> 7.0.0)
gitlab-styles (~> 7.1.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.4.0)
@ -1516,10 +1548,10 @@ DEPENDENCIES
grape (~> 1.5.2)
grape-entity (~> 0.10.0)
grape-path-helpers (~> 1.7.0)
grape_logging (~> 1.7)
grape_logging (~> 1.8)
graphiql-rails (~> 1.8)
graphlient (~> 0.5.0)
graphql (~> 1.11.10)
graphql (~> 1.13.12)
graphql-docs (~> 1.6.0)
grpc (~> 1.42.0)
gssapi
@ -1547,7 +1579,7 @@ DEPENDENCIES
knapsack (~> 1.21.1)
kramdown (~> 2.3.1)
kubeclient (~> 4.9.2)
lefthook (~> 0.7.0)
lefthook (~> 0.8.0)
letter_opener_web (~> 2.0.0)
licensee (~> 9.14.1)
lockbox (~> 0.6.2)
@ -1563,7 +1595,7 @@ DEPENDENCIES
multi_json (~> 1.14.1)
net-ldap (~> 0.16.3)
net-ntp
nokogiri (~> 1.12)
nokogiri (~> 1.13.6)
oauth2 (~> 1.4)
octokit (~> 4.15)
ohai (~> 16.10)
@ -1588,11 +1620,12 @@ DEPENDENCIES
omniauth-twitter (~> 1.4)
omniauth_crowd (~> 2.4.0)
org-ruby (~> 0.9.12)
pact (~> 1.12)
parallel (~> 1.19)
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.1)
pg_query (~> 2.1)
pg (~> 1.3.0)
pg_query (~> 2.1.0)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.15.0)
@ -1601,19 +1634,19 @@ DEPENDENCIES
pry-shell (~> 0.5.0)
puma (~> 5.6.2)
puma_worker_killer (~> 0.3.1)
rack (~> 2.2.3)
rack-attack (~> 6.3.0)
rack-cors (~> 1.0.6)
rack-oauth2 (~> 1.16.0)
rack (~> 2.2.3.0)
rack-attack (~> 6.6.0)
rack-cors (~> 1.1.0)
rack-oauth2 (~> 1.19.0)
rack-proxy (~> 0.7.2)
rack-timeout (~> 0.5.1)
rack-timeout (~> 0.6.0)
rails (~> 6.1.4.7)
rails-controller-testing
rails-i18n (~> 6.0)
rainbow (~> 3.0)
rbtrace (~> 0.4)
rdoc (~> 6.3.2)
re2 (~> 1.2.0)
re2 (~> 1.4.0)
recaptcha (~> 4.11)
redis (~> 4.4.0)
redis-actionpack (~> 5.2.0)
@ -1622,7 +1655,7 @@ DEPENDENCIES
responders (~> 3.0)
retriable (~> 3.1.2)
rexml (~> 3.2.5)
rouge (~> 3.27.0)
rouge (~> 3.29.0)
rqrcode-rails3 (~> 0.1.7)
rspec-benchmark (~> 0.6.0)
rspec-parameterized
@ -1665,7 +1698,7 @@ DEPENDENCIES
spring-commands-rspec (~> 1.0.4)
sprite-factory (~> 1.7)
sprockets (~> 3.7.0)
ssh_data (~> 1.2)
ssh_data (~> 1.3)
stackprof (~> 0.2.15)
state_machines-activerecord (~> 0.8.0)
sys-filesystem (~> 1.4.3)

@ -577,10 +577,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19i4x2nascd74ahcvmrsnf03cygh1y4c9yf8rcv91fv0mcxpvb9n";
sha256 = "0yza43f42v0ys81y6jzbqfkdykf40h6l3yyvadwq32fswrbpwvbc";
type = "gem";
};
version = "1.9.4";
version = "1.12.0";
};
bootstrap_form = {
dependencies = ["actionpack" "activemodel"];
@ -930,10 +930,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an";
type = "gem";
};
version = "1.7.0";
version = "1.11.0";
};
daemons = {
groups = ["default" "development"];
@ -951,10 +951,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xmckbl41v27x9ri6snrl01alsbwxcqsfc4a1nfhgx0py6y0dmjg";
sha256 = "1n6zbkkinlv2hp4ig5c170d1ckbbdf8rgxmykfm3m3gn865vapnr";
type = "gem";
};
version = "8.5.0";
version = "8.6.1";
};
danger-gitlab = {
dependencies = ["danger" "gitlab"];
@ -1283,6 +1283,16 @@
};
version = "0.3.0";
};
ed25519 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
type = "gem";
};
version = "1.3.0";
};
elasticsearch = {
dependencies = ["elasticsearch-api" "elasticsearch-transport"];
groups = ["default"];
@ -1537,14 +1547,14 @@
};
faraday-http-cache = {
dependencies = ["faraday"];
groups = ["default" "development"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7";
sha256 = "143cpzdrnyqyfv1jasr0qjqgm57dhv46nsf5f2s06ndxccfr13rq";
type = "gem";
};
version = "2.2.0";
version = "2.4.0";
};
faraday-httpclient = {
groups = ["danger" "default" "development" "test"];
@ -1712,6 +1722,26 @@
};
version = "2.3.4";
};
filelock = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "085vrb6wf243iqqnrrccwhjd4chphfdsybkvjbapa2ipfj1ja1sj";
type = "gem";
};
version = "1.1.1";
};
find_a_port = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sswgpvn38yav4i21adrr7yy8c8299d7rj065gd3iwg6nn26lpb0";
type = "gem";
};
version = "1.0.1";
};
flipper = {
groups = ["default"];
platforms = [];
@ -1767,15 +1797,15 @@
version = "0.3.3";
};
fog-aws = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
dependencies = ["fog-core" "fog-json" "fog-xml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cl9b93mwhzm9fp0lmac1vzz359g3sq52k06kn0a0vnvxrxnhzjm";
sha256 = "1gsb26a1jp0k7hclry0dai2a9m77a9h6ybc17x0i98z2ivzjsi07";
type = "gem";
};
version = "3.12.0";
version = "3.14.0";
};
fog-core = {
dependencies = ["builder" "excon" "formatador" "mime-types"];
@ -1967,10 +1997,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ls4x3h1c3axx9kqmvs1mpcmjqchl297sh1bzzl5zjgdz25w24di";
sha256 = "0ygf5di1sl8b3gs7ascn3r9carf6v8d9c3damc10sh81sm7bwc0z";
type = "gem";
};
version = "14.10.0.pre.rc1";
version = "15.1.0.pre.rc1";
};
github-markup = {
groups = ["default"];
@ -2010,10 +2040,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kyp5kxp0jsk224y2nq4yg37wnn824ialdjvsf8fv3a20q9w4k7i";
sha256 = "13c7k36xq042fbf7d9jwgfc30zq9dfziwvqfi88h2199v9dkylix";
type = "gem";
};
version = "3.0.0";
version = "3.4.0";
};
gitlab-experiment = {
dependencies = ["activesupport" "request_store"];
@ -2032,10 +2062,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hi9v0zy863gnk17w0fp1ks2kr1s2z6q0bkx5wdbq6yawycjs94h";
sha256 = "1d8plrl69q5mcsgz8ywhw7k9q0g31y3gm6h90gw9apsisqbm7vrg";
type = "gem";
};
version = "1.2.0";
version = "1.3.0";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
@ -2043,10 +2073,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vs5q1lfk5i953gv2xvz6h5x6ycllr8hdzg81zsrz7hy3aygxknj";
sha256 = "0kiz2m3dw6ld2z6dsl8jh2ycw061wv8wiy34flymb5zqjiyyzw8l";
type = "gem";
};
version = "0.22.0";
version = "0.23.0";
};
gitlab-license = {
groups = ["default"];
@ -2127,10 +2157,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10fmvx2vx2v0mbwv5d4wcpc2iyp5y8lwxn9hjpzkk5bvxkk4c493";
sha256 = "0xp2f1bbx8i7a89xjwy6b5rhxr9g1vnms68chcnxdd95csxhxpzp";
type = "gem";
};
version = "7.0.0";
version = "7.1.0";
};
gitlab_chronic_duration = {
dependencies = ["numerizer"];
@ -2280,10 +2310,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x6cmmj0wi1m689r8d4yhyhpl8dwj5skn8b29igm4xvw3swkg94x";
sha256 = "1lcjqwal3wc2r41wsi01d09cyhxhglxp6y7hd0564pdx5lr3xk7g";
type = "gem";
};
version = "1.8.3";
version = "1.8.4";
};
graphiql-rails = {
dependencies = ["railties" "sprockets-rails"];
@ -2312,10 +2342,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qb6bk8gflwid4qrk2i9ndzs5fxycdjvxmhy9w547lglzb5jx19b";
sha256 = "1hvsv6ig6d8syr4vasa8vcc090kbawwflk5m1j6kl681y9n6d0hx";
type = "gem";
};
version = "1.11.10";
version = "1.13.12";
};
graphql-client = {
dependencies = ["activesupport" "graphql"];
@ -2899,10 +2929,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07r76qlzxcz9y4dmkqf8k4khkfq7s2v22dcq6b0w0v4cfiwqva3h";
sha256 = "05ykgpj6cka9vprvrk37ixyhj2pdw7a9m6bq645yai6ihghahlf0";
type = "gem";
};
version = "0.7.5";
version = "0.8.0";
};
letter_opener = {
dependencies = ["launchy"];
@ -3226,10 +3256,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw";
sha256 = "1hpj9mm31a5aw5qys2kglfl8jv74bkwkc5pfrpp3als89hgkznqy";
type = "gem";
};
version = "1.5.1";
version = "1.5.2";
};
multi_json = {
groups = ["default"];
@ -3401,10 +3431,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi";
type = "gem";
};
version = "1.13.3";
version = "1.13.6";
};
notiffany = {
dependencies = ["nenv" "shellany"];
@ -3574,10 +3604,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sflfy1jvn9wqpral7gcfmbys7msvykp6rlnl33r8qgnbksn54y8";
sha256 = "16qkd51f1ab1hw4az27qj3vk958aal67by8djsplwd1q3h7nfib5";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
omniauth-facebook = {
dependencies = ["omniauth-oauth2"];
@ -3803,15 +3833,48 @@
};
version = "1.1.1";
};
pact = {
dependencies = ["pact-mock_service" "pact-support" "rack-test" "rspec" "term-ansicolor" "thor" "webrick"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ngwc4zrp6jxpb8s0y07xxic492a1n0akjxd7x4hks2fbsiwwwk2";
type = "gem";
};
version = "1.59.0";
};
pact-mock_service = {
dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0izmf5h0n1mcrfk6qlz61rhzdjs6h0bkqrx6ndp8nhmfhja254fc";
type = "gem";
};
version = "3.6.2";
};
pact-support = {
dependencies = ["awesome_print" "randexp" "rspec" "term-ansicolor"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07qxvxy48im9vlswqspsh2k6fy6rsmi3409863ww8y7yx5pmjr63";
type = "gem";
};
version = "1.15.1";
};
parallel = {
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
type = "gem";
};
version = "1.20.1";
version = "1.22.1";
};
parser = {
dependencies = ["ast"];
@ -3819,10 +3882,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di";
sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";
type = "gem";
};
version = "3.0.3.2";
version = "3.1.2.0";
};
parslet = {
groups = ["default" "development" "test"];
@ -3861,10 +3924,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6";
type = "gem";
};
version = "1.2.3";
version = "1.3.5";
};
pg_query = {
dependencies = ["google-protobuf"];
@ -3872,10 +3935,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r";
sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk";
type = "gem";
};
version = "2.1.1";
version = "2.1.3";
};
plist = {
groups = ["default"];
@ -3914,10 +3977,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xrhmialxn5vlp1nmf40a4db9gji4h2wbzd7f43sz64z8lvrjj6h";
sha256 = "11j7d6abxivj15yax47z3f751wz4pnl02qszzc9swswf8hn41r03";
type = "gem";
};
version = "1.11.1";
version = "1.16.0";
};
premailer-rails = {
dependencies = ["actionmailer" "premailer"];
@ -4000,14 +4063,14 @@
version = "0.5.0";
};
public_suffix = {
groups = ["default" "development" "test"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
version = "4.0.6";
version = "4.0.7";
};
puma = {
dependencies = ["nio4r"];
@ -4062,14 +4125,14 @@
version = "1.6.0";
};
rack = {
groups = ["default" "development" "kerberos" "test"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc";
type = "gem";
};
version = "2.2.3";
version = "2.2.3.1";
};
rack-accept = {
dependencies = ["rack"];
@ -4088,10 +4151,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15b8lk54j2abqhpn588b1wvbzwmxwa7iql6241kxpjc0gyb51p0z";
sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq";
type = "gem";
};
version = "6.3.0";
version = "6.6.1";
};
rack-cors = {
dependencies = ["rack"];
@ -4099,10 +4162,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07dppmm1ah1gs31sb5byrkkady9vqzwjmpd92c8425nc6yzwknik";
sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7";
type = "gem";
};
version = "1.0.6";
version = "1.1.1";
};
rack-oauth2 = {
dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
@ -4110,10 +4173,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k";
sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw";
type = "gem";
};
version = "1.16.0";
version = "1.19.0";
};
rack-proxy = {
dependencies = ["rack"];
@ -4142,10 +4205,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d4dgbf8rgqx03lwsm8j6i20lzawk1bsvzfj5bhzrsycfyfk25aj";
sha256 = "16ahj3qz3xhfrwvqb4nf6cfzvliigg0idfsp5jyr8qwk676d2f30";
type = "gem";
};
version = "0.5.2";
version = "0.6.0";
};
rails = {
dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
@ -4214,14 +4277,14 @@
version = "6.1.4.7";
};
rainbow = {
groups = ["default" "development" "test"];
groups = ["coverage" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem";
};
version = "3.0.0";
version = "3.1.1";
};
rake = {
groups = ["default" "development" "test"];
@ -4233,6 +4296,16 @@
};
version = "13.0.6";
};
randexp = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j742j7g107jgkvpsfq2b10d5xhsni5s8vxrp518d3karw7529ih";
type = "gem";
};
version = "0.1.7";
};
rb-fsevent = {
groups = ["default" "development" "test"];
platforms = [];
@ -4300,10 +4373,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16q71cc9wx342c697q18pkz19ym4ncjd97hcw4v6f1mgflkdv400";
sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw";
type = "gem";
};
version = "1.2.0";
version = "1.4.0";
};
recaptcha = {
dependencies = ["json"];
@ -4395,10 +4468,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0";
type = "gem";
};
version = "2.2.1";
version = "2.5.0";
};
regexp_property_values = {
groups = ["default"];
@ -4510,10 +4583,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k";
sha256 = "17dhzc9hfzd8x18hfsvn9rsp4jg18wdfsdy3a5p99y5dhfh1321r";
type = "gem";
};
version = "3.27.0";
version = "3.29.0";
};
rqrcode = {
dependencies = ["chunky_png"];
@ -4674,10 +4747,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78";
sha256 = "1b3p4wy68jkyq8vhm5y568wlhsihy3ilnp2c6ig18xcw1slnkypl";
type = "gem";
};
version = "1.4.1";
version = "1.18.0";
};
rubocop-gitlab-security = {
dependencies = ["rubocop"];
@ -4696,10 +4769,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18md69dkz0s5xm93c4psmvy4c0nx3a7yi61vfjn46cw6yk54fm7b";
sha256 = "1yam7fdm77y0x6b6i7v14iiji9020mvdd9h1ainvv88zbv8yd4wq";
type = "gem";
};
version = "0.13.0";
version = "0.14.3";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@ -5330,10 +5403,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p3vaq2fbmlphphqr0yjc5cyzzxjizq4zbxbbw3j2vpgdcmpi6bs";
sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c";
type = "gem";
};
version = "1.2.0";
version = "1.3.0";
};
ssrf_filter = {
groups = ["default"];
@ -5419,6 +5492,16 @@
};
version = "1.3.0";
};
sync = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6";
type = "gem";
};
version = "0.5.0";
};
sys-filesystem = {
dependencies = ["ffi"];
groups = ["default"];
@ -5460,6 +5543,17 @@
};
version = "0.8.2";
};
term-ansicolor = {
dependencies = ["tins"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj";
type = "gem";
};
version = "1.7.1";
};
terminal-table = {
dependencies = ["unicode-display_width"];
groups = ["default" "development"];
@ -5584,6 +5678,17 @@
};
version = "0.8.3";
};
tins = {
dependencies = ["sync"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "153q7j2nj7y43iscbfcihmwlcydx6sbd65azs27kain0gncymd90";
type = "gem";
};
version = "1.31.0";
};
toml-rb = {
dependencies = ["citrus"];
groups = ["default"];
@ -5776,14 +5881,14 @@
version = "0.0.8";
};
unicode-display_width = {
groups = ["default" "development" "test"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
type = "gem";
};
version = "1.7.0";
version = "1.8.0";
};
unicode_utils = {
groups = ["default"];
@ -6084,9 +6189,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc";
type = "gem";
};
version = "2.5.4";
version = "2.6.0";
};
}

@ -34,6 +34,7 @@
, libmtp
, liboggz
, libopus
, libplacebo
, libpulseaudio
, libraw1394
, librsvg
@ -123,6 +124,7 @@ stdenv.mkDerivation rec {
libmtp
liboggz
libopus
libplacebo
libpulseaudio
libraw1394
librsvg

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.21.10";
version = "0.22.0";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HtPgl52ysE/CVX706YeKBFc6CgGpHzvHwZoS+DzHADY=";
rev = "refs/tags/v${version}";
sha256 = "sha256-9Fp5k14QkV1CwLSL1nUUu6NYIpjfvI9vNJRYNqvyr3M=";
};
cargoSha256 = "sha256-ini0AIYwvTskNFMSC+Gy23ohL75PTET95e1mjpjCsWE=";
cargoSha256 = "sha256-MzosatZ4yPHAdANqOBPVW2wpjnojLo9B9N9o4DtU0Iw=";
nativeBuildInputs = [ pkg-config makeWrapper ];

@ -1,10 +1,11 @@
{ lib, fetchzip }:
let
version = "1.5.2";
version = "1.5.3";
in
fetchzip {
name = "victor-mono-${version}";
stripRoot = false;
# Upstream prefers we download from the website,
# but we really insist on a more versioned resource.
@ -16,12 +17,15 @@ fetchzip {
url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip";
postFetch = ''
mkdir -p $out/share/fonts/
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
mkdir -p "$out/share/fonts/"
mv $out/OTF $out/share/fonts/opentype
mv $out/TTF $out/share/fonts/truetype
rm -r $out/{EOT,WOFF,WOFF2}
'';
sha256 = "sha256-cNDZh0P/enmoKL/6eHzkgl5ghtai2K9cTgWMVmm8GIA=";
sha256 = "sha256-3TGpUDBJ24NEJb00oaJAHEbjC58bSthohzqM1klVDGA=";
meta = with lib; {
description = "Free programming font with cursive italics and ligatures";

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cpp-utilities";
version = "5.15.0";
version = "5.16.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3D/5Bl5vANZrHtJGehoHwQ0mDrL8TJ7iK2GoViiuj6E=";
sha256 = "sha256-B/pWdfK3KddAIppJXQRohiIK8mouAQjXRHic75IzY/Q=";
};
nativeBuildInputs = [ cmake ];

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "doctest";
version = "2.4.8";
version = "2.4.9";
src = fetchFromGitHub {
owner = "doctest";
repo = "doctest";
rev = "v${version}";
sha256 = "sha256-/4lyCQZHsa32ozes5MJ0JZpQ99MECRlgFeSzN/Zs/BQ=";
sha256 = "sha256-ugmkeX2PN4xzxAZpWgswl4zd2u125Q/ADSKzqTfnd94=";
};
nativeBuildInputs = [ cmake ];

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "jarowinkler-cpp";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "jarowinkler-cpp";
rev = "v${version}";
hash = "sha256-3/x0fyaDJTouBKbif0ALgMzht6HMEGHNw8g8zQlUcNk=";
hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw=";
};
nativeBuildInputs = [
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Fast Jaro and Jaro-Winkler distance";
homepage = "https://github.com/maxbachmann/jarowinkler-cpp";
changelog = "https://github.com/maxbachmann/jarowinkler-cpp/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
platforms = lib.platforms.unix;

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "1.3.0";
version = "1.3.1";
pname = "commons-daemon";
src = fetchurl {
url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz";
sha256 = "sha256-Fihsar8HR2adN2f9deo7bk8tRgeiD6BljVZ/mfkLUUA=";
sha256 = "sha256-EaQ4wy32GX1MGByCqo811WblqZgsNSw3psr94lrxEqw=";
};
installPhase = ''

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libkqueue";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "mheily";
repo = "libkqueue";
rev = "v${version}";
sha256 = "sha256-YKKBHOxjUS7+/ib4gcR7EYjjVOwhHVksYasLhErdV8s=";
sha256 = "sha256-5Zds9sqHkFldJf3ThTPOiaGKohmFcIzY0ARDA0iswVk=";
};
nativeBuildInputs = [ cmake ];
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "kqueue(2) compatibility library";
homepage = "https://github.com/mheily/libkqueue";
changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog";
license = licenses.bsd2;
maintainers = [ maintainers.marsam ];
platforms = platforms.linux;

@ -41,7 +41,17 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isWindows [
"--enable-sp-funcs"
"--enable-term-driver"
];
] ++ lib.optionals (stdenv.hostPlatform.isUnix && stdenv.hostPlatform.isStatic) [
# For static binaries, the point is to have a standalone binary with
# minimum dependencies. So here we make sure that binaries using this
# package won't depend on a terminfo database located in the Nix store.
"--with-terminfo-dirs=${lib.concatStringsSep ":" [
"/etc/terminfo" # Debian, Fedora, Gentoo
"/lib/terminfo" # Debian
"/usr/share/terminfo" # upstream default, probably all FHS-based distros
"/run/current-system/sw/share/terminfo" # NixOS
]}"
];
# Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "olm";
version = "3.2.11";
version = "3.2.12";
src = fetchFromGitLab {
domain = "gitlab.matrix.org";
owner = "matrix-org";
repo = pname;
rev = version;
sha256 = "sha256-/ozMvcHDhYruhzp8xfskKOYCbe/vS4pEOPn1+1Pb+Q0=";
sha256 = "sha256-EvqQvg7khsJ2OrcoHBImd9fTgjA65pVRqbJuMV5MG80=";
};
nativeBuildInputs = [ cmake ];

@ -7,24 +7,19 @@
stdenv.mkDerivation rec {
pname = "rapidfuzz-cpp";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "rapidfuzz-cpp";
rev = "v${version}";
hash = "sha256-Tf7nEMXiem21cvQHPnYnCvOOLg0KBBnNQDaYIcHcm2g=";
hash = "sha256-8SJU+ERFRGkbGBmGJa5Ypetc3LPeytg5pR4S29RkvR8=";
};
patches = lib.optionals doCheck [
patches = [
./dont-fetch-project-options.patch
];
postPatch = ''
substituteInPlace test/CMakeLists.txt \
--replace WARNINGS_AS_ERRORS ""
'';
nativeBuildInputs = [
cmake
];
@ -42,6 +37,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance";
homepage = "https://github.com/maxbachmann/rapidfuzz-cpp";
changelog = "https://github.com/maxbachmann/rapidfuzz-cpp/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
platforms = lib.platforms.unix;

@ -5,14 +5,14 @@
}:
stdenv.mkDerivation rec {
version = "20200115";
version = "20200125";
pname = "m4rie";
src = fetchFromBitbucket {
owner = "malb";
repo = "m4rie";
rev = "release-${version}";
sha256 = "0s8if80x5d6mikbcfsbbxg347136spahp9f3x8i1hflbwl8xj9k8";
sha256 = "sha256-bjAcxfXsC6+jPYC472CN78jm4UljJQlkWyvsqckCDh0=";
};
doCheck = true;

@ -148,6 +148,7 @@ stdenv.mkDerivation rec {
install -D d8 $out/bin/d8
install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a
install -D -m644 icudtl.dat $out/share/v8/icudtl.dat
ln -s libv8.a $out/lib/libv8_monolith.a
cp -r ../../include $out
mkdir -p $out/lib/pkgconfig

@ -148,6 +148,7 @@ stdenv.mkDerivation rec {
install -D d8 $out/bin/d8
install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a
install -D -m644 icudtl.dat $out/share/v8/icudtl.dat
ln -s libv8.a $out/lib/libv8_monolith.a
cp -r ../../include $out
mkdir -p $out/lib/pkgconfig

@ -1,22 +1,23 @@
{ lib
, buildDunePackage
, fetchurl
, fetchFromGitHub
, cstruct
, mirage-crypto
, alcotest
}:
buildDunePackage rec {
pname = "pbkdf";
version = "1.1.0";
version = "1.2.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/abeaumont/ocaml-pbkdf/releases/download/${version}/pbkdf-${version}.tbz";
sha256 = "e53ed1bd9abf490c858a341c10fb548bc9ad50d4479acdf95a9358a73d042264";
src = fetchFromGitHub {
owner = "abeaumont";
repo = "ocaml-pbkdf";
rev = version;
sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI=";
};
propagatedBuildInputs = [ mirage-crypto ];
propagatedBuildInputs = [ cstruct mirage-crypto ];
checkInputs = [ alcotest ];
doCheck = true;

@ -47,6 +47,7 @@ buildPythonPackage rec {
"test_schedule_parser_with_a_daily_recurring_enabled_schedule_data"
"test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data"
"test_schedule_parser_with_a_non_recurring_enabled_schedule_data"
"test_hexadecimale_timestamp_to_localtime_with_the_current_timestamp_should_return_a_time_string"
];
pythonImportsCheck = [ "aioswitcher" ];

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "audible";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "mkb79";
repo = "Audible";
rev = "v${version}";
sha256 = "0fsb5av4s7fvpn0iryl8jj3lwffwlxgbwj46l3fidy0l58nq3b1d";
rev = "refs/tags/v${version}";
sha256 = "sha256-SIEDBuMCC/Hap2mGVbKEFic96ClN369SEsV06Sg+poY=";
};
propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ];

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.17.0";
version = "1.18.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "refs/tags/v${version}";
hash = "sha256-EkAtRqUHwmH0LG/bkXBbZ3TMgXDtcqLfUBySPbrgWmc=";
hash = "sha256-yAqGVZnnragi3+jaAGnkYNH/XtpH3bojXHmPCrANgJU=";
};
propagatedBuildInputs = [

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.9.4";
version = "0.9.6";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = "refs/tags/${version}";
hash = "sha256-+K+RffQzbJiKld0AM41OlK0ma0aopJRaTz+ZcCcYzJk=";
hash = "sha256-R7QmxSUbVsvb+MRTYlihxuM05WLYASRSfUs09fl7l1k=";
};
nativeBuildInputs = [

@ -11,12 +11,12 @@
buildPythonApplication rec {
pname = "gdown";
version = "4.4.0";
version = "4.5.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-GPw6TaSiJz3reqKcdIa+TfORnZBBWK1qaj4lyBFUcNc=";
sha256 = "sha256-rJ7CoZDOl+cW1FsPzkE7+AiBSpzDD9J8RkiQW25Xkno=";
};
propagatedBuildInputs = [

@ -3,32 +3,42 @@
, pythonOlder
, fetchFromGitHub
, cmake
, ninja
, cython
, rapidfuzz-capi
, scikit-build
, setuptools
, jarowinkler-cpp
, hypothesis
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jarowinkler";
version = "1.0.2";
version = "1.0.4";
disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "JaroWinkler";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-zVAcV6xxqyfXRUcyWo9PcOdagcexJc/D5k4g5ag3hbY=";
hash = "sha256-2bhKl7l3ByfrtkXnXifQd/AhWVFGSMzULkzJftd1mVE=";
};
nativeBuildInputs = [
cmake
cython
ninja
rapidfuzz-capi
scikit-build
setuptools
];
buildInputs = [
jarowinkler-cpp
];
dontUseCmakeConfigure = true;
@ -48,6 +58,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for fast approximate string matching using Jaro and Jaro-Winkler similarity";
homepage = "https://github.com/maxbachmann/JaroWinkler";
changelog = "https://github.com/maxbachmann/JaroWinkler/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "manuel";
version = "1.11.2";
version = "1.12.4";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-nJt3WMQ66oa3VlW5InJCzOea96Wf7WwxSbBp9WIfzqc=";
sha256 = "sha256-A5Wq32mR+SSseVz61Z2l3AYYcyqMxYrQ9HSWWrco9/Q=";
};
propagatedBuildInputs = [ six ];

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "miniaudio";
version = "1.50";
version = "1.51";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "irmen";
repo = "pyminiaudio";
rev = "refs/tags/v${version}";
sha256 = "sha256-GqpOuL+q5v9sKCpbNpPH4uC7k2HBs0RkTWaIC5A2eHI=";
sha256 = "sha256-nWx/1+b28/pvyTe8jSAOmw+vfzjuD7FFmVVUzH8DAyw=";
};
buildInputs = lib.optionals stdenv.isDarwin [

@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "mitogen";
version = "0.3.2";
version = "0.3.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "mitogen-hq";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ACd1z9h9RLu6Kho59L2YkXkLtBEywYbO+drUvoZaVlg=";
sha256 = "sha256-cx0q2Y9A6UzpdD1kuGBtXIs9oBGFpkIyvPfN2hj+A1g=";
};
# Tests require network access and Docker support

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "param";
version = "1.12.1";
version = "1.12.2";
src = fetchFromGitHub {
owner = "holoviz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MehTz0qCpWe/11PZ5jmFxHE54TA+QX2KfqvKB8L79V4=";
rev = "refs/tags/v${version}";
sha256 = "sha256-NrMsIDcpZc/R2j8VuXitbnIlhP3NtLxU/OkygXqYok8=";
};
checkInputs = [

@ -17,15 +17,15 @@
buildPythonPackage rec {
pname = "pygmt";
version = "0.6.0";
version = "0.6.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "GenericMappingTools";
repo = "pygmt";
rev = "v${version}";
sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ=";
rev = "refs/tags/v${version}";
sha256 = "sha256-/hZUDvMhF/ojTXBcap5lL6X2bYu+opf+TwYNjANgtiw=";
};
postPatch = ''

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-core";
version = "0.6.12";
version = "0.6.13";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.core";
inherit version;
hash = "sha256-uzb8nlAOHNtNq205/sJPoJtvMoo7uCFfrRQas/rv8p8=";
hash = "sha256-In39nxmIjd0TQZZoIv/ViA2548iTdQlkGMZg/00aEdA=";
};
# pyroute2 sub-modules have no tests

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ethtool";
version = "0.6.12";
version = "0.6.13";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ethtool";
inherit version;
hash = "sha256-MwIRm/DezL7yCN682Yckxd23+iri2V6HCokF4G36apU=";
hash = "sha256-Cmh/6g/Nd9kHTHwYujXZufcOQhfr5opofiAECEc6O9Q=";
};
propagatedBuildInputs = [

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipdb";
version = "0.6.12";
version = "0.6.13";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipdb";
inherit version;
hash = "sha256-hKh5SFFMdhECeMyA3Quzqp7h+iQMMmCYBJEuLEq5dVs=";
hash = "sha256-u7u3XRO+luRUnPcOuU/XCy4XNuowGsa2g/VqoazYTVo=";
};
propagatedBuildInputs = [

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipset";
version = "0.6.12";
version = "0.6.13";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipset";
inherit version;
hash = "sha256-nvj7b6HF/XhzqmFg6aOQKMFDEFwAcyOnoJXi/coNvG4=";
hash = "sha256-KKJU9iKhiXbQaDYD1a79pat8hSj6nja+uFvOUgJveGY=";
};
propagatedBuildInputs = [

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save