Merge master into haskell-updates
This commit is contained in:
commit
7bf643e2ce
107 changed files with 1843 additions and 1277 deletions
|
@ -221,6 +221,7 @@ with lib.maintainers; {
|
|||
|
||||
docs = {
|
||||
members = [
|
||||
asymmetric
|
||||
ryantm
|
||||
];
|
||||
scope = "Maintain nixpkgs/NixOS documentation and tools for building it.";
|
||||
|
|
|
@ -22,6 +22,6 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.nitrokey-udev-rules ];
|
||||
services.udev.packages = [ pkgs.libnitrokey ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1063,6 +1063,7 @@
|
|||
./services/search/opensearch.nix
|
||||
./services/search/qdrant.nix
|
||||
./services/security/aesmd.nix
|
||||
./services/security/authelia.nix
|
||||
./services/security/certmgr.nix
|
||||
./services/security/cfssl.nix
|
||||
./services/security/clamav.nix
|
||||
|
@ -1210,7 +1211,6 @@
|
|||
./services/web-apps/zabbix.nix
|
||||
./services/web-servers/agate.nix
|
||||
./services/web-servers/apache-httpd/default.nix
|
||||
./services/web-servers/authelia.nix
|
||||
./services/web-servers/caddy/default.nix
|
||||
./services/web-servers/darkhttpd.nix
|
||||
./services/web-servers/fcgiwrap.nix
|
||||
|
|
|
@ -60,7 +60,7 @@ in {
|
|||
'')
|
||||
(mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] ''
|
||||
Database configuration must be done manually. An exemplary setup is demonstrated in
|
||||
<nixpkgs/nixos/tests/matrix-synapse.nix>
|
||||
<nixpkgs/nixos/tests/matrix/synapse.nix>
|
||||
'')
|
||||
(mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")
|
||||
(mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] ''
|
||||
|
@ -711,7 +711,7 @@ in {
|
|||
|
||||
If you
|
||||
- try to deploy a fresh synapse, you need to configure the database yourself. An example
|
||||
for this can be found in <nixpkgs/nixos/tests/matrix-synapse.nix>
|
||||
for this can be found in <nixpkgs/nixos/tests/matrix/synapse.nix>
|
||||
- update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true`
|
||||
to your configuration.
|
||||
|
||||
|
|
|
@ -171,7 +171,11 @@ in
|
|||
"/ip4/0.0.0.0/tcp/4001"
|
||||
"/ip6/::/tcp/4001"
|
||||
"/ip4/0.0.0.0/udp/4001/quic"
|
||||
"/ip4/0.0.0.0/udp/4001/quic-v1"
|
||||
"/ip4/0.0.0.0/udp/4001/quic-v1/webtransport"
|
||||
"/ip6/::/udp/4001/quic"
|
||||
"/ip6/::/udp/4001/quic-v1"
|
||||
"/ip6/::/udp/4001/quic-v1/webtransport"
|
||||
];
|
||||
description = lib.mdDoc "Where Kubo listens for incoming p2p connections";
|
||||
};
|
||||
|
|
|
@ -184,6 +184,22 @@ in
|
|||
.tar.gz files.
|
||||
'';
|
||||
};
|
||||
environmentFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Environment file (see {manpage}`systemd.exec(5)`
|
||||
"EnvironmentFile=" section for the syntax) which sets config options
|
||||
for mattermost (see [the mattermost documentation](https://docs.mattermost.com/configure/configuration-settings.html#environment-variables)).
|
||||
|
||||
Settings defined in the environment file will overwrite settings
|
||||
set via nix or via the {option}`services.mattermost.extraConfig`
|
||||
option.
|
||||
|
||||
Useful for setting config options without their value ending up in the
|
||||
(world-readable) nix store, e.g. for a database password.
|
||||
'';
|
||||
};
|
||||
|
||||
localDatabaseCreate = mkOption {
|
||||
type = types.bool;
|
||||
|
@ -321,6 +337,7 @@ in
|
|||
Restart = "always";
|
||||
RestartSec = "10";
|
||||
LimitNOFILE = "49152";
|
||||
EnvironmentFile = cfg.environmentFile;
|
||||
};
|
||||
unitConfig.JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
|
||||
};
|
||||
|
|
|
@ -60,7 +60,7 @@ in
|
|||
|
||||
package = mkOption {
|
||||
# TODO: when 23.05 is released and if Garage 0.9 is the default, put a stateVersion check.
|
||||
default = if versionAtLeast stateVersion "23.05" then pkgs.garage_0_8_0
|
||||
default = if versionAtLeast config.system.stateVersion "23.05" then pkgs.garage_0_8
|
||||
else pkgs.garage_0_7;
|
||||
defaultText = literalExpression "pkgs.garage_0_7";
|
||||
type = types.package;
|
||||
|
|
|
@ -1,23 +1,63 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.qtile;
|
||||
pyEnv = pkgs.python3.withPackages (p: [ (cfg.package.unwrapped or cfg.package) ] ++ (cfg.extraPackages p));
|
||||
in
|
||||
|
||||
{
|
||||
options.services.xserver.windowManager.qtile = {
|
||||
enable = mkEnableOption (lib.mdDoc "qtile");
|
||||
|
||||
package = mkPackageOptionMD pkgs "qtile" { };
|
||||
package = mkPackageOptionMD pkgs "qtile-unwrapped" { };
|
||||
|
||||
configFile = mkOption {
|
||||
type = with types; nullOr path;
|
||||
default = null;
|
||||
example = literalExpression "./your_config.py";
|
||||
description = lib.mdDoc ''
|
||||
Path to the qtile configuration file.
|
||||
If null, $XDG_CONFIG_HOME/qtile/config.py will be used.
|
||||
'';
|
||||
};
|
||||
|
||||
backend = mkOption {
|
||||
type = types.enum [ "x11" "wayland" ];
|
||||
default = "x11";
|
||||
description = lib.mdDoc ''
|
||||
Backend to use in qtile:
|
||||
<option>x11</option> or <option>wayland</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = _: [];
|
||||
defaultText = literalExpression ''
|
||||
python3Packages: with python3Packages; [];
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
Extra Python packages available to Qtile.
|
||||
An example would be to include `python3Packages.qtile-extras`
|
||||
for additional unoffical widgets.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
python3Packages: with python3Packages; [
|
||||
qtile-extras
|
||||
];
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = [{
|
||||
name = "qtile";
|
||||
start = ''
|
||||
${cfg.package}/bin/qtile start &
|
||||
${pyEnv}/bin/qtile start -b ${cfg.backend} \
|
||||
${optionalString (cfg.configFile != null)
|
||||
"--config \"${cfg.configFile}\""} &
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Test Authelia as an auth server for Traefik as a reverse proxy of a local web service
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
import ./make-test-python.nix ({ lib, ... }: {
|
||||
name = "authelia";
|
||||
meta.maintainers = with lib.maintainers; [ jk ];
|
||||
|
||||
|
|
|
@ -50,6 +50,13 @@ in
|
|||
mutableConfig = false;
|
||||
extraConfig.SupportSettings.HelpLink = "https://search.nixos.org";
|
||||
};
|
||||
environmentFile = makeMattermost {
|
||||
mutableConfig = false;
|
||||
extraConfig.SupportSettings.AboutLink = "https://example.org";
|
||||
environmentFile = pkgs.writeText "mattermost-env" ''
|
||||
MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
testScript = let
|
||||
|
@ -69,6 +76,7 @@ in
|
|||
rm -f $mattermostConfig
|
||||
echo "$newConfig" > "$mattermostConfig"
|
||||
'';
|
||||
|
||||
in
|
||||
''
|
||||
start_all()
|
||||
|
@ -120,5 +128,13 @@ in
|
|||
|
||||
# Our edits should be ignored on restart
|
||||
immutable.succeed("${expectConfig ''.AboutLink == "https://nixos.org" and .HelpLink == "https://search.nixos.org"''}")
|
||||
|
||||
|
||||
## Environment File node tests ##
|
||||
environmentFile.wait_for_unit("mattermost.service")
|
||||
environmentFile.wait_for_open_port(8065)
|
||||
|
||||
# Settings in the environment file should override settings set otherwise
|
||||
environmentFile.succeed("${expectConfig ''.AboutLink == "https://nixos.org"''}")
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -12,6 +12,7 @@ let
|
|||
then pkgs.zfsUnstable.latestCompatibleLinuxPackages
|
||||
else pkgs.linuxPackages
|
||||
, enableUnstable ? false
|
||||
, enableSystemdStage1 ? false
|
||||
, extraTest ? ""
|
||||
}:
|
||||
makeTest {
|
||||
|
@ -36,6 +37,7 @@ let
|
|||
boot.kernelPackages = kernelPackage;
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.zfs.enableUnstable = enableUnstable;
|
||||
boot.initrd.systemd.enable = enableSystemdStage1;
|
||||
|
||||
environment.systemPackages = [ pkgs.parted ];
|
||||
|
||||
|
@ -176,6 +178,11 @@ in {
|
|||
enableUnstable = true;
|
||||
};
|
||||
|
||||
unstableWithSystemdStage1 = makeZfsTest "unstable" {
|
||||
enableUnstable = true;
|
||||
enableSystemdStage1 = true;
|
||||
};
|
||||
|
||||
installer = (import ./installer.nix { }).zfsroot;
|
||||
|
||||
expand-partitions = makeTest {
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
|
||||
let
|
||||
pname = "sonixd";
|
||||
version = "0.15.4";
|
||||
version = "0.15.5";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage";
|
||||
sha256 = "sha256-n4n16S8ktPiVc0iyjVNNIyo9oEIBwGIuzj0xgm/ETeo=";
|
||||
sha256 = "sha256-j8B+o/CJ5SsZPMNbugyP3T9Kb+xuxlVxH02loxlwwDg=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -35,7 +35,7 @@ def generate_grammar(item):
|
|||
|
||||
generated = f""" {lang} = buildGrammar {{
|
||||
language = "{lang}";
|
||||
version = "{rev[:7]}";
|
||||
version = "0.0.0+rev={rev[:7]}";
|
||||
src = """
|
||||
|
||||
generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True)
|
||||
|
|
|
@ -606,7 +606,7 @@ let
|
|||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense";
|
||||
homepage = "https://github.com/ChristianKohler/PathIntellisense";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.imgabe ];
|
||||
maintainers = [ lib.maintainers.imgabe ];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1045,7 +1045,7 @@ let
|
|||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode";
|
||||
homepage = "https://github.com/prettier/prettier-vscode";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.datafoo ];
|
||||
maintainers = [ lib.maintainers.datafoo ];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1389,7 +1389,7 @@ let
|
|||
version = "2.2.2";
|
||||
sha256 = "sha256-zWdIVdz+kZg7KZQ7LeBCB4aB9wg8dUbkWfzGlM0Fq7Q=";
|
||||
};
|
||||
meta ={
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
@ -1525,7 +1525,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
jebbs.plantuml = callPackage ./jebbs.plantuml {};
|
||||
jebbs.plantuml = callPackage ./jebbs.plantuml { };
|
||||
|
||||
jellyedwards.gitsweep = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
@ -1681,43 +1681,45 @@ let
|
|||
|
||||
kamikillerto.vscode-colorize = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-colorize";
|
||||
publisher = "kamikillerto";
|
||||
version = "0.11.1";
|
||||
sha256 = "1h82b1jz86k2qznprng5066afinkrd7j3738a56idqr3vvvqnbsm";
|
||||
name = "vscode-colorize";
|
||||
publisher = "kamikillerto";
|
||||
version = "0.11.1";
|
||||
sha256 = "1h82b1jz86k2qznprng5066afinkrd7j3738a56idqr3vvvqnbsm";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
};
|
||||
|
||||
kddejong.vscode-cfn-lint = let
|
||||
inherit (python3Packages) cfn-lint;
|
||||
in buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-cfn-lint";
|
||||
publisher = "kddejong";
|
||||
version = "0.21.0";
|
||||
sha256 = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ=";
|
||||
kddejong.vscode-cfn-lint =
|
||||
let
|
||||
inherit (python3Packages) cfn-lint;
|
||||
in
|
||||
buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-cfn-lint";
|
||||
publisher = "kddejong";
|
||||
version = "0.21.0";
|
||||
sha256 = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
|
||||
buildInputs = [ cfn-lint ];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."cfnLint.path".default = "${cfn-lint}/bin/cfn-lint"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "CloudFormation Linter IDE integration, autocompletion, and documentation";
|
||||
homepage = "https://github.com/aws-cloudformation/cfn-lint-visual-studio-code";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.wolfangaukang ];
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
|
||||
buildInputs = [ cfn-lint ];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."cfnLint.path".default = "${cfn-lint}/bin/cfn-lint"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "CloudFormation Linter IDE integration, autocompletion, and documentation";
|
||||
homepage = "https://github.com/aws-cloudformation/cfn-lint-visual-studio-code";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.wolfangaukang ];
|
||||
};
|
||||
};
|
||||
|
||||
kubukoz.nickel-syntax = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "nickel-syntax";
|
||||
|
@ -1934,7 +1936,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ms-ceintl = callPackage ./language-packs.nix {}; # non-English language packs
|
||||
ms-ceintl = callPackage ./language-packs.nix { }; # non-English language packs
|
||||
|
||||
ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { };
|
||||
|
||||
|
@ -2070,7 +2072,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter {};
|
||||
ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter { };
|
||||
|
||||
ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
, perlPackages
|
||||
, sqlite
|
||||
, vigra
|
||||
, wrapGAppsHook
|
||||
, wxGTK
|
||||
, zlib
|
||||
}:
|
||||
|
@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper pkg-config ];
|
||||
nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook ];
|
||||
|
||||
# disable installation of the python scripting interface
|
||||
cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
|
||||
|
|
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
|||
description = "Task Timer (tt) is a dead simple TUI task timer";
|
||||
homepage = "https://github.com/caarlos0/tasktimer";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ abbe ];
|
||||
maintainers = with maintainers; [ abbe caarlos0 ];
|
||||
mainProgram = "tt";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ let
|
|||
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "12.0.3";
|
||||
version = "12.0.4";
|
||||
|
||||
lang = "ALL";
|
||||
|
||||
|
@ -99,7 +99,7 @@ let
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
hash = "sha256-bOGY/RdwD6O7QIuOiBw7OVnZfpumGGso6hwMJJwN2g0=";
|
||||
hash = "sha256-VT0bD4v8SBq0emFYsxELreY4o+u+FQfyBEnSMzmRd7Y=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
|
@ -109,7 +109,7 @@ let
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
hash = "sha256-t1tnEZtiRig2r8GNJpqT+J0XoxCLMyUsI9tX6aa0lYk=";
|
||||
hash = "sha256-mi8btxI6de5iQ8HzNpvuFdJHjzi03zZJT65dsWEiDHA=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "srain";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SrainApp";
|
||||
repo = "srain";
|
||||
rev = version;
|
||||
sha256 = "sha256-AJ02S5+A/n8kO6lic8EbPYqNDmHL/tKbXhIkHTrcXOM=";
|
||||
sha256 = "sha256-PiLjlsYmgxXpvcqDkwS/6WmTEimMH8+OndUG2Hehdm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubo";
|
||||
version = "0.18.1"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.19.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version
|
||||
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
# Kubo makes changes to it's source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-xAOx4QOdD5MfFLqKTQRGMOnTZt14H523/quOLY5gBMk=";
|
||||
hash = "sha256-PAxWijTAGOJKRDIKaulNPr/4uOJkm+vqNWAY7AjhFUw=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
|
|
|
@ -145,6 +145,13 @@ stdenv.mkDerivation rec {
|
|||
mv usr/share/* $out/share/
|
||||
mv opt/onlyoffice/desktopeditors $out/share
|
||||
|
||||
for f in $out/share/desktopeditors/asc-de-*.png; do
|
||||
size=$(basename "$f" ".png" | cut -d"-" -f3)
|
||||
res="''${size}x''${size}"
|
||||
mkdir -pv "$out/share/icons/hicolor/$res/apps"
|
||||
ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png"
|
||||
done;
|
||||
|
||||
substituteInPlace $out/bin/onlyoffice-desktopeditors \
|
||||
--replace "/opt/onlyoffice/" "$out/share/"
|
||||
|
||||
|
|
|
@ -24,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.8.7";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N9LZCf2YAhVgxnQWgCB9TqGNpUGP1ZqpLmbYIaQsn08=";
|
||||
hash = "sha256-rXiNhk+6eeYF5w/8jSJaEaLEgRYngqTV/wLkMvg6qOQ=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cvc5";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc5";
|
||||
repo = "cvc5";
|
||||
rev = "cvc5-${version}";
|
||||
hash = "sha256-1yJZtPZ4nMg9Kn3jHpN8b5XeFZ8ZeVLrKYWh7Rp3/oQ=";
|
||||
hash = "sha256-l+L59QLLrAEVkAZjhxICJpa+j+jr1k/7B61JlapXGRI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake flex ];
|
||||
|
|
|
@ -49,16 +49,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alacritty";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2jNE0UdPXfOyAfPPVKhdBpuVVw4IpwWQ+RLQlJNnK0Y=";
|
||||
hash = "sha256-2MiFsOZpAlDVC4h3m3HHlMr2ytL/z47vrTwUMoHdegI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw=";
|
||||
cargoSha256 = "sha256-4liPfNJ2JGniz8Os4Np+XSXCJBHND13XLPWDy3Gc/F8=";
|
||||
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
|
|
387
pkgs/applications/terminal-emulators/wezterm/Cargo.lock
generated
387
pkgs/applications/terminal-emulators/wezterm/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -31,14 +31,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "20230320-124340-559cb7b0";
|
||||
version = "20230326-111934-3666303c";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-u9lOK4DV9NM3CUYjMTovCY4XF5Xxg4V+rQwIjioqTec=";
|
||||
sha256 = "sha256-tgJUnQKVdLJKohda9oy9dwz53OiK4O0A9YlsI0o+meY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
|
|||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"image-0.24.5" = "sha256-fTajVwm88OInqCPZerWcSAm1ga46ansQ3EzAmbT58Js=";
|
||||
"libssh-rs-0.1.5" = "sha256-gxT9mZ+whotZhEoj783aQPlQPqQXd8gQL3zZglMYC1k=";
|
||||
"libssh-rs-0.1.7" = "sha256-pLaWKk/iGy7FfoVafpPYzErnKudxeIWzssWv2Zlm58s=";
|
||||
"xcb-imdkit-0.2.0" = "sha256-QOT9HLlA26DVPUF4ViKH2ckexUsu45KZMdJwoUhW+hA=";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "15.9.3",
|
||||
"repo_hash": "sha256-WYzhKknxx3NwCsXsQCPNQNdoya010YbVh9uTpcHgSl4=",
|
||||
"yarn_hash": "0msrbzqz5hgyl0c6dcxyzi6qnf2k3fmg44d201pa578p08xb0lld",
|
||||
"version": "15.10.0",
|
||||
"repo_hash": "sha256-jpJd6CneCfw+Ia0CTlX5YcEMl+2Tmd2+zfw8L+hKYTk=",
|
||||
"yarn_hash": "1il8dnjb7591ss6w14zibdihg3bylw866jjjclv1qm8cihp8k3y8",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.9.3-ee",
|
||||
"rev": "v15.10.0-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.9.3",
|
||||
"GITLAB_PAGES_VERSION": "15.9.3",
|
||||
"GITLAB_SHELL_VERSION": "14.17.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.9.3"
|
||||
"GITALY_SERVER_VERSION": "15.10.0",
|
||||
"GITLAB_PAGES_VERSION": "15.10.0",
|
||||
"GITLAB_SHELL_VERSION": "14.18.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.10.0"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,13 +12,13 @@ gem 'rbtrace', require: false
|
|||
gem 'gitaly', '~> 15.5.0'
|
||||
|
||||
# Labkit provides observability functionality
|
||||
gem 'gitlab-labkit', '~> 0.31'
|
||||
gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1'
|
||||
|
||||
# Detects the open source license the repository includes
|
||||
# This version needs to be in sync with GitLab CE/EE
|
||||
gem 'licensee', '~> 9.15'
|
||||
|
||||
gem 'google-protobuf', '~> 3.21.12'
|
||||
gem 'google-protobuf', '~> 3.22.2'
|
||||
gem 'nokogiri', '~> 1.14'
|
||||
|
||||
# Rails is currently blocked on the upgrade to the new major version for Redis,
|
||||
|
|
|
@ -40,7 +40,7 @@ GEM
|
|||
ffi (1.15.5)
|
||||
gitaly (15.5.0)
|
||||
grpc (~> 1.0)
|
||||
gitlab-labkit (0.31.0)
|
||||
gitlab-labkit (0.31.1)
|
||||
actionpack (>= 5.0.0, < 8.0.0)
|
||||
activesupport (>= 5.0.0, < 8.0.0)
|
||||
grpc (>= 1.37)
|
||||
|
@ -56,7 +56,7 @@ GEM
|
|||
with_env (= 1.1.0)
|
||||
xml-simple (~> 1.1.5)
|
||||
gitlab-markup (1.8.1)
|
||||
google-protobuf (3.21.12)
|
||||
google-protobuf (3.22.2)
|
||||
googleapis-common-protos-types (1.4.0)
|
||||
google-protobuf (~> 3.14)
|
||||
grpc (1.42.0)
|
||||
|
@ -104,7 +104,7 @@ GEM
|
|||
method_source (~> 1.0)
|
||||
public_suffix (4.0.7)
|
||||
racc (1.6.2)
|
||||
rack (2.2.6.2)
|
||||
rack (2.2.6.3)
|
||||
rack-test (2.0.2)
|
||||
rack (>= 1.3)
|
||||
rails-dom-testing (2.0.3)
|
||||
|
@ -167,7 +167,7 @@ GEM
|
|||
sentry-raven (3.1.2)
|
||||
faraday (>= 1.0)
|
||||
thor (1.1.0)
|
||||
thrift (0.17.0)
|
||||
thrift (0.18.1)
|
||||
tomlrb (2.0.1)
|
||||
tzinfo (2.0.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
|
@ -187,10 +187,10 @@ DEPENDENCIES
|
|||
activesupport (~> 6.1.7.2)
|
||||
factory_bot
|
||||
gitaly (~> 15.5.0)
|
||||
gitlab-labkit (~> 0.31)
|
||||
gitlab-labkit (~> 0.31, >= 0.31.1)
|
||||
gitlab-license_finder
|
||||
gitlab-markup (~> 1.8.0)
|
||||
google-protobuf (~> 3.21.12)
|
||||
google-protobuf (~> 3.22.2)
|
||||
grpc (~> 1.42.0)
|
||||
licensee (~> 9.15)
|
||||
nokogiri (~> 1.14)
|
||||
|
@ -204,4 +204,4 @@ DEPENDENCIES
|
|||
sentry-raven (~> 3.1)
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.6
|
||||
2.4.8
|
||||
|
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.9.3";
|
||||
version = "15.10.0";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
@ -22,10 +22,10 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WBg1fo8tG0tfrsu8QtIo0SY1ZbktVHfcTf77Ny29DSM=";
|
||||
sha256 = "sha256-MHxpij4aT4sq7csWRAEr6NQ9PdFkEnrEPegVtBIXUNo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-IIvvI7CKLWB2W4fi/HLFtfZdovehxDmtQ8GUEw24fbY=";
|
||||
vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY=";
|
||||
|
||||
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
|
||||
|
||||
|
|
|
@ -189,10 +189,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07zd8r189qcqr3xp6dinlw94sylxbyn56nnas7k0aw6xvr74q12v";
|
||||
sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.31.0";
|
||||
version = "0.31.1";
|
||||
};
|
||||
gitlab-license_finder = {
|
||||
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
|
||||
|
@ -220,10 +220,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab";
|
||||
sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.21.12";
|
||||
version = "3.22.2";
|
||||
};
|
||||
googleapis-common-protos-types = {
|
||||
dependencies = ["google-protobuf"];
|
||||
|
@ -470,10 +470,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
|
||||
sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.6.2";
|
||||
version = "2.2.6.3";
|
||||
};
|
||||
rack-test = {
|
||||
dependencies = ["rack"];
|
||||
|
@ -746,10 +746,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80";
|
||||
sha256 = "1r3k8x3vfaa6wnz8mhpn10938bzmfj489zc18q73xpsb469v0nv9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.17.0";
|
||||
version = "0.18.1";
|
||||
};
|
||||
tomlrb = {
|
||||
groups = ["default" "development" "omnibus" "test"];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "15.7.3";
|
||||
version = "15.10.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Aj6XQVIdulwx6mWivwYafR4yrWiNaDeyje3LFQzZPfU=";
|
||||
sha256 = "sha256-LTUGWnZCqyLA5kNlCWMVGIOivfWVGb6GcAdO2tNW1/o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mGcIN9gDCFfr1MvBdfR26LAbrAE2RNivhXP7fCNMyBQ=";
|
||||
vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-shell";
|
||||
version = "14.17.0";
|
||||
version = "14.18.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GTy+1O6Z7i+L8SSSQpYnN6SRfqDutkJYrj66tpX4f5M=";
|
||||
sha256 = "sha256-dMxWnv+YfoDy9rhuCx+JIxFyjHejttkkqkQ4owdI/4g=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby libkrb5 ];
|
||||
|
||||
patches = [ ./remove-hardcoded-locations.patch ];
|
||||
|
||||
vendorSha256 = "sha256-mFGkT5lyQfcaGz503vgqx/kP5S0V2Ks5HDmjx+BxZzg=";
|
||||
vendorSha256 = "sha256-zqZMZvYteOWTgDnlX8H1i8e/QTbAoTPD6ZNsHsCcLdM=";
|
||||
|
||||
postInstall = ''
|
||||
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
|
||||
|
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.9.3";
|
||||
version = "15.10.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
|
||||
sourceRoot = "source/workhorse";
|
||||
|
||||
vendorSha256 = "sha256-wvoMBzRGp8RX2kHKKz3REDq8YLTsHbDayEMYi7hSzTE=";
|
||||
vendorSha256 = "sha256-HG/QobU1LsFhbNF4lNq9tLwjcLD2l3TXnsJ+tjqc0Q8=";
|
||||
buildInputs = [ git ];
|
||||
ldflags = [ "-X main.Version=${version}" ];
|
||||
doCheck = false;
|
||||
|
|
|
@ -33,9 +33,6 @@ gem 'sprockets', '~> 3.7.0'
|
|||
|
||||
gem 'view_component', '~> 2.74.1'
|
||||
|
||||
# Default values for AR models
|
||||
gem 'default_value_for', '~> 3.4.0'
|
||||
|
||||
# Supported DBs
|
||||
gem 'pg', '~> 1.4.5'
|
||||
|
||||
|
@ -143,14 +140,12 @@ gem 'carrierwave', '~> 1.3'
|
|||
gem 'mini_magick', '~> 4.10.1'
|
||||
|
||||
# for backups
|
||||
gem 'fog-aws', '~> 3.15'
|
||||
gem 'fog-aws', '~> 3.18'
|
||||
# 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'
|
||||
gem 'fog-google', '~> 1.19', require: 'fog/google'
|
||||
gem 'fog-local', '~> 0.8'
|
||||
gem 'fog-openstack', '~> 1.0'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
# NOTE:
|
||||
# the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches
|
||||
# the rest-client gem to drop the Content-Length header field for chunked transfers,
|
||||
|
@ -182,7 +177,7 @@ gem 'seed-fu', '~> 2.3.7'
|
|||
gem 'elasticsearch-model', '~> 7.2'
|
||||
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
|
||||
gem 'elasticsearch-api', '7.13.3'
|
||||
gem 'aws-sdk-core', '~> 3.170.0'
|
||||
gem 'aws-sdk-core', '~> 3.170.1'
|
||||
gem 'aws-sdk-cloudformation', '~> 1'
|
||||
gem 'aws-sdk-s3', '~> 1.119.1'
|
||||
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
|
||||
|
@ -199,13 +194,13 @@ gem 'rdoc', '~> 6.3.2'
|
|||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
gem 'asciidoctor', '~> 2.0.17'
|
||||
gem 'asciidoctor', '~> 2.0.18'
|
||||
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
|
||||
gem 'asciidoctor-plantuml', '~> 0.0.16'
|
||||
gem 'asciidoctor-kroki', '~> 0.7.0', require: false
|
||||
gem 'rouge', '~> 3.30.0'
|
||||
gem 'asciidoctor-kroki', '~> 0.8.0', require: false
|
||||
gem 'rouge', '~> 4.1.0'
|
||||
gem 'truncato', '~> 0.7.12'
|
||||
gem 'nokogiri', '~> 1.14.1'
|
||||
gem 'nokogiri', '~> 1.14.2'
|
||||
|
||||
# Calendar rendering
|
||||
gem 'icalendar'
|
||||
|
@ -292,7 +287,7 @@ gem 'asana', '~> 0.10.13'
|
|||
gem 'ruby-fogbugz', '~> 0.3.0'
|
||||
|
||||
# Kubernetes integration
|
||||
gem 'kubeclient', '~> 4.9.3', path: 'vendor/gems/kubeclient'
|
||||
gem 'kubeclient', '~> 4.11.0'
|
||||
|
||||
# Sanitize user input
|
||||
gem 'sanitize', '~> 6.0'
|
||||
|
@ -310,7 +305,7 @@ gem 'licensee', '~> 9.15'
|
|||
gem 'charlock_holmes', '~> 0.7.7'
|
||||
|
||||
# Detect mime content type from content
|
||||
gem 'ruby-magic', '~> 0.5'
|
||||
gem 'ruby-magic', '~> 0.6'
|
||||
|
||||
# Faster blank
|
||||
gem 'fast_blank'
|
||||
|
@ -348,7 +343,7 @@ gem 'pg_query', '~> 2.2', '>= 2.2.1'
|
|||
|
||||
gem 'premailer-rails', '~> 1.10.3'
|
||||
|
||||
gem 'gitlab-labkit', '~> 0.30.1'
|
||||
gem 'gitlab-labkit', '~> 0.31.1'
|
||||
gem 'thrift', '>= 0.16.0'
|
||||
|
||||
# I18n
|
||||
|
@ -363,17 +358,20 @@ gem 'batch-loader', '~> 2.0.1'
|
|||
# Perf bar
|
||||
gem 'peek', '~> 1.1'
|
||||
|
||||
# Google Cloud Profiler support
|
||||
gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false
|
||||
|
||||
# Snowplow events tracking
|
||||
gem 'snowplow-tracker', '~> 0.8.0'
|
||||
|
||||
# Metrics
|
||||
gem 'webrick', '~> 1.6.1', require: false
|
||||
gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client'
|
||||
gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client'
|
||||
|
||||
gem 'warning', '~> 1.3.0'
|
||||
|
||||
group :development do
|
||||
gem 'lefthook', '~> 1.2.9', require: false
|
||||
gem 'lefthook', '~> 1.3.3', require: false
|
||||
gem 'rubocop'
|
||||
gem 'solargraph', '~> 0.47.2', require: false
|
||||
|
||||
|
@ -416,7 +414,7 @@ group :development, :test do
|
|||
gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
|
||||
# Benchmarking & profiling
|
||||
gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||
gem 'benchmark-ips', '~> 2.11.0', require: false
|
||||
gem 'benchmark-memory', '~> 0.1', require: false
|
||||
|
||||
gem 'knapsack', '~> 1.21.1'
|
||||
|
@ -436,7 +434,7 @@ group :development, :test do
|
|||
end
|
||||
|
||||
group :development, :test, :danger do
|
||||
gem 'gitlab-dangerfiles', '~> 3.7.0', require: false
|
||||
gem 'gitlab-dangerfiles', '~> 3.8.0', require: false
|
||||
end
|
||||
|
||||
group :development, :test, :coverage do
|
||||
|
@ -456,7 +454,7 @@ group :test do
|
|||
gem 'rspec-retry', '~> 0.6.1'
|
||||
gem 'rspec_profiling', '~> 0.0.6'
|
||||
gem 'rspec-benchmark', '~> 0.6.0'
|
||||
gem 'rspec-parameterized', require: false
|
||||
gem 'rspec-parameterized', '~> 1.0', require: false
|
||||
|
||||
gem 'capybara', '~> 3.35.3'
|
||||
gem 'capybara-screenshot', '~> 1.0.22'
|
||||
|
@ -472,6 +470,7 @@ group :test do
|
|||
gem 'test-prof', '~> 1.0.7'
|
||||
gem 'rspec_junit_formatter'
|
||||
gem 'guard-rspec'
|
||||
gem 'axe-core-rspec'
|
||||
|
||||
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
|
||||
gem 'derailed_benchmarks', require: false
|
||||
|
@ -486,7 +485,7 @@ gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
|
|||
gem 'email_reply_trimmer', '~> 0.1'
|
||||
gem 'html2text'
|
||||
|
||||
gem 'stackprof', '~> 0.2.21', require: false
|
||||
gem 'stackprof', '~> 0.2.23', require: false
|
||||
gem 'rbtrace', '~> 0.4', require: false
|
||||
gem 'memory_profiler', '~> 1.0', require: false
|
||||
gem 'activerecord-explain-analyze', '~> 0.1', require: false
|
||||
|
@ -518,7 +517,7 @@ gem 'kas-grpc', '~> 0.0.2'
|
|||
|
||||
gem 'grpc', '~> 1.42.0'
|
||||
|
||||
gem 'google-protobuf', '~> 3.21', '>= 3.21.12'
|
||||
gem 'google-protobuf', '~> 3.22', '>= 3.22.2'
|
||||
|
||||
gem 'toml-rb', '~> 2.2.0'
|
||||
|
||||
|
@ -566,7 +565,7 @@ gem 'oj-introspect', '~> 0.7'
|
|||
gem 'multi_json', '~> 1.14.1'
|
||||
gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
|
||||
|
||||
gem 'webauthn', '~> 2.3'
|
||||
gem 'webauthn', '~> 3.0'
|
||||
|
||||
# IPAddress utilities
|
||||
gem 'ipaddress', '~> 0.8.3'
|
||||
|
@ -588,8 +587,18 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite'
|
|||
gem 'arr-pm', '~> 0.0.12'
|
||||
|
||||
# Apple plist parsing
|
||||
gem 'CFPropertyList'
|
||||
gem 'CFPropertyList', '~> 3.0.0'
|
||||
gem 'app_store_connect'
|
||||
|
||||
# For phone verification
|
||||
gem 'telesignenterprise', '~> 2.2'
|
||||
|
||||
# Ruby 3 extracts net-protocol into a separate gem, while Ruby 2 has it built-in
|
||||
# This condition installs the gem only for Ruby 3 to avoid warnings on Ruby 2
|
||||
# Can be removed when support for Ruby 2 is dropped
|
||||
install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do
|
||||
# BufferedIO patch
|
||||
gem 'net-protocol', '~> 0.1.3'
|
||||
end
|
||||
|
||||
gem 'duo_api', '~> 1.3'
|
||||
|
|
|
@ -10,6 +10,15 @@ PATH
|
|||
bundler-checksum (0.1.0)
|
||||
bundler
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/cloud_profiler_agent
|
||||
specs:
|
||||
cloud_profiler_agent (0.0.1.pre)
|
||||
google-cloud-profiler-v2 (~> 0.3)
|
||||
google-protobuf (~> 3.13)
|
||||
googleauth (>= 0.14)
|
||||
stackprof (~> 0.2)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/devise-pbkdf2-encryptable
|
||||
specs:
|
||||
|
@ -30,15 +39,6 @@ PATH
|
|||
diffy (~> 3.4)
|
||||
oj (~> 3.13.16)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/kubeclient
|
||||
specs:
|
||||
kubeclient (4.9.4.pre.gitlab1)
|
||||
http (>= 3.0, < 6.0)
|
||||
jsonpath (~> 1.0)
|
||||
recursive-open-struct (~> 1.1, >= 1.1.1)
|
||||
rest-client (~> 2.0)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/mail-smtp_pool
|
||||
specs:
|
||||
|
@ -184,10 +184,10 @@ GEM
|
|||
faraday_middleware (~> 1.0)
|
||||
faraday_middleware-multi_json (~> 0.0)
|
||||
oauth2 (>= 1.4, < 3)
|
||||
asciidoctor (2.0.17)
|
||||
asciidoctor (2.0.18)
|
||||
asciidoctor-include-ext (0.4.0)
|
||||
asciidoctor (>= 1.5.6, < 3.0.0)
|
||||
asciidoctor-kroki (0.7.0)
|
||||
asciidoctor-kroki (0.8.0)
|
||||
asciidoctor (~> 2.0)
|
||||
asciidoctor-plantuml (0.0.16)
|
||||
asciidoctor (>= 2.0.17, < 3.0.0)
|
||||
|
@ -198,13 +198,13 @@ GEM
|
|||
autoprefixer-rails (10.2.5.1)
|
||||
execjs (> 0)
|
||||
awesome_print (1.9.2)
|
||||
awrence (1.1.1)
|
||||
awrence (1.2.1)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.703.0)
|
||||
aws-partitions (1.730.0)
|
||||
aws-sdk-cloudformation (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.99.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-core (3.170.0)
|
||||
aws-sdk-core (3.170.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
|
@ -218,6 +218,17 @@ GEM
|
|||
aws-sigv4 (~> 1.4)
|
||||
aws-sigv4 (1.5.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
axe-core-api (4.6.0)
|
||||
dumb_delegator
|
||||
virtus
|
||||
axe-core-rspec (4.6.0)
|
||||
axe-core-api
|
||||
dumb_delegator
|
||||
virtus
|
||||
axiom-types (0.1.1)
|
||||
descendants_tracker (~> 0.0.4)
|
||||
ice_nine (~> 0.11.0)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
azure-storage-blob (2.0.3)
|
||||
azure-storage-common (~> 2.0)
|
||||
nokogiri (~> 1, >= 1.10.8)
|
||||
|
@ -232,7 +243,7 @@ GEM
|
|||
batch-loader (2.0.1)
|
||||
bcrypt (3.1.16)
|
||||
benchmark (0.2.0)
|
||||
benchmark-ips (2.3.0)
|
||||
benchmark-ips (2.11.0)
|
||||
benchmark-malloc (0.2.0)
|
||||
benchmark-memory (0.2.0)
|
||||
memory_profiler (~> 1)
|
||||
|
@ -243,7 +254,8 @@ GEM
|
|||
erubi (>= 1.0.0)
|
||||
rack (>= 0.9.0)
|
||||
bindata (2.4.11)
|
||||
binding_ninja (0.2.3)
|
||||
binding_of_caller (1.0.0)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bootsnap (1.16.0)
|
||||
msgpack (~> 1.2)
|
||||
browser (5.3.1)
|
||||
|
@ -292,15 +304,17 @@ GEM
|
|||
nap
|
||||
open4 (~> 1.3)
|
||||
coderay (1.1.3)
|
||||
coercible (1.0.0)
|
||||
descendants_tracker (~> 0.0.1)
|
||||
colored2 (3.1.2)
|
||||
commonmarker (0.23.6)
|
||||
concurrent-ruby (1.2.0)
|
||||
connection_pool (2.3.0)
|
||||
cork (0.3.0)
|
||||
colored2 (~> 3.1)
|
||||
cose (1.0.0)
|
||||
cose (1.3.0)
|
||||
cbor (~> 0.5.9)
|
||||
openssl-signature_algorithm (~> 0.4.0)
|
||||
openssl-signature_algorithm (~> 1.0)
|
||||
countries (4.0.1)
|
||||
i18n_data (~> 0.13.0)
|
||||
sixarm_ruby_unaccent (~> 1.1)
|
||||
|
@ -310,7 +324,7 @@ GEM
|
|||
creole (0.5.0)
|
||||
crystalball (0.7.0)
|
||||
git
|
||||
css_parser (1.12.0)
|
||||
css_parser (1.14.0)
|
||||
addressable
|
||||
cvss-suite (3.0.1)
|
||||
danger (8.6.1)
|
||||
|
@ -331,12 +345,11 @@ GEM
|
|||
gitlab (~> 4.2, >= 4.2.0)
|
||||
database_cleaner (1.7.0)
|
||||
dead_end (3.1.1)
|
||||
debug_inspector (1.1.0)
|
||||
deckar01-task_list (2.3.2)
|
||||
html-pipeline
|
||||
declarative (0.0.20)
|
||||
declarative_policy (1.1.0)
|
||||
default_value_for (3.4.0)
|
||||
activerecord (>= 3.2.0, < 7.0)
|
||||
deprecation_toolkit (1.5.1)
|
||||
activesupport (>= 4.2)
|
||||
derailed_benchmarks (2.1.2)
|
||||
|
@ -351,6 +364,8 @@ GEM
|
|||
rake (> 10, < 14)
|
||||
ruby-statistics (>= 2.1)
|
||||
thor (>= 0.19, < 2)
|
||||
descendants_tracker (0.0.4)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
device_detector (1.0.0)
|
||||
devise (4.8.1)
|
||||
bcrypt (~> 3.0)
|
||||
|
@ -400,6 +415,8 @@ GEM
|
|||
dry-equalizer (~> 0.3)
|
||||
dry-inflector (~> 0.1, >= 0.1.2)
|
||||
dry-logic (~> 1.0, >= 1.0.2)
|
||||
dumb_delegator (1.0.0)
|
||||
duo_api (1.3.0)
|
||||
e2mmap (0.1.0)
|
||||
ecma-re-validator (0.3.0)
|
||||
regexp_parser (~> 2.0)
|
||||
|
@ -502,7 +519,7 @@ GEM
|
|||
fog-json
|
||||
ipaddress (~> 0.8)
|
||||
xml-simple (~> 1.1)
|
||||
fog-aws (3.15.0)
|
||||
fog-aws (3.18.0)
|
||||
fog-core (~> 2.1)
|
||||
fog-json (~> 1.1)
|
||||
fog-xml (~> 0.1)
|
||||
|
@ -528,15 +545,6 @@ GEM
|
|||
multi_json (~> 1.10)
|
||||
fog-local (0.8.0)
|
||||
fog-core (>= 1.27, < 3.0)
|
||||
fog-openstack (1.0.8)
|
||||
fog-core (~> 2.1)
|
||||
fog-json (>= 1.0)
|
||||
ipaddress (>= 0.8)
|
||||
fog-rackspace (0.1.1)
|
||||
fog-core (>= 1.35)
|
||||
fog-json (>= 1.0)
|
||||
fog-xml (>= 0.1)
|
||||
ipaddress (>= 0.8)
|
||||
fog-xml (0.1.3)
|
||||
fog-core
|
||||
nokogiri (>= 1.5.11, < 2.0.0)
|
||||
|
@ -548,6 +556,14 @@ GEM
|
|||
rspec-core (~> 3.0)
|
||||
ruby-progressbar (~> 1.4)
|
||||
fuzzyurl (0.9.0)
|
||||
gapic-common (0.18.0)
|
||||
faraday (>= 1.9, < 3.a)
|
||||
faraday-retry (>= 1.0, < 3.a)
|
||||
google-protobuf (~> 3.14)
|
||||
googleapis-common-protos (>= 1.3.12, < 2.a)
|
||||
googleapis-common-protos-types (>= 1.3.1, < 2.a)
|
||||
googleauth (~> 1.0)
|
||||
grpc (~> 1.36)
|
||||
gemoji (3.0.1)
|
||||
get_process_mem (0.2.7)
|
||||
ffi (~> 1.0)
|
||||
|
@ -570,7 +586,7 @@ GEM
|
|||
terminal-table (>= 1.5.1)
|
||||
gitlab-chronic (0.10.5)
|
||||
numerizer (~> 0.2)
|
||||
gitlab-dangerfiles (3.7.0)
|
||||
gitlab-dangerfiles (3.8.0)
|
||||
danger (>= 8.4.5)
|
||||
danger-gitlab (>= 8.0.0)
|
||||
rake
|
||||
|
@ -584,7 +600,7 @@ GEM
|
|||
fog-json (~> 1.2.0)
|
||||
mime-types
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
gitlab-labkit (0.30.1)
|
||||
gitlab-labkit (0.31.1)
|
||||
actionpack (>= 5.0.0, < 8.0.0)
|
||||
activesupport (>= 5.0.0, < 8.0.0)
|
||||
grpc (>= 1.37)
|
||||
|
@ -660,6 +676,9 @@ GEM
|
|||
google-cloud-env (1.6.0)
|
||||
faraday (>= 0.17.3, < 3.0)
|
||||
google-cloud-errors (1.3.0)
|
||||
google-cloud-profiler-v2 (0.4.0)
|
||||
gapic-common (>= 0.18.0, < 2.a)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-storage (1.44.0)
|
||||
addressable (~> 2.8)
|
||||
digest-crc (~> 0.4)
|
||||
|
@ -668,8 +687,12 @@ GEM
|
|||
google-cloud-core (~> 1.6)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
mini_mime (~> 1.0)
|
||||
google-protobuf (3.21.12)
|
||||
googleapis-common-protos-types (1.3.0)
|
||||
google-protobuf (3.22.2)
|
||||
googleapis-common-protos (1.4.0)
|
||||
google-protobuf (~> 3.14)
|
||||
googleapis-common-protos-types (~> 1.2)
|
||||
grpc (~> 1.27)
|
||||
googleapis-common-protos-types (1.5.0)
|
||||
google-protobuf (~> 3.14)
|
||||
googleauth (1.3.0)
|
||||
faraday (>= 0.17.3, < 3.a)
|
||||
|
@ -770,7 +793,7 @@ GEM
|
|||
nokogiri (~> 1.6)
|
||||
htmlbeautifier (1.4.2)
|
||||
htmlentities (4.3.4)
|
||||
http (5.1.0)
|
||||
http (5.1.1)
|
||||
addressable (~> 2.8)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 2.2)
|
||||
|
@ -789,6 +812,7 @@ GEM
|
|||
icalendar (2.8.0)
|
||||
ice_cube (~> 0.16)
|
||||
ice_cube (0.16.4)
|
||||
ice_nine (0.11.2)
|
||||
imagen (0.1.8)
|
||||
parser (>= 2.5, != 2.5.1.1)
|
||||
invisible_captcha (2.0.0)
|
||||
|
@ -843,9 +867,14 @@ GEM
|
|||
rexml
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
kubeclient (4.11.0)
|
||||
http (>= 3.0, < 6.0)
|
||||
jsonpath (~> 1.0)
|
||||
recursive-open-struct (~> 1.1, >= 1.1.1)
|
||||
rest-client (~> 2.0)
|
||||
launchy (2.5.0)
|
||||
addressable (~> 2.7)
|
||||
lefthook (1.2.9)
|
||||
lefthook (1.3.3)
|
||||
letter_opener (1.7.0)
|
||||
launchy (~> 2.2)
|
||||
letter_opener_web (2.0.0)
|
||||
|
@ -945,13 +974,15 @@ GEM
|
|||
connection_pool (~> 2.2)
|
||||
net-ldap (0.17.1)
|
||||
net-ntp (2.1.3)
|
||||
net-protocol (0.1.3)
|
||||
timeout
|
||||
net-scp (3.0.0)
|
||||
net-ssh (>= 2.6.5, < 7.0.0)
|
||||
net-ssh (6.0.0)
|
||||
netrc (0.11.0)
|
||||
nio4r (2.5.8)
|
||||
no_proxy_fix (0.1.2)
|
||||
nokogiri (1.14.1)
|
||||
nokogiri (1.14.2)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
notiffany (0.1.3)
|
||||
|
@ -1041,7 +1072,8 @@ GEM
|
|||
webfinger (>= 1.0.1)
|
||||
openssl (2.2.2)
|
||||
ipaddr
|
||||
openssl-signature_algorithm (0.4.0)
|
||||
openssl-signature_algorithm (1.3.0)
|
||||
openssl (> 2.0)
|
||||
opentracing (0.5.0)
|
||||
optimist (3.0.1)
|
||||
org-ruby (0.9.12)
|
||||
|
@ -1097,7 +1129,7 @@ GEM
|
|||
coderay
|
||||
parser
|
||||
unparser
|
||||
prometheus-client-mmap (0.17.0)
|
||||
prometheus-client-mmap (0.19.1)
|
||||
pry (0.14.2)
|
||||
coderay (~> 1.1)
|
||||
method_source (~> 1.0)
|
||||
|
@ -1223,7 +1255,7 @@ GEM
|
|||
rexml (3.2.5)
|
||||
rinku (2.0.0)
|
||||
rotp (6.2.0)
|
||||
rouge (3.30.0)
|
||||
rouge (4.1.0)
|
||||
rqrcode (0.7.0)
|
||||
chunky_png
|
||||
rqrcode-rails3 (0.1.7)
|
||||
|
@ -1245,12 +1277,17 @@ GEM
|
|||
rspec-mocks (3.12.3)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.12.0)
|
||||
rspec-parameterized (0.5.0)
|
||||
binding_ninja (>= 0.2.3)
|
||||
rspec-parameterized (1.0.0)
|
||||
rspec-parameterized-core (< 2)
|
||||
rspec-parameterized-table_syntax (< 2)
|
||||
rspec-parameterized-core (1.0.0)
|
||||
parser
|
||||
proc_to_ast
|
||||
rspec (>= 2.13, < 4)
|
||||
unparser
|
||||
rspec-parameterized-table_syntax (1.0.0)
|
||||
binding_of_caller
|
||||
rspec-parameterized-core (< 2)
|
||||
rspec-rails (6.0.1)
|
||||
actionpack (>= 6.1)
|
||||
activesupport (>= 6.1)
|
||||
|
@ -1298,8 +1335,8 @@ GEM
|
|||
ruby-fogbugz (0.3.0)
|
||||
crack (~> 0.4)
|
||||
multipart-post (~> 2.0)
|
||||
ruby-magic (0.5.4)
|
||||
mini_portile2 (~> 2.6)
|
||||
ruby-magic (0.6.0)
|
||||
mini_portile2 (~> 2.8)
|
||||
ruby-progressbar (1.11.0)
|
||||
ruby-saml (1.13.0)
|
||||
nokogiri (>= 1.10.5)
|
||||
|
@ -1335,7 +1372,6 @@ GEM
|
|||
addressable (>= 2.3.5)
|
||||
faraday (>= 0.17.3, < 3)
|
||||
sd_notify (0.1.1)
|
||||
securecompare (1.0.0)
|
||||
seed-fu (2.3.7)
|
||||
activerecord (>= 3.1)
|
||||
activesupport (>= 3.1)
|
||||
|
@ -1425,7 +1461,7 @@ GEM
|
|||
mini_portile2 (~> 2.8.0)
|
||||
ssh_data (1.3.0)
|
||||
ssrf_filter (1.0.8)
|
||||
stackprof (0.2.21)
|
||||
stackprof (0.2.23)
|
||||
state_machines (0.5.0)
|
||||
state_machines-activemodel (0.8.0)
|
||||
activemodel (>= 5.1)
|
||||
|
@ -1463,18 +1499,21 @@ GEM
|
|||
faraday (~> 1.0)
|
||||
text (1.3.1)
|
||||
thor (1.2.1)
|
||||
thread_safe (0.3.6)
|
||||
thrift (0.16.0)
|
||||
tilt (2.0.11)
|
||||
timeliness (0.3.10)
|
||||
timeout (0.3.2)
|
||||
timfel-krb5-auth (0.8.3)
|
||||
tins (1.31.1)
|
||||
sync
|
||||
toml-rb (2.2.0)
|
||||
citrus (~> 3.0, > 3.0)
|
||||
tomlrb (1.3.0)
|
||||
tpm-key_attestation (0.9.0)
|
||||
tpm-key_attestation (0.12.0)
|
||||
bindata (~> 2.4)
|
||||
openssl-signature_algorithm (~> 0.4.0)
|
||||
openssl (> 2.0)
|
||||
openssl-signature_algorithm (~> 1.0)
|
||||
trailblazer-option (0.1.2)
|
||||
train-core (3.4.9)
|
||||
addressable (~> 2.5)
|
||||
|
@ -1488,10 +1527,10 @@ GEM
|
|||
nokogiri (>= 1.7.0, <= 2.0)
|
||||
tty-color (0.6.0)
|
||||
tty-cursor (0.7.1)
|
||||
tty-markdown (0.7.1)
|
||||
tty-markdown (0.7.2)
|
||||
kramdown (>= 1.16.2, < 3.0)
|
||||
pastel (~> 0.8)
|
||||
rouge (~> 3.14)
|
||||
rouge (>= 3.14, < 5.0)
|
||||
strings (~> 0.2.0)
|
||||
tty-color (~> 0.5)
|
||||
tty-screen (~> 0.8)
|
||||
|
@ -1521,9 +1560,9 @@ GEM
|
|||
uniform_notifier (1.16.0)
|
||||
unleash (3.2.2)
|
||||
murmurhash3 (~> 0.1.6)
|
||||
unparser (0.6.0)
|
||||
unparser (0.6.7)
|
||||
diff-lcs (~> 1.3)
|
||||
parser (>= 3.0.0)
|
||||
parser (>= 3.2.0)
|
||||
uri_template (0.7.0)
|
||||
valid_email (0.1.3)
|
||||
activemodel
|
||||
|
@ -1543,20 +1582,23 @@ GEM
|
|||
activesupport (>= 5.0.0, < 8.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
method_source (~> 1.0)
|
||||
virtus (2.0.0)
|
||||
axiom-types (~> 0.1)
|
||||
coercible (~> 1.0)
|
||||
descendants_tracker (~> 0.0, >= 0.0.3)
|
||||
vmstat (2.3.0)
|
||||
warden (1.2.9)
|
||||
rack (>= 2.0.9)
|
||||
warning (1.3.0)
|
||||
webauthn (2.3.0)
|
||||
webauthn (3.0.0)
|
||||
android_key_attestation (~> 0.3.0)
|
||||
awrence (~> 1.1)
|
||||
bindata (~> 2.4)
|
||||
cbor (~> 0.5.9)
|
||||
cose (~> 1.0)
|
||||
openssl (~> 2.0)
|
||||
cose (~> 1.1)
|
||||
openssl (>= 2.2)
|
||||
safety_net_attestation (~> 0.4.0)
|
||||
securecompare (~> 1.0)
|
||||
tpm-key_attestation (~> 0.9.0)
|
||||
tpm-key_attestation (~> 0.12.0)
|
||||
webfinger (1.2.0)
|
||||
activesupport
|
||||
httpclient (>= 2.4)
|
||||
|
@ -1587,7 +1629,7 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
CFPropertyList
|
||||
CFPropertyList (~> 3.0.0)
|
||||
RedCloth (~> 4.3.2)
|
||||
acme-client (~> 2.0)
|
||||
activerecord-explain-analyze (~> 0.1)
|
||||
|
@ -1598,22 +1640,23 @@ DEPENDENCIES
|
|||
app_store_connect
|
||||
arr-pm (~> 0.0.12)
|
||||
asana (~> 0.10.13)
|
||||
asciidoctor (~> 2.0.17)
|
||||
asciidoctor (~> 2.0.18)
|
||||
asciidoctor-include-ext (~> 0.4.0)
|
||||
asciidoctor-kroki (~> 0.7.0)
|
||||
asciidoctor-kroki (~> 0.8.0)
|
||||
asciidoctor-plantuml (~> 0.0.16)
|
||||
atlassian-jwt (~> 0.2.0)
|
||||
attr_encrypted (~> 3.2.4)!
|
||||
autoprefixer-rails (= 10.2.5.1)
|
||||
awesome_print
|
||||
aws-sdk-cloudformation (~> 1)
|
||||
aws-sdk-core (~> 3.170.0)
|
||||
aws-sdk-core (~> 3.170.1)
|
||||
aws-sdk-s3 (~> 1.119.1)
|
||||
axe-core-rspec
|
||||
babosa (~> 1.0.4)
|
||||
base32 (~> 0.3.0)
|
||||
batch-loader (~> 2.0.1)
|
||||
bcrypt (~> 3.1, >= 3.1.14)
|
||||
benchmark-ips (~> 2.3.0)
|
||||
benchmark-ips (~> 2.11.0)
|
||||
benchmark-memory (~> 0.1)
|
||||
better_errors (~> 2.9.1)
|
||||
bootsnap (~> 1.16.0)
|
||||
|
@ -1625,6 +1668,7 @@ DEPENDENCIES
|
|||
capybara-screenshot (~> 1.0.22)
|
||||
carrierwave (~> 1.3)
|
||||
charlock_holmes (~> 0.7.7)
|
||||
cloud_profiler_agent (~> 0.0.0)!
|
||||
commonmarker (~> 0.23.6)
|
||||
concurrent-ruby (~> 1.1)
|
||||
connection_pool (~> 2.0)
|
||||
|
@ -1635,7 +1679,6 @@ DEPENDENCIES
|
|||
database_cleaner (~> 1.7.0)
|
||||
deckar01-task_list (= 2.3.2)
|
||||
declarative_policy (~> 1.1.0)
|
||||
default_value_for (~> 3.4.0)
|
||||
deprecation_toolkit (~> 1.5.1)
|
||||
derailed_benchmarks
|
||||
device_detector
|
||||
|
@ -1647,6 +1690,7 @@ DEPENDENCIES
|
|||
discordrb-webhooks (~> 3.4)
|
||||
doorkeeper (~> 5.5)
|
||||
doorkeeper-openid_connect (~> 1.8)
|
||||
duo_api (~> 1.3)
|
||||
ed25519 (~> 1.3.0)
|
||||
elasticsearch-api (= 7.13.3)
|
||||
elasticsearch-model (~> 7.2)
|
||||
|
@ -1663,12 +1707,10 @@ DEPENDENCIES
|
|||
flipper-active_record (~> 0.25.0)
|
||||
flipper-active_support_cache_store (~> 0.25.0)
|
||||
fog-aliyun (~> 0.4)
|
||||
fog-aws (~> 3.15)
|
||||
fog-aws (~> 3.18)
|
||||
fog-core (= 2.1.0)
|
||||
fog-google (~> 1.19)
|
||||
fog-local (~> 0.8)
|
||||
fog-openstack (~> 1.0)
|
||||
fog-rackspace (~> 0.1.1)
|
||||
fugit (~> 1.8.1)
|
||||
fuubar (~> 2.2.0)
|
||||
gettext (~> 3.3)
|
||||
|
@ -1676,10 +1718,10 @@ DEPENDENCIES
|
|||
gettext_i18n_rails_js (~> 1.3)
|
||||
gitaly (~> 15.9.0.pre.rc3)
|
||||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-dangerfiles (~> 3.7.0)
|
||||
gitlab-dangerfiles (~> 3.8.0)
|
||||
gitlab-experiment (~> 0.7.1)
|
||||
gitlab-fog-azure-rm (~> 1.7.0)
|
||||
gitlab-labkit (~> 0.30.1)
|
||||
gitlab-labkit (~> 0.31.1)
|
||||
gitlab-license (~> 2.2.1)
|
||||
gitlab-mail_room (~> 0.0.9)
|
||||
gitlab-markup (~> 1.9.0)
|
||||
|
@ -1699,7 +1741,7 @@ DEPENDENCIES
|
|||
google-apis-serviceusage_v1 (~> 0.28.0)
|
||||
google-apis-sqladmin_v1beta4 (~> 0.41.0)
|
||||
google-cloud-storage (~> 1.44.0)
|
||||
google-protobuf (~> 3.21, >= 3.21.12)
|
||||
google-protobuf (~> 3.22, >= 3.22.2)
|
||||
gpgme (~> 2.0.22)
|
||||
grape (~> 1.5.2)
|
||||
grape-entity (~> 0.10.0)
|
||||
|
@ -1737,8 +1779,8 @@ DEPENDENCIES
|
|||
kas-grpc (~> 0.0.2)
|
||||
knapsack (~> 1.21.1)
|
||||
kramdown (~> 2.3.1)
|
||||
kubeclient (~> 4.9.3)!
|
||||
lefthook (~> 1.2.9)
|
||||
kubeclient (~> 4.11.0)
|
||||
lefthook (~> 1.3.3)
|
||||
letter_opener_web (~> 2.0.0)
|
||||
license_finder (~> 7.0)
|
||||
licensee (~> 9.15)
|
||||
|
@ -1758,7 +1800,8 @@ DEPENDENCIES
|
|||
multi_json (~> 1.14.1)
|
||||
net-ldap (~> 0.17.1)
|
||||
net-ntp
|
||||
nokogiri (~> 1.14.1)
|
||||
net-protocol (~> 0.1.3)
|
||||
nokogiri (~> 1.14.2)
|
||||
oauth2 (~> 2.0)
|
||||
octokit (~> 4.15)
|
||||
ohai (~> 16.10)
|
||||
|
@ -1793,7 +1836,7 @@ DEPENDENCIES
|
|||
pg_query (~> 2.2, >= 2.2.1)
|
||||
png_quantizator (~> 0.2.1)
|
||||
premailer-rails (~> 1.10.3)
|
||||
prometheus-client-mmap (~> 0.17)
|
||||
prometheus-client-mmap (~> 0.19)
|
||||
pry-byebug
|
||||
pry-rails (~> 0.3.9)
|
||||
pry-shell (~> 0.6.1)
|
||||
|
@ -1820,17 +1863,17 @@ DEPENDENCIES
|
|||
responders (~> 3.0)
|
||||
retriable (~> 3.1.2)
|
||||
rexml (~> 3.2.5)
|
||||
rouge (~> 3.30.0)
|
||||
rouge (~> 4.1.0)
|
||||
rqrcode-rails3 (~> 0.1.7)
|
||||
rspec-benchmark (~> 0.6.0)
|
||||
rspec-parameterized
|
||||
rspec-parameterized (~> 1.0)
|
||||
rspec-rails (~> 6.0.1)
|
||||
rspec-retry (~> 0.6.1)
|
||||
rspec_junit_formatter
|
||||
rspec_profiling (~> 0.0.6)
|
||||
rubocop
|
||||
ruby-fogbugz (~> 0.3.0)
|
||||
ruby-magic (~> 0.5)
|
||||
ruby-magic (~> 0.6)
|
||||
ruby-progressbar (~> 1.10)
|
||||
ruby-saml (~> 1.13.0)
|
||||
ruby_parser (~> 3.19)
|
||||
|
@ -1863,7 +1906,7 @@ DEPENDENCIES
|
|||
sprite-factory (~> 1.7)
|
||||
sprockets (~> 3.7.0)
|
||||
ssh_data (~> 1.3)
|
||||
stackprof (~> 0.2.21)
|
||||
stackprof (~> 0.2.23)
|
||||
state_machines-activerecord (~> 0.8.0)
|
||||
sys-filesystem (~> 1.4.3)
|
||||
tanuki_emoji (~> 0.6)
|
||||
|
@ -1886,11 +1929,11 @@ DEPENDENCIES
|
|||
view_component (~> 2.74.1)
|
||||
vmstat (~> 2.3.0)
|
||||
warning (~> 1.3.0)
|
||||
webauthn (~> 2.3)
|
||||
webauthn (~> 3.0)
|
||||
webmock (~> 3.9.1)
|
||||
webrick (~> 1.6.1)
|
||||
wikicloth (= 0.8.1)
|
||||
yajl-ruby (~> 1.4.3)
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.6
|
||||
2.4.8
|
||||
|
|
|
@ -254,10 +254,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd";
|
||||
sha256 = "11z3vnd8vh3ny1vx69bjrbck5b2g8zsbj94npyadpn7fdp8y3ldv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.17";
|
||||
version = "2.0.18";
|
||||
};
|
||||
asciidoctor-include-ext = {
|
||||
dependencies = ["asciidoctor"];
|
||||
|
@ -276,10 +276,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08diy3wpmmaw9kabpr2wm908bgv71jj9l7z9fs6fj45fkkjf92jj";
|
||||
sha256 = "0dhsickf1i4cr1w3l9imbqizv67yx1iqh2dhj3lvvkk7j4s3yfz5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
};
|
||||
asciidoctor-plantuml = {
|
||||
dependencies = ["asciidoctor"];
|
||||
|
@ -359,10 +359,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15zwdli370jfsj6jypv7vrqf4vv4ac4784faw7ar5v88fk4q9rcv";
|
||||
sha256 = "0gj8f8c54r9cabkm41s59sa1ca5wpbipw7gq3sfl87x9296227fx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
};
|
||||
aws-eventstream = {
|
||||
groups = ["default"];
|
||||
|
@ -379,10 +379,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j579s8y4ppgcxvvsxwbmisplgbi6l09jc4v593y17vrnbfgqcix";
|
||||
sha256 = "0awhivg7pr6b06r1jw663q0g7sm3i08n9n8bvry0qjsc03kq9aij";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.703.0";
|
||||
version = "1.730.0";
|
||||
};
|
||||
aws-sdk-cloudformation = {
|
||||
dependencies = ["aws-sdk-core" "aws-sigv4"];
|
||||
|
@ -401,10 +401,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r";
|
||||
sha256 = "19myd6fkrxmhrp55g2dlnqw0mnz96qv3zpl3zc0cv44zcbmaffsm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.170.0";
|
||||
version = "3.170.1";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
dependencies = ["aws-sdk-core" "aws-sigv4"];
|
||||
|
@ -439,6 +439,39 @@ src:
|
|||
};
|
||||
version = "1.5.1";
|
||||
};
|
||||
axe-core-api = {
|
||||
dependencies = ["dumb_delegator" "virtus"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qkcia7yg50j0ycmzqnl2dzzz9a35wlg5fk30g0qs41z6p1xw38v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.6.0";
|
||||
};
|
||||
axe-core-rspec = {
|
||||
dependencies = ["axe-core-api" "dumb_delegator" "virtus"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zvlrnxcyam2574gzn44r0ibz4h0s9j3vrp5lixi731qvp4mphhi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.6.0";
|
||||
};
|
||||
axiom-types = {
|
||||
dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
};
|
||||
azure-storage-blob = {
|
||||
dependencies = ["azure-storage-common" "nokogiri"];
|
||||
groups = ["default"];
|
||||
|
@ -526,10 +559,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j";
|
||||
sha256 = "1v3db77blqz3g4z8nskd3jhdviz5d6q2xxvzxvq5m2bk2228kahy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.11.0";
|
||||
};
|
||||
benchmark-malloc = {
|
||||
groups = ["default" "test"];
|
||||
|
@ -593,15 +626,16 @@ src:
|
|||
};
|
||||
version = "2.4.11";
|
||||
};
|
||||
binding_ninja = {
|
||||
groups = ["default" "development" "test"];
|
||||
binding_of_caller = {
|
||||
dependencies = ["debug_inspector"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa";
|
||||
sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.3";
|
||||
version = "1.0.0";
|
||||
};
|
||||
bootsnap = {
|
||||
dependencies = ["msgpack"];
|
||||
|
@ -827,6 +861,16 @@ src:
|
|||
};
|
||||
version = "0.9.2";
|
||||
};
|
||||
cloud_profiler_agent = {
|
||||
dependencies = ["google-cloud-profiler-v2" "google-protobuf" "googleauth" "stackprof"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
path = "${src}/vendor/gems/cloud_profiler_agent";
|
||||
type = "path";
|
||||
};
|
||||
version = "0.0.1.pre";
|
||||
};
|
||||
coderay = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [{
|
||||
|
@ -841,6 +885,17 @@ src:
|
|||
};
|
||||
version = "1.1.3";
|
||||
};
|
||||
coercible = {
|
||||
dependencies = ["descendants_tracker"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
colored2 = {
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
|
@ -898,10 +953,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1h1vcirk1vpr992xmnwf5z77fpizjwn4xzq2vrrjhvdmjynvl3jj";
|
||||
sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.3.0";
|
||||
};
|
||||
countries = {
|
||||
dependencies = ["i18n_data" "sixarm_ruby_unaccent"];
|
||||
|
@ -962,10 +1017,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b";
|
||||
sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.0";
|
||||
version = "1.14.0";
|
||||
};
|
||||
cvss-suite = {
|
||||
groups = ["default"];
|
||||
|
@ -1019,6 +1074,16 @@ src:
|
|||
};
|
||||
version = "3.1.1";
|
||||
};
|
||||
debug_inspector = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
deckar01-task_list = {
|
||||
dependencies = ["html-pipeline"];
|
||||
groups = ["default"];
|
||||
|
@ -1050,17 +1115,6 @@ src:
|
|||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
default_value_for = {
|
||||
dependencies = ["activerecord"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03zln3mp8wa734jl7abd6gby08xq8j6n4y2phzxfsssscx8xrlim";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.0";
|
||||
};
|
||||
deprecation_toolkit = {
|
||||
dependencies = ["activesupport"];
|
||||
groups = ["development" "test"];
|
||||
|
@ -1083,6 +1137,17 @@ src:
|
|||
};
|
||||
version = "2.1.2";
|
||||
};
|
||||
descendants_tracker = {
|
||||
dependencies = ["thread_safe"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.4";
|
||||
};
|
||||
device_detector = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
@ -1305,6 +1370,26 @@ src:
|
|||
};
|
||||
version = "1.4.0";
|
||||
};
|
||||
dumb_delegator = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "151fdn7y0gqs7f6y3y7rn3frv0z359qrw9hb4s7avn6j2qc42ppz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
duo_api = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xk1437b5vrjg8prk2khsva5rkx3apsj7c46n3yk5b8g34787jc7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
};
|
||||
e2mmap = {
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
|
@ -1845,10 +1930,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "130y73isnky4kgqwr1jhci3b51ld4i9r5a7132q6aq8cx8qjjx89";
|
||||
sha256 = "0127b2jx7lj82h96sm0rnmlgqzgiz5013m6z27vxnkmwrw78iigl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.15.0";
|
||||
version = "3.18.0";
|
||||
};
|
||||
fog-core = {
|
||||
dependencies = ["builder" "excon" "formatador" "mime-types"];
|
||||
|
@ -1894,28 +1979,6 @@ src:
|
|||
};
|
||||
version = "0.8.0";
|
||||
};
|
||||
fog-openstack = {
|
||||
dependencies = ["fog-core" "fog-json" "ipaddress"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.8";
|
||||
};
|
||||
fog-rackspace = {
|
||||
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
};
|
||||
fog-xml = {
|
||||
dependencies = ["fog-core" "nokogiri"];
|
||||
groups = ["default"];
|
||||
|
@ -1969,6 +2032,17 @@ src:
|
|||
};
|
||||
version = "0.9.0";
|
||||
};
|
||||
gapic-common = {
|
||||
dependencies = ["faraday" "faraday-retry" "google-protobuf" "googleapis-common-protos" "googleapis-common-protos-types" "googleauth" "grpc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1awn2k5b2sji74vr0xhg0v68h1y0msqpkwq5z8k31mp2ii9mmmbg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.18.0";
|
||||
};
|
||||
gemoji = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
|
@ -2073,10 +2147,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kg5nyp1lfqlksrh4dlnq8a4nhdbhhiwm4hif2smlmqcwr1bri9m";
|
||||
sha256 = "0zhsdnr3zbsym6j689d039hrd9if07jbircyl6ns4f5abwhc7w3y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
};
|
||||
gitlab-experiment = {
|
||||
dependencies = ["activesupport" "request_store"];
|
||||
|
@ -2106,10 +2180,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04xi2b9wna2z7qw6cdlypfibp5wnf30xn80dlpbdz0sc063bvvdx";
|
||||
sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.30.1";
|
||||
version = "0.31.1";
|
||||
};
|
||||
gitlab-license = {
|
||||
groups = ["default"];
|
||||
|
@ -2403,6 +2477,17 @@ src:
|
|||
};
|
||||
version = "1.3.0";
|
||||
};
|
||||
google-cloud-profiler-v2 = {
|
||||
dependencies = ["gapic-common" "google-cloud-errors"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qyknlvwji7vqhani490cacsrzlqfza10hv47him93yhfnqjmz2k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.0";
|
||||
};
|
||||
google-cloud-storage = {
|
||||
dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
|
||||
groups = ["default"];
|
||||
|
@ -2419,10 +2504,21 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab";
|
||||
sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.21.12";
|
||||
version = "3.22.2";
|
||||
};
|
||||
googleapis-common-protos = {
|
||||
dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10p3kl9xdxl4xsijkj2l6qn525xchkbfhx3ch603ammibbxq08ys";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
};
|
||||
googleapis-common-protos-types = {
|
||||
dependencies = ["google-protobuf"];
|
||||
|
@ -2430,10 +2526,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0w860lqs5j6n58a8qn4wr16hp0qz7cq5h67dgma04gncjwqiyhf5";
|
||||
sha256 = "12w5bwaziz2iqb9dvgnskp2a7ifml6n4lyl9ypvnxj5bfrrwysap";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "1.5.0";
|
||||
};
|
||||
googleauth = {
|
||||
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
|
||||
|
@ -2784,10 +2880,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jn1y6sfxpfaq0hcblv8hhyxzam8n39kvypi07q2vxaimh6ly7mj";
|
||||
sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
};
|
||||
http-accept = {
|
||||
groups = ["default"];
|
||||
|
@ -2883,6 +2979,16 @@ src:
|
|||
};
|
||||
version = "0.16.4";
|
||||
};
|
||||
ice_nine = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.11.2";
|
||||
};
|
||||
imagen = {
|
||||
dependencies = ["parser"];
|
||||
groups = ["coverage" "default" "development" "test"];
|
||||
|
@ -3133,10 +3239,11 @@ src:
|
|||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
path = "${src}/vendor/gems/kubeclient";
|
||||
type = "path";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.9.4.pre.gitlab1";
|
||||
version = "4.11.0";
|
||||
};
|
||||
launchy = {
|
||||
dependencies = ["addressable"];
|
||||
|
@ -3154,10 +3261,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07bh4ns9b58nrjjsfx2r69ki56f7nclcczsravkj9ilgw1lagm0z";
|
||||
sha256 = "0pfwsag1zm990mk8sgagnzkanaf7c6k6dnwf32pnmbdbs2csfsc2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.9";
|
||||
version = "1.3.3";
|
||||
};
|
||||
letter_opener = {
|
||||
dependencies = ["launchy"];
|
||||
|
@ -3652,6 +3759,17 @@ src:
|
|||
};
|
||||
version = "2.1.3";
|
||||
};
|
||||
net-protocol = {
|
||||
dependencies = ["timeout"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.3";
|
||||
};
|
||||
net-scp = {
|
||||
dependencies = ["net-ssh"];
|
||||
groups = ["default"];
|
||||
|
@ -3709,10 +3827,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj";
|
||||
sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.1";
|
||||
version = "1.14.2";
|
||||
};
|
||||
notiffany = {
|
||||
dependencies = ["nenv" "shellany"];
|
||||
|
@ -4047,14 +4165,15 @@ src:
|
|||
version = "2.2.2";
|
||||
};
|
||||
openssl-signature_algorithm = {
|
||||
dependencies = ["openssl"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "14d95jr5z6dgvpwf52p7ckjf3w3cihin2k6g9599711pfxdj4fp5";
|
||||
sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.0";
|
||||
version = "1.3.0";
|
||||
};
|
||||
opentracing = {
|
||||
groups = ["default"];
|
||||
|
@ -4283,10 +4402,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "095gq9sr6pab1jzbvn3pjs7i1p5hnlasnhvq2xdfsvxjyw33fvbn";
|
||||
sha256 = "0zcw8yx7c2mmmcl3kq7nswansshcpxzqjbxf61xqfydbmhd5z2vi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.17.0";
|
||||
version = "0.19.1";
|
||||
};
|
||||
pry = {
|
||||
dependencies = ["coderay" "method_source"];
|
||||
|
@ -4864,10 +4983,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3";
|
||||
sha256 = "046xwhfhi2krmbaqmg9vshf01vzld8smczx6dwppinv61ndc2vqg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.30.0";
|
||||
version = "4.1.0";
|
||||
};
|
||||
rqrcode = {
|
||||
dependencies = ["chunky_png"];
|
||||
|
@ -4947,15 +5066,37 @@ src:
|
|||
version = "3.12.3";
|
||||
};
|
||||
rspec-parameterized = {
|
||||
dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
|
||||
dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0m142sp884z3k3xd42ngf0n8a83hvcihcj1n66qyxlgdnl3sqqzi";
|
||||
sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
version = "1.0.0";
|
||||
};
|
||||
rspec-parameterized-core = {
|
||||
dependencies = ["parser" "proc_to_ast" "rspec" "unparser"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
rspec-parameterized-table_syntax = {
|
||||
dependencies = ["binding_of_caller" "rspec-parameterized-core"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
rspec-rails = {
|
||||
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
|
||||
|
@ -5105,10 +5246,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m91qhhh2sakmd6kznipmwwb3i2qlfx40fpnj4vsh40d2f2v25rc";
|
||||
sha256 = "00b15fd74bkrxfqbx1gg2nw78fs7lvmn8mf92bway8vxgf3kh8bv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.4";
|
||||
version = "0.6.0";
|
||||
};
|
||||
ruby-progressbar = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
@ -5299,16 +5440,6 @@ src:
|
|||
};
|
||||
version = "0.1.1";
|
||||
};
|
||||
securecompare = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ay65wba4i7bvfqyvf5i4r48q6g70s5m724diz9gdvdavscna36b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
seed-fu = {
|
||||
dependencies = ["activerecord" "activesupport"];
|
||||
groups = ["default"];
|
||||
|
@ -5705,10 +5836,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bpmrz2vw59gw556y5hsha3xlrvfv4qwck4wg2r39qf2bp2hcr1b";
|
||||
sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.21";
|
||||
version = "0.2.23";
|
||||
};
|
||||
state_machines = {
|
||||
groups = ["default"];
|
||||
|
@ -5921,6 +6052,16 @@ src:
|
|||
};
|
||||
version = "1.2.1";
|
||||
};
|
||||
thread_safe = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.6";
|
||||
};
|
||||
thrift = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
@ -5951,6 +6092,16 @@ src:
|
|||
};
|
||||
version = "0.3.10";
|
||||
};
|
||||
timeout = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.2";
|
||||
};
|
||||
timfel-krb5-auth = {
|
||||
groups = ["default" "kerberos"];
|
||||
platforms = [];
|
||||
|
@ -5994,15 +6145,15 @@ src:
|
|||
version = "1.3.0";
|
||||
};
|
||||
tpm-key_attestation = {
|
||||
dependencies = ["bindata" "openssl-signature_algorithm"];
|
||||
dependencies = ["bindata" "openssl" "openssl-signature_algorithm"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kdqyanz211wmxjzfiz2wg17gj6p4431qvjr0i6sp3d6268sssg4";
|
||||
sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.0";
|
||||
version = "0.12.0";
|
||||
};
|
||||
trailblazer-option = {
|
||||
groups = ["default"];
|
||||
|
@ -6062,10 +6213,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "14nwxdh5yr2xlpgxjqmdgjlrj1h9ddpc1r00sp1jxp1sc7jsqbq6";
|
||||
sha256 = "04f599zn5rfndq4d9l0acllfpc041bzdkkz2h6x0dl18f2wivn0y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
};
|
||||
tty-prompt = {
|
||||
dependencies = ["pastel" "tty-reader"];
|
||||
|
@ -6220,10 +6371,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0246c6j1lbi6jgga3n2br1nyvnwzh1bz0r9yca5d4cihb100byja";
|
||||
sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.0";
|
||||
version = "0.6.7";
|
||||
};
|
||||
uri_template = {
|
||||
groups = ["default"];
|
||||
|
@ -6310,6 +6461,17 @@ src:
|
|||
};
|
||||
version = "2.74.1";
|
||||
};
|
||||
virtus = {
|
||||
dependencies = ["axiom-types" "coercible" "descendants_tracker"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hniwgbdsjxa71qy47n6av8faf8qpwbaapms41rhkk3zxgjdlhc8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
};
|
||||
vmstat = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
@ -6342,15 +6504,15 @@ src:
|
|||
version = "1.3.0";
|
||||
};
|
||||
webauthn = {
|
||||
dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"];
|
||||
dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "tpm-key_attestation"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17nqmi6n4s3i6pmcd7myf7w49q9xd5xlcvz9vbqijlm4yicyxywn";
|
||||
sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "3.0.0";
|
||||
};
|
||||
webfinger = {
|
||||
dependencies = ["activesupport" "httpclient"];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitmux";
|
||||
version = "0.9.1";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QbQykbZo8fMyCMd0MF7CGrPFECN0ehcTGGLeQXbnlxw=";
|
||||
sha256 = "sha256-4QsmBhYIA2GpdEhyXsx2eyH7ObuGZTf2Hlsyd+Ntlj4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-talZSkf8lQXwXKdkQliHFv2K+42BFtcg13oB5Szkff0=";
|
||||
|
|
|
@ -11,86 +11,77 @@
|
|||
, wayland
|
||||
, wlroots
|
||||
, xcbutilcursor
|
||||
, pulseaudio
|
||||
}:
|
||||
|
||||
let
|
||||
unwrapped = python3Packages.buildPythonPackage rec {
|
||||
pname = "qtile";
|
||||
version = "0.22.1";
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "qtile";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qtile";
|
||||
repo = "qtile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-restart.patch # https://github.com/NixOS/nixpkgs/issues/139568
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libqtile/pangocffi.py \
|
||||
--replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
|
||||
--replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \
|
||||
--replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0
|
||||
substituteInPlace libqtile/backend/x11/xcursors.py \
|
||||
--replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0
|
||||
'';
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
] ++ (with python3Packages; [
|
||||
setuptools-scm
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
xcffib
|
||||
(cairocffi.override { withXcffib = true; })
|
||||
setuptools
|
||||
python-dateutil
|
||||
dbus-python
|
||||
dbus-next
|
||||
mpd2
|
||||
psutil
|
||||
pyxdg
|
||||
pygobject3
|
||||
pywayland
|
||||
pywlroots
|
||||
xkbcommon
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libinput
|
||||
wayland
|
||||
wlroots
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
# for `qtile check`, needs `stubtest` and `mypy` commands
|
||||
makeWrapperArgs = [
|
||||
"--suffix PATH : ${lib.makeBinPath [ mypy ]}"
|
||||
];
|
||||
|
||||
doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.qtile.org/";
|
||||
license = licenses.mit;
|
||||
description = "A small, flexible, scriptable tiling window manager written in Python";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kamilchm ];
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "qtile";
|
||||
repo = "qtile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8=";
|
||||
};
|
||||
in
|
||||
(python3.withPackages (_: [ unwrapped ])).overrideAttrs (_: {
|
||||
# otherwise will be exported as "env", this restores `nix search` behavior
|
||||
name = "${unwrapped.pname}-${unwrapped.version}";
|
||||
# export underlying qtile package
|
||||
passthru = { inherit unwrapped; };
|
||||
|
||||
# restore original qtile attrs
|
||||
inherit (unwrapped) pname version meta;
|
||||
})
|
||||
patches = [
|
||||
./fix-restart.patch # https://github.com/NixOS/nixpkgs/issues/139568
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libqtile/pangocffi.py \
|
||||
--replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
|
||||
--replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \
|
||||
--replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0
|
||||
substituteInPlace libqtile/backend/x11/xcursors.py \
|
||||
--replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0
|
||||
'';
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
] ++ (with python3Packages; [
|
||||
setuptools-scm
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
xcffib
|
||||
(cairocffi.override { withXcffib = true; })
|
||||
setuptools
|
||||
python-dateutil
|
||||
dbus-python
|
||||
dbus-next
|
||||
mpd2
|
||||
psutil
|
||||
pyxdg
|
||||
pygobject3
|
||||
pywayland
|
||||
pywlroots
|
||||
xkbcommon
|
||||
pulseaudio
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libinput
|
||||
wayland
|
||||
wlroots
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
# for `qtile check`, needs `stubtest` and `mypy` commands
|
||||
makeWrapperArgs = [
|
||||
"--suffix PATH : ${lib.makeBinPath [ mypy ]}"
|
||||
];
|
||||
|
||||
doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.qtile.org/";
|
||||
license = licenses.mit;
|
||||
description = "A small, flexible, scriptable tiling window manager written in Python";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kamilchm arjan-s ];
|
||||
};
|
||||
}
|
||||
|
|
9
pkgs/applications/window-managers/qtile/wrapper.nix
Normal file
9
pkgs/applications/window-managers/qtile/wrapper.nix
Normal file
|
@ -0,0 +1,9 @@
|
|||
{ python3, qtile-unwrapped }:
|
||||
(python3.withPackages (_: [ qtile-unwrapped ])).overrideAttrs (_: {
|
||||
# otherwise will be exported as "env", this restores `nix search` behavior
|
||||
name = "${qtile-unwrapped.pname}-${qtile-unwrapped.version}";
|
||||
# export underlying qtile package
|
||||
passthru = { unwrapped = qtile-unwrapped; };
|
||||
# restore original qtile attrs
|
||||
inherit (qtile-unwrapped) pname version meta;
|
||||
})
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
args @ {
|
||||
name
|
||||
, version ? null
|
||||
, runScript ? "bash"
|
||||
, extraInstallCommands ? ""
|
||||
, meta ? {}
|
||||
|
@ -24,6 +25,7 @@ let
|
|||
env = buildFHSEnv (removeAttrs args [
|
||||
"runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent"
|
||||
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
|
||||
"version"
|
||||
]);
|
||||
|
||||
etcBindEntries = let
|
||||
|
@ -203,7 +205,11 @@ let
|
|||
|
||||
bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; });
|
||||
|
||||
in runCommandLocal name {
|
||||
versionStr = lib.optionalString (version != null) ("-" + version);
|
||||
|
||||
nameAndVersion = name + versionStr;
|
||||
|
||||
in runCommandLocal nameAndVersion {
|
||||
inherit meta;
|
||||
|
||||
passthru = passthru // {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ callPackage, runCommandLocal, writeScript, stdenv, coreutils }:
|
||||
{ lib, callPackage, runCommandLocal, writeScript, stdenv, coreutils }:
|
||||
|
||||
let buildFHSEnv = callPackage ./env.nix { }; in
|
||||
|
||||
args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }:
|
||||
args@{ name, version ? null, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }:
|
||||
|
||||
let
|
||||
env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]);
|
||||
env = buildFHSEnv (removeAttrs args [ "version" "runScript" "extraInstallCommands" "meta" "passthru" ]);
|
||||
|
||||
chrootenv = callPackage ./chrootenv {};
|
||||
|
||||
|
@ -23,7 +23,11 @@ let
|
|||
exec ${run} "$@"
|
||||
'';
|
||||
|
||||
in runCommandLocal name {
|
||||
versionStr = lib.optionalString (version != null) ("-" + version);
|
||||
|
||||
nameAndVersion = name + versionStr;
|
||||
|
||||
in runCommandLocal nameAndVersion {
|
||||
inherit meta;
|
||||
|
||||
passthru = passthru // {
|
||||
|
|
|
@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
description = "The theme from libadwaita ported to GTK-3";
|
||||
homepage = "https://github.com/lassekongo83/adw-gtk3";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ciferkey ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-clipman-plugin";
|
||||
version = "1.6.2";
|
||||
sha256 = "sha256-RpFVJSq/DxyA5ne1h+Nr3xfL+DTzg1cTqIDVOPC/pF4=";
|
||||
version = "1.6.3";
|
||||
sha256 = "sha256-tnpQRYLV48NxKsWDjVSmypx6X1bVbx2U5Q8kQaP0AW8=";
|
||||
|
||||
buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ];
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hip-${hipPlatform}";
|
||||
version = "5.4.3";
|
||||
version = "5.4.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
|
@ -213,8 +213,8 @@ let
|
|||
platforms = lua.meta.platforms;
|
||||
# add extra maintainer(s) to every package
|
||||
maintainers = (meta.maintainers or []) ++ [ ];
|
||||
broken = disabled;
|
||||
} // meta;
|
||||
}));
|
||||
in
|
||||
assert (disabled -> throw "${pname} not supported for interpreter ${lua.executable}");
|
||||
luarocksDrv
|
||||
|
|
31
pkgs/development/libraries/cppcodec/default.nix
Normal file
31
pkgs/development/libraries/cppcodec/default.nix
Normal file
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cppcodec";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tplgy";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-k4EACtDOSkTXezTeFtVdM1EVJjvGga/IQSrvDzhyaXw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Header-only C++11 library for encode/decode functions as in RFC 4648";
|
||||
longDescription = ''
|
||||
Header-only C++11 library to encode/decode base64, base64url, base32,
|
||||
base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus
|
||||
Crockford's base32.
|
||||
'';
|
||||
homepage = "https://github.com/tplgy/cppcodec";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ panicgh raitobezarius ];
|
||||
};
|
||||
})
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fizz";
|
||||
version = "2023.03.06.00";
|
||||
version = "2023.03.20.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookincubator";
|
||||
repo = "fizz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zb3O5YHQc+1cPcL0K3FwhMfr+/KFQU7SDVT1bEITF6E=";
|
||||
hash = "sha256-oBdTj7IPlmtF5rEgDVN/wwa0ZxkN6h2QMN3PQB0nCgQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "C++14 implementation of the TLS-1.3 standard";
|
||||
homepage = "https://github.com/facebookincubator/fizz";
|
||||
changelog = "https://github.com/facebookincubator/fizz/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ pierreis kylesferrazza ];
|
||||
|
|
41
pkgs/development/libraries/libnitrokey/default.nix
Normal file
41
pkgs/development/libraries/libnitrokey/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, hidapi
|
||||
, libusb1
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libnitrokey";
|
||||
version = "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nitrokey";
|
||||
repo = "libnitrokey";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9ZMR1g04gNzslax6NpD6KykfUfjpKFIizaMMn06iJa0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DADD_GIT_INFO=OFF"
|
||||
"-DCMAKE_INSTALL_UDEVRULESDIR=etc/udev/rules.d"
|
||||
];
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
propagatedBuildInputs = [ hidapi ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Communicate with Nitrokey devices in a clean and easy manner";
|
||||
homepage = "https://github.com/Nitrokey/libnitrokey";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ panicgh raitobezarius ];
|
||||
};
|
||||
})
|
|
@ -39,6 +39,14 @@ stdenv.mkDerivation rec {
|
|||
libva
|
||||
];
|
||||
|
||||
# Note: Attempt to remove on next release after 0.0.9
|
||||
# nixpkgs reference: https://github.com/NixOS/nixpkgs/pull/221978#issuecomment-1483892437
|
||||
# upstream: https://github.com/elFarto/nvidia-vaapi-driver/issues/188
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=format="
|
||||
"-Wno-error=int-conversion"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so"
|
||||
'';
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-monitor";
|
||||
version = "5.0.1";
|
||||
version = "6.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-U5OSFnOZV7/eXUEDU1TQBywrXjxwQ8qiEQJVFd3y57Q=";
|
||||
hash = "sha256-Uhs+wz3sB5mOt1LGJCqzhMT5YWwwMnpmVi4WvXHBfZY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ absl-py
|
||||
, buildPythonPackage
|
||||
, cloudpickle
|
||||
, dm-tree
|
||||
, fetchFromGitHub
|
||||
, jax
|
||||
|
@ -24,6 +25,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
cloudpickle
|
||||
dm-tree
|
||||
jax
|
||||
numpy
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.2.11";
|
||||
version = "2023.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Nrq7Bc9Lzdle8/rINp/GPy+DWANgMe7WCLP48gHohIo=";
|
||||
hash = "sha256-ZclhJoJg80P0iysA0G7+gTg8S3qJaaAbHsr4v6DUGKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lightwave2";
|
||||
version = "0.8.21";
|
||||
version = "0.8.22";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Zgsgt78ll/5NVSca4lnxXYkiw5FE2WgcO10o/IZaHgQ=";
|
||||
hash = "sha256-YrvRlSogw9YSuOvm4PfjrKGvgiBqdXAO9CKqGcBBH0g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
, sphinx-togglebutton
|
||||
, typing-extensions
|
||||
, ipykernel
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -29,7 +30,10 @@ buildPythonPackage rec {
|
|||
hash = "sha256-FN9yXz4Ay17+9PhjvwwnNJDIxmLf7jntins3S/JWGTM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
importlib-metadata
|
||||
|
@ -45,6 +49,10 @@ buildPythonPackage rec {
|
|||
ipykernel
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"myst-parser"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "myst_nb" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "niapy";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "NiaOrg";
|
||||
repo = "NiaPy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bZ9bONFntNx5tcm/gR/uPS5CqicJX281WsvSno8aVlY=";
|
||||
hash = "sha256-qstTxUo4jZ8YKbEjtDtSZUvR67VNkBQJdXeERJPOMDw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeconz";
|
||||
version = "110";
|
||||
version = "111";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2eHKFq+urzJS3K55O0hca0h4ElowJZD6nIkYkzyBFCM=";
|
||||
hash = "sha256-QBun9VT42W9EMvNuLZoe6VnXKXAKEXstDKCU7LXEvNQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pytestCheckHook
|
||||
, writeText
|
||||
, autograd
|
||||
|
@ -19,13 +20,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymoo";
|
||||
version = "0.6.0";
|
||||
version = "0.6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyoptimization";
|
||||
repo = "pymoo";
|
||||
rev = version;
|
||||
hash = "sha256-dzKr+u84XmPShWXFjH7V9KzwJPGZz3msGOe1S7FlGTQ=";
|
||||
hash = "sha256-+qtW7hfSo266n1SRzAgHIu99W5Sl+NYbKOHXv/JI9IA=";
|
||||
};
|
||||
|
||||
pymoo_data = fetchFromGitHub {
|
||||
|
@ -35,6 +36,14 @@ buildPythonPackage rec {
|
|||
hash = "sha256-iGWPepZw3kJzw5HKV09CvemVvkvFQ38GVP+BAryBSs0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/anyoptimization/pymoo/pull/407
|
||||
(fetchpatch {
|
||||
url = "https://github.com/anyoptimization/pymoo/commit/be57ece64275469daece1e8ef12b2b6ee05362c9.diff";
|
||||
hash = "sha256-BLPrUqNbAsAecfYahESEJF6LD+kehUYmkTvl/nvyqII=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "cma==3.2.2" "cma" \
|
||||
|
|
|
@ -1,21 +1,22 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, multipledispatch
|
||||
, numpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.10.3";
|
||||
pname = "pyrr";
|
||||
version = "unstable-2022-07-22";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3c0f7b20326e71f706a610d58f2190fff73af01eef60c19cb188b186f0ec7e1d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "adamlwgriffiths";
|
||||
repo = "Pyrr";
|
||||
rev = "f6c8698c48a75f3fb7ad0d47d0ce80a04f87ba2f";
|
||||
hash = "sha256-u9O52MQskZRzw0rBH6uPdXdikWLJe7wyBZGNKIFA4BA=";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools ];
|
||||
propagatedBuildInputs = [ multipledispatch numpy ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, asynctest
|
||||
, bleak
|
||||
, click
|
||||
, buildPythonPackage
|
||||
|
@ -15,12 +14,12 @@ buildPythonPackage rec {
|
|||
version = "0.4.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emlove";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8=";
|
||||
};
|
||||
|
||||
|
@ -37,8 +36,6 @@ buildPythonPackage rec {
|
|||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
asynctest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, xorgserver
|
||||
, pulseaudio
|
||||
, pytest-asyncio
|
||||
, qtile
|
||||
, qtile-unwrapped
|
||||
, keyring
|
||||
, requests
|
||||
, stravalib
|
||||
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
qtile.unwrapped
|
||||
qtile-unwrapped
|
||||
pulseaudio
|
||||
keyring
|
||||
requests
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "soxr";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
repo = "python-soxr";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-g8YS5YgK1uK1kKtR/wn8x5DAUVY/hYmuMIgjgJAC8pM=";
|
||||
hash = "sha256-/NFGzOF1X9c0yccgtVNUO+1aIWoNdJqP/OKcNj+uKpk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "3.7.5";
|
||||
version = "3.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MOFC8jMJsBernY1/aFobgBNsnt7MYjSUPVoum0e4hUg=";
|
||||
hash = "sha256-JKKHLg99hl2XnqRfBCT0t9QyQEY1YEwBsKb3pB5CNRA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs-ble";
|
||||
version = "2.1.4";
|
||||
version = "2.1.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FvZ0U8aZNnGehDMt3+LWLYKU/CSPpifWE7STZkA+0iA=";
|
||||
hash = "sha256-B1ncj/5Z+V+mXTW+bY7BXsKjwaH8SgZI6nDZn6Qc754=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
|
@ -28,7 +27,6 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
asynctest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
@ -1,22 +1,15 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, python-engineio
|
||||
, python-socketio
|
||||
, pythonOlder
|
||||
, requests
|
||||
, websocket-client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-me-ws";
|
||||
version = "0.3.1";
|
||||
version = "0.3.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -25,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Z-Wave-Me";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DfQh9wuYx/gCyW3ONk8wwDOgbp8Pifx3nwDgS5NZFhI=";
|
||||
hash = "sha256-d/Y2rZArBywTQE1vsE/B5bEPb48kcEqhDP/xfxJBzJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -33,6 +26,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
websocket-client
|
||||
];
|
||||
|
||||
|
|
27
pkgs/development/tools/exhaustive/default.nix
Normal file
27
pkgs/development/tools/exhaustive/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exhaustive";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nishanths";
|
||||
repo = "exhaustive";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vMoFIyZcAdObeQD5bGcQHlGpJv/a8yl/2HUVc8aDiIA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-i3Cgefe4krvH99N233IeEWkVt9AhdzROkJ5JBeTIaAs=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Check exhaustiveness of switch statements of enum-like constants in Go code";
|
||||
homepage = "https://github.com/nishanths/exhaustive";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ meain ];
|
||||
};
|
||||
}
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
|
@ -17,24 +16,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vala-language-server";
|
||||
version = "0.48.5";
|
||||
version = "0.48.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vala-lang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gntGnz8uqGz2EGwWWyty/N1ImaUKAPtXVZcjgp73SQM=";
|
||||
sha256 = "sha256-Vl5DjKBdpk03aPD+0xGoTwD9Slg1rREorqZGX5o10cY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix regex for links in comments
|
||||
# https://github.com/vala-lang/vala-language-server/pull/268
|
||||
(fetchpatch {
|
||||
url = "https://github.com/vala-lang/vala-language-server/commit/b6193265d68b90755d57938c2ba1895841cf4b36.patch";
|
||||
sha256 = "sha256-nWG+xQAPDVBXamuKQymvn/FBHEP7Ta9p/vhYjxxBGzI=";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
|
37
pkgs/development/tools/misc/rsonpath/default.nix
Normal file
37
pkgs/development/tools/misc/rsonpath/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, withSimd ? true
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsonpath";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v0ldek";
|
||||
repo = "rsonpath";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ip8+Wy9rmTzFccmjYWb3Nk+gkq3g4e1ty/5+ldIOO10=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5V0H2FeHI1SByzLsviOR+qHwYhZGiNmMawCTYjk2P24=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"default-optimizations"
|
||||
] ++ lib.optionals withSimd [
|
||||
"simd"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Blazing fast Rust JSONPath query engine";
|
||||
homepage = "https://github.com/v0ldek/rsonpath";
|
||||
changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
# build fails on platforms without simd support, even when withSimd = false
|
||||
broken = !stdenv.isx86_64;
|
||||
};
|
||||
}
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
pname = "sccache";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "sccache";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6ok8N5y/Wtz4t0414GHT7qc5D2ysw97oKASbKHPLXN8=";
|
||||
sha256 = "sha256-omov7/o1ToWJBTsDXTp3FNLk7PuWGL3J6pNz6n47taU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-dxjVlbnewFdnO294L+9kQE8owlgyPaxepxtmC7V9nGk=";
|
||||
cargoSha256 = "sha256-UkccHrs3q4MlIaK/lo+bPC9Jy/JCBjGzo8jgjZsvEIc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
|
2
pkgs/development/tools/misc/texlab/Cargo.lock
generated
2
pkgs/development/tools/misc/texlab/Cargo.lock
generated
|
@ -1593,7 +1593,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "texlab"
|
||||
version = "5.4.0"
|
||||
version = "5.4.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_unordered",
|
||||
|
|
|
@ -15,13 +15,13 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "5.4.0";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "texlab";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-2P+aidfYkO8l9VjqTstXbksyGTQ3porJhrBYod9oCYQ=";
|
||||
sha256 = "sha256-rTYcYq8SL404A/ke5Rb9QcCtwHKhs+84TQGNqRn11HM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "twilio-cli";
|
||||
version = "5.4.2";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-Zrn+4/zeqJXkKOSsbpPR2bO+ilApn8JUVAgqWydv/Is=";
|
||||
sha256 = "sha256-ZY0AiT1hrxsBXnIkBcoB5d2s8Cc/N7qmVGjuYm2DvOM=";
|
||||
};
|
||||
|
||||
buildInputs = [ nodejs ];
|
||||
|
@ -21,15 +21,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = testers.testVersion {
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "twilio version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unleash the power of Twilio from your command prompt";
|
||||
homepage = "https://github.com/twilio/twilio-cli";
|
||||
changelog = "https://github.com/twilio/twilio-cli/blob/${version}/CHANGES.md";
|
||||
changelog = "https://github.com/twilio/twilio-cli/blob/${finalAttrs.version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
platforms = nodejs.meta.platforms;
|
||||
|
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "viceroy";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6D+P7fQBhLYuAw9bIVgEU4Zi18kBLUn/4jr1E8cFugU=";
|
||||
hash = "sha256-Q/FLvZqmih3StVmLvEmJ5tY7Lz3dqFPUEn9HNubLNMY=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoHash = "sha256-URBtmMR61K1/LtIt3Q3tfQ4viZPvoiumR2LudcpYk6s=";
|
||||
cargoHash = "sha256-SCaP6JtLztIO9Od75i4GkMPbLqpf52sAZVPHG86VcX0=";
|
||||
|
||||
cargoTestFlags = [
|
||||
"--package viceroy-lib"
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "yq-go";
|
||||
version = "4.32.2";
|
||||
version = "4.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gP5Ah/KVWtmEl1CUKge5XdsYwoAAdNabb10b0pdN0tk=";
|
||||
hash = "sha256-Ur6Ro4i184kJKRBpF++crGOBpl9GDMdNrH4h/ftaGxo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/7ah71isg0GB9PncNamMKaW2cW+EMN2BaPqP7gsLMmg=";
|
||||
vendorHash = "sha256-o/Bn2YUXU+qKxRGFzIfhV9t1gVhfFOERAlTGHD5mxD0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
37
pkgs/games/xgalaga++/default.nix
Normal file
37
pkgs/games/xgalaga++/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, libX11
|
||||
, libXpm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xgalaga++";
|
||||
version = "0.9";
|
||||
src = fetchurl {
|
||||
url = "https://marc.mongenet.ch/OSS/XGalaga/xgalaga++_${version}.tar.gz";
|
||||
sha256 = "sha256-yNtLuYCMHLvQAVM7CDGPardrh3q27TE9l31qhUbMf8k=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXpm
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
make all HIGH_SCORES_FILE=.xgalaga++.scores
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/man
|
||||
mv xgalaga++ $out/bin
|
||||
mv xgalaga++.6x $out/share/man
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://marc.mongenet.ch/OSS/XGalaga/";
|
||||
description = "XGalaga++ is a classic single screen vertical shoot ’em up. It is inspired by XGalaga and reuses most of its sprites.";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -10,15 +10,15 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "urbit";
|
||||
version = "1.22";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-wYXFromLV1BCiSWlzphtCSBOWacQ3yC7i2kxxH4y88Y=";
|
||||
aarch64-linux = "sha256-t3waCv2hwkchWPlfx1bsKKB6imp7F6scRnZUQSwS6fI=";
|
||||
x86_64-darwin = "sha256-x5Gr6z5ma+0AF7DEXJpqG+yg3ym+w2ULTqfpdLjfHGo=";
|
||||
aarch64-darwin = "sha256-vvGZoN+Yi6FZDblhxwDzRneVtWaFFaOjyRG7017BzZI=";
|
||||
x86_64-linux = "sha256-GqxgbJCLjXcXHT49fJL1IUJmh9oL4Lfokt7HqzshtWw=";
|
||||
aarch64-linux = "sha256-3+S5EnyvTBKxkFbV7fg+qVDFLr25jMeDwb+MuqDJHMg=";
|
||||
x86_64-darwin = "sha256-VO2dnNqbgyPKvZVMC0CG15JAaBelzcnkifmbZMS+38Y=";
|
||||
aarch64-darwin = "sha256-RbpeIA5LYCUkhyLMo3dYvUe7uLyOD4Ey7qCvIg5JQAg=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, callPackage, fetchpatch, fetchurl, stdenv, pkgsi686Linux }:
|
||||
{ lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, stdenv, pkgsi686Linux }:
|
||||
|
||||
let
|
||||
generic = args: let
|
||||
|
@ -98,7 +98,28 @@ rec {
|
|||
persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns=";
|
||||
};
|
||||
|
||||
legacy_340 = generic {
|
||||
legacy_340 = let
|
||||
# Source cooresponding to https://aur.archlinux.org/packages/nvidia-340xx-dkms
|
||||
aurPatches = fetchFromGitHub {
|
||||
owner = "archlinux-jerry";
|
||||
repo = "nvidia-340xx";
|
||||
rev = "fe2b38e66f2199777bcede6eb35c5df0210f15dc";
|
||||
hash = "sha256-hPFfzWGo2jF/DLm1OkP+BBnRY69N8kKUZ1EGkoHJlKA=";
|
||||
};
|
||||
patchset = [
|
||||
"0001-kernel-5.7.patch"
|
||||
"0002-kernel-5.8.patch"
|
||||
"0003-kernel-5.9.patch"
|
||||
"0004-kernel-5.10.patch"
|
||||
"0005-kernel-5.11.patch"
|
||||
"0006-kernel-5.14.patch"
|
||||
"0007-kernel-5.15.patch"
|
||||
"0008-kernel-5.16.patch"
|
||||
"0009-kernel-5.17.patch"
|
||||
"0010-kernel-5.18.patch"
|
||||
"0011-kernel-6.0.patch"
|
||||
];
|
||||
in generic {
|
||||
version = "340.108";
|
||||
sha256_32bit = "1jkwa1phf0x4sgw8pvr9d6krmmr3wkgwyygrxhdazwyr2bbalci0";
|
||||
sha256_64bit = "06xp6c0sa7v1b82gf0pq0i5p0vdhmm3v964v0ypw36y0nzqx8wf6";
|
||||
|
@ -106,7 +127,7 @@ rec {
|
|||
persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn";
|
||||
useGLVND = false;
|
||||
|
||||
broken = kernel.kernelAtLeast "5.5";
|
||||
patches = [ ./vm_operations_struct-fault.patch ];
|
||||
broken = kernel.kernelAtLeast "6.2";
|
||||
patches = map (patch: "${aurPatches}/${patch}") patchset;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
https://devtalk.nvidia.com/default/topic/1025051/fully-working-patches-2-of-them-for-nvidia-driver-340-104-compiler-installer-file-and-linux-kernels-4-13-amp-4-14/?offset=5
|
||||
--- a/kernel/uvm/nvidia_uvm_lite.c
|
||||
+++ b/kernel/uvm/nvidia_uvm_lite.c
|
||||
@@ -818,8 +818,15 @@ done:
|
||||
}
|
||||
|
||||
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
|
||||
int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
||||
+#else
|
||||
+int _fault(struct vm_fault *vmf)
|
||||
+#endif
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
||||
+ struct vm_area_struct *vma = vmf->vma;
|
||||
+#endif
|
||||
#if defined(NV_VM_FAULT_HAS_ADDRESS)
|
||||
unsigned long vaddr = vmf->address;
|
||||
#else
|
||||
@@ -866,7 +873,11 @@ static struct vm_operations_struct uvmlite_vma_ops =
|
||||
// it's dealing with anonymous mapping (see handle_pte_fault).
|
||||
//
|
||||
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
|
||||
int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
||||
+#else
|
||||
+int _sigbus_fault(struct vm_fault *vmf)
|
||||
+#endif
|
||||
{
|
||||
vmf->page = NULL;
|
||||
return VM_FAULT_SIGBUS;
|
|
@ -256,5 +256,13 @@ in {
|
|||
sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U=";
|
||||
|
||||
isUnstable = true;
|
||||
|
||||
# Necessary for 6.2.8+ and 6.3 compatibility, see https://github.com/openzfs/zfs/issues/14658
|
||||
extraPatches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openzfs/zfs/pull/14668.patch";
|
||||
hash = "sha256-PR7hxxdjLkjszADdw0R0JRmBPfDlsXG6D+VfC7QzEhk=";
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage }:
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage, nixosTests }:
|
||||
|
||||
let
|
||||
inherit (import ./sources.nix { inherit fetchFromGitHub; }) pname version src vendorHash;
|
||||
|
@ -56,6 +56,7 @@ buildGoModule rec {
|
|||
# if overriding replace the postPatch to put your web UI output in internal/server/public_html
|
||||
inherit web;
|
||||
updateScript = ./update.sh;
|
||||
tests = { inherit (nixosTests) authelia; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -5,20 +5,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "microbin";
|
||||
version = "1.1.0";
|
||||
version = "1.2.1";
|
||||
|
||||
# GitHub sources do not have Cargo.lock
|
||||
# The GitHub source is outdated
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gfEO7Rrzc4KSnSXFrMmGLrTXuZIUCdumt2N429nHPi8=";
|
||||
hash = "sha256-OLg0ejs9nanMNlY0lcnJ/RoRwefrXEaaROwx5aPx4u8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-k/5CG8bf5RuO6K9mEj6seqV6AuWMqatBRDaSS0guhi0=";
|
||||
cargoHash = "sha256-XdHP0XruqtyLyGbLHielnmTAc3ZgeIyyZnknO+5k4Xo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tiny, self-contained, configurable paste bin and URL shortener written in Rust";
|
||||
homepage = "https://github.com/szabodanika/microbin";
|
||||
changelog = "https://github.com/szabodanika/microbin/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
maintainers = with maintainers; [ dit7ya figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -29,6 +29,6 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/caarlos0/domain_exporter";
|
||||
description = "Exports the expiration time of your domains as prometheus metrics";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mmilata prusnak peterhoeg ];
|
||||
maintainers = with maintainers; [ mmilata prusnak peterhoeg caarlos0 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "postgres_exporter";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prometheus-community";
|
||||
repo = "postgres_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Bi24tg/ukFLmSbhAY3gZqT7qc0xWwLlLQxGB6F+qiUQ=";
|
||||
sha256 = "sha256-eY9/a+uFJJ8lT+0ZGa+ExjKf0V6JOqI3l1sZbfQEXOc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ocapAJAQD84zISbTduAf3QyjaZ0UroNMdQig6IBNDpw=";
|
||||
vendorSha256 = "sha256-sMWprCRUvF6voLM3GjTq9tId1GoCPac/RE6hXL+LBEE=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
, plugins ? ps: [] }:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
py = python3 // {
|
||||
pkgs = python3.pkgs.overrideScope (self: super: {
|
||||
django = super.django_4;
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
extraBuildInputs = plugins py.pkgs;
|
||||
|
|
|
@ -1,17 +1,19 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }:
|
||||
{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, nixosTests, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wsdd";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "christgau";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9cwzkF2mg6yOIsurLMXTLoEIOsKbPIWMicpWBQ0XVhE=";
|
||||
hash = "sha256-xfZVGi3OxuRI+Zh6L3Ru4J4j5BB1EAN3fllRCVA/c5o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
|
@ -22,7 +24,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm0755 src/wsdd.py $out/bin/wsdd
|
||||
install -Dm0555 src/wsdd.py $out/bin/wsdd
|
||||
installManPage man/wsdd.8
|
||||
wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH"
|
||||
'';
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ let
|
|||
);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.12.1"; # also update communityModules
|
||||
version = "0.12.3"; # also update communityModules
|
||||
pname = "prosody";
|
||||
# The following community modules are necessary for the nixos module
|
||||
# prosody module to comply with XEP-0423 and provide a working
|
||||
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
src = fetchurl {
|
||||
url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-p+y75B8BpCUYBVk6xtFdvGy3XZx6h2x2tFbPdP9LkOU=";
|
||||
sha256 = "sha256-NdoNAx/0YECi1jjgBNQlXiSbYyP+YhLbnd12tAHbIQE=";
|
||||
};
|
||||
|
||||
# A note to all those merging automated updates: Please also update this
|
||||
|
@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
|
|||
# version.
|
||||
communityModules = fetchhg {
|
||||
url = "https://hg.prosody.im/prosody-modules";
|
||||
rev = "cce12a660b98";
|
||||
sha256 = "sha256-dFWS1EFd2wtFnnuU4xKPnBisIdKkgMAvBtsfAEbdLjE=";
|
||||
rev = "3e30799deec2";
|
||||
sha256 = "sha256-oaWs2D5z1LtvhtZMlaZPLNoNNL/1TIZLZwFfC3vtRUo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.53.1";
|
||||
version = "0.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vxCDb4qiq7/19wvtWQRCzGxUz+FvWyeKSQIpsiUtwGs=";
|
||||
hash = "sha256-3MiKivewGl4J/yQJ+wLTwh8w6HO8XuX9/b6mwtbvW3o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto=";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mpd-mpris";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natsukagami";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eI7/E5rhNCZfURwGkfa0f+Yie1EU8zR9r+1eAqrlmVY=";
|
||||
sha256 = "sha256-ryLqGH81Z+5GQ1ROHpCWmCHKSfS8g35b0wCmr8aokWk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0=";
|
||||
vendorHash = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfsprogs";
|
||||
version = "6.1.1";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-BeihN4cNsdYYLfct2pirenEA3rN2lH6FS51ZyRTCx7s=";
|
||||
hash = "sha256-1n3LpaKOCQS2CIa25fdSvHycOlxwlhU4VbWtyp24bFE=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-gtk";
|
||||
version = "5.0.22";
|
||||
version = "5.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-x7KPhXiKy+KQsukIYJWg3k2Wj8tXfUu9jkkwa8vM1WA=";
|
||||
sha256 = "sha256-RMi2D9uqGmvyDIB7eRbr52aahCJ5u21jCyZ9hbCDdKY=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -23,6 +23,6 @@ buildGoModule rec {
|
|||
description = "A `sleep` with progress";
|
||||
homepage = "https://github.com/caarlos0/timer";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zowoq ];
|
||||
maintainers = with maintainers; [ zowoq caarlos0 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "amass";
|
||||
version = "3.22.1";
|
||||
version = "3.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OWASP";
|
||||
repo = "Amass";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hkYN28M2t8SXmIrSEQEWM5ndCx1xgpHThNg0UFzQqLU=";
|
||||
hash = "sha256-q6neBDk/kcvAoih4urRTFmhH6N7Fh/hEJQtL//kqJiI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fZd++VsLcs3MzcM23zE3AVaDPXf+cuLdJp8hsCeEZ1Y=";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }:
|
||||
let
|
||||
version = "2023.1.2";
|
||||
version = "2023.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
|
@ -8,7 +8,7 @@ let
|
|||
"https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
];
|
||||
sha256 = "620829b1a7bf9228e8671273d2f56f6dee4f16662712bcb4370923cb9d9a7540";
|
||||
sha256 = "4e9cd298a03af8684306ca2dfe52e630f032c1df7ca8baecbd329c792137052f";
|
||||
};
|
||||
|
||||
name = "burpsuite-${version}";
|
||||
|
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "A simple deb and rpm packager written in Go";
|
||||
homepage = "https://github.com/goreleaser/nfpm";
|
||||
maintainers = with maintainers; [ marsam techknowlogick ];
|
||||
maintainers = with maintainers; [ marsam techknowlogick caarlos0 ];
|
||||
license = with licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-03-25";
|
||||
version = "2023-03-26";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pmhjSZMnTJn0MDKsCk799DrHBDqvUw8M9wxBx65W9pQ=";
|
||||
hash = "sha256-oUoQNjg14rAs8BAxTOLtYHw9iTwEAsLymObog+GrQw8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "katana";
|
||||
version = "0.0.3";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ax99pmoxlyUGLN2OdIItTNTnO/fDquvNadNnNG6ElEk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OSvkQIpZEMav1dh3DDTqFxoFbc6sWOjhslqVJcUS104=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IJcMIJF2A5DfyBdcIXTbeX72Q/4SAVZ0U3UIQ2H0fEc=";
|
||||
vendorHash = "sha256-u/3MMuq2Zab6k+vPQ0iKQf8k9zMV2aIgIsTee0VUQaI=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
@ -23,6 +23,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "A next-generation crawling and spidering framework";
|
||||
homepage = "https://github.com/projectdiscovery/katana";
|
||||
changelog = "https://github.com/projectdiscovery/katana/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
|
|
|
@ -1,5 +1,13 @@
|
|||
{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkg-config
|
||||
, qtbase, qttranslations, qtsvg, wrapQtAppsHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, qttranslations
|
||||
, wrapQtAppsHook
|
||||
, libnitrokey
|
||||
, cppcodec
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nitrokey-app";
|
||||
|
@ -9,24 +17,25 @@ stdenv.mkDerivation rec {
|
|||
owner = "Nitrokey";
|
||||
repo = "nitrokey-app";
|
||||
rev = "v${version}";
|
||||
sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-c6EC5uuMna07xVHDRFq0UDwuSeopZTmZGZ9ZD5zaq8Y=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
bash-completion
|
||||
hidapi
|
||||
libusb1
|
||||
qtbase
|
||||
qttranslations
|
||||
qtsvg
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
qttranslations
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DADD_GIT_INFO=OFF"
|
||||
"-DBASH_COMPLETION_PATH=share/bash-completion/completions"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libnitrokey
|
||||
cppcodec
|
||||
];
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides extra functionality for the Nitrokey Pro and Storage";
|
||||
|
@ -37,6 +46,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://github.com/Nitrokey/nitrokey-app";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ kaiha ];
|
||||
maintainers = with maintainers; [ kaiha panicgh ];
|
||||
};
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue