ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
- pkgs/development/python-modules/crownstone-cloud/default.nix
- pkgs/development/python-modules/exrex/default.nix
- pkgs/development/python-modules/mkdocs-minify/default.nix
- pkgs/development/python-modules/myjwt/default.nix
- pkgs/development/tools/analysis/checkov/default.nix
This commit is contained in:
Martin Weinelt 2023-03-14 08:14:07 +01:00
commit 6b67186fe9
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
173 changed files with 3214 additions and 1460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maintainers/maintainer-list.nix
View File

@ -2503,6 +2503,12 @@
matrix = "@cawilliamson:nixos.dev";
name = "Christopher A. Williamson";
};
cbleslie = {
email = "cameronleslie@gmail.com";
github = "cbleslie";
githubId = 500963;
name = "C.B.Leslie";
};
cbley = {
email = "claudio.bley@gmail.com";
github = "avdv";
@ -11297,6 +11303,15 @@
githubId = 111265;
name = "Ozan Sener";
};
ostrolucky = {
email = "gabriel.ostrolucky@gmail.com";
github = "ostrolucky";
githubId = 496233;
name = "Gabriel Ostrolucký";
keys = [{
fingerprint = "6611 22A7 B778 6E4A E99A 9D6E C79A D015 19EF B134";
}];
};
otavio = {
email = "otavio.salvador@ossystems.com.br";
github = "otavio";

15
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -127,9 +127,6 @@ if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {
push @kernelModules, "kvm-intel" if hasCPUFeature "vmx";
push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD";
push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel";
# Look at the PCI devices and add necessary modules. Note that most
# modules are auto-detected so we don't need to list them here.
@ -324,11 +321,15 @@ if ($virt eq "systemd-nspawn") {
}
# Provide firmware for devices that are not detected by this script,
# unless we're in a VM/container.
push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")"
if $virt eq "none";
# Check if we're on bare metal, not in a VM/container.
if ($virt eq "none") {
# Provide firmware for devices that are not detected by this script.
push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")";
# Update the microcode.
push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD";
push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel";
}
# For a device name like /dev/sda1, find a more stable path like
# /dev/disk/by-uuid/X or /dev/disk/by-label/Y.

2
nixos/modules/programs/atop.nix
View File

@ -151,6 +151,8 @@ in
if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new
then
${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile"
else
${pkgs.coreutils}/bin/rm -f "$logfile".new
fi
done
'';

2
nixos/modules/services/monitoring/grafana.nix
View File

@ -1300,7 +1300,7 @@ in {
SystemCallFilter = [
"@system-service"
"~@privileged"
] ++ lib.optional (cfg.settings.server.protocol == "socket") [ "@chown" ];
] ++ lib.optionals (cfg.settings.server.protocol == "socket") [ "@chown" ];
UMask = "0027";
};
preStart = ''

2
nixos/modules/services/monitoring/prometheus/default.nix
View File

@ -31,7 +31,7 @@ let
if checkConfigEnabled then
pkgs.runCommandLocal
"${name}-${replaceStrings [" "] [""] what}-checked"
{ buildInputs = [ cfg.package ]; } ''
{ buildInputs = [ cfg.package.cli ]; } ''
ln -s ${file} $out
promtool ${what} $out
'' else file;

2
nixos/tests/garage/default.nix
View File

@ -49,5 +49,5 @@ in
})
{}
[
"0_8_0"
"0_8"
]

4
pkgs/applications/audio/easyeffects/default.nix
View File

@ -37,13 +37,13 @@
stdenv.mkDerivation rec {
pname = "easyeffects";
version = "7.0.0";
version = "7.0.1";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
sha256 = "sha256-SjhJj5kClPd8DT1vzbSdqJ9AJw0XiX9Q8/R8SDnxGPQ=";
sha256 = "sha256-PI29TJSYa/dARlSHe4mO4ejV+muhGFhwVvhA10jziTA=";
};
nativeBuildInputs = [

6
pkgs/applications/audio/musikcube/default.nix
View File

@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
Cocoa SystemConfiguration
] ++ lib.optionals coreaudioSupport [
CoreAudio
] ++ lib.optional sndioSupport [
] ++ lib.optionals sndioSupport [
sndio
] ++ lib.optional pipewireSupport [
] ++ lib.optionals pipewireSupport [
pipewire
];
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
"-DDISABLE_STRIP=true"
];
postFixup = lib.optionals stdenv.isDarwin ''
postFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}
install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d
'';

4
pkgs/applications/editors/l3afpad/default.nix
View File

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA=";
};
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
buildInputs = [ intltool gtk3 ];
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook intltool ];
buildInputs = [ gtk3 ];
meta = with lib; {
description = "Simple text editor forked from Leafpad using GTK+ 3.x";

12
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -7475,6 +7475,18 @@ final: prev:
meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/";
};
searchbox-nvim = buildVimPluginFrom2Nix {
pname = "searchbox-nvim";
version = "2022-11-01";
src = fetchFromGitHub {
owner = "VonHeikemen";
repo = "searchbox.nvim";
rev = "110949af8963185b4e732b45ae57beb731bfcede";
hash = "sha256-Bx4Msp96hlcYVDvDC3gBv78zmde0T5XacxgiZt+LULU=";
};
meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim";
};
securemodelines = buildVimPluginFrom2Nix {
pname = "securemodelines";
version = "2019-02-09";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -628,6 +628,7 @@ https://github.com/lewis6991/satellite.nvim/,HEAD,
https://github.com/tiagovla/scope.nvim/,HEAD,
https://github.com/Xuyuanp/scrollbar.nvim/,,
https://github.com/cakebaker/scss-syntax.vim/,,
https://github.com/VonHeikemen/searchbox.nvim/,,
https://github.com/RobertAudi/securemodelines/,,
https://github.com/megaannum/self/,,
https://github.com/jaxbot/semantic-highlight.vim/,,

12
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "11w2gzhp0vlpygk93cksxhkimc9y8w862gn9450xkzi1jsps5lj4";
x86_64-darwin = "0ya17adx2vbi800ws5sfqq03lrjjk6kbclrfrc2zfij2ha05xl8z";
aarch64-linux = "15kzjs1ha5x2hcq28nkbb0rim1v694jj6p9sz226rai3bmq9airg";
aarch64-darwin = "1cggppblr42jzpcz3g8052w5y1b9392iizpvg6y7001kw66ndp3n";
armv7l-linux = "01qqhhl5ffvba1pk4jj3q7sbahq7cvy81wvmgng1cmaj5b8m8dgp";
x86_64-linux = "0q3wp1n67f8w0j35saf4mlnsfd2481f9yl28428vycq32m10q96k";
x86_64-darwin = "1820a01a97vvv1d2553czv1g2z7mg3f6l8i8168g63zvvnad0f1c";
aarch64-linux = "03gzfp5n6z6dzinsnwpvmmlj0lqa53152a4mylaj1rg540jv2xh7";
aarch64-darwin = "0mbwavi3palh353i19an94hr6xs0i5bxqcvkmr5qv3xvpwlaandl";
armv7l-linux = "0wpnjd9fqlnv360q6061kmi1z699kd4q9igdczp8gwqyz2x4d3yz";
}.${system} or throwSystem;
sourceRoot = if stdenv.isDarwin then "" else ".";
@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.76.0.23062";
version = "1.76.1.23069";
pname = "vscodium";
executableName = "codium";

2
pkgs/applications/emulators/c64-debugger/default.nix
View File

@ -26,13 +26,13 @@ stdenv.mkDerivation {
gtk3
libGL
libGLU
pkg-config
libX11
xcbutil
];
nativeBuildInputs = [
upx
pkg-config
];
postPatch = ''

7
pkgs/applications/emulators/wine/base.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, pkgArches, callPackage, makeSetupHook,
pname, version, src, mingwGccs, monos, geckos, platforms,
bison, flex, fontforge, makeWrapper, pkg-config,
autoconf, hexdump, perl, nixosTests,
nixosTests,
supportFlags,
patches,
moltenvk,
@ -54,11 +54,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
fontforge
makeWrapper
pkg-config
# Required by staging
autoconf
hexdump
perl
]
++ lib.optionals supportFlags.mingwSupport (mingwGccs
++ lib.optional stdenv.isDarwin setupHookDarwin);

8
pkgs/applications/emulators/wine/sources.nix
View File

@ -73,9 +73,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "8.1";
version = "8.3";
url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz";
hash = "sha256-QSDuaz8pTZeq8scwNM8cLL8ToZXJTFx0pkaoH5JBJZg=";
hash = "sha256-QQJpAAKSw7+t0lYf3eBtm8sryVi0mwPpY/FBd6J2MfA=";
inherit (stable) gecko32 gecko64 patches;
mono = fetchurl rec {
@ -105,7 +105,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
hash = "sha256-5AzXXaRGyvfYxd3yXtAlZREv1wp6UqWdDRdnwmKVaUg=";
hash = "sha256-b49WFyiEbkJFUp1n9rz+A1c6iseSfV+5DrpA6AwKa+4=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
@ -113,7 +113,7 @@ in rec {
disabledPatchsets = [ ];
};
wayland = fetchFromGitLab rec {
wayland = fetchFromGitLab {
# https://gitlab.collabora.com/alf/wine/-/tree/wayland
version = "8.0";
hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk=";

11
pkgs/applications/emulators/wine/staging.nix
View File

@ -1,4 +1,4 @@
{ lib, callPackage, wineUnstable }:
{ lib, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:
with callPackage ./util.nix {};
@ -9,17 +9,16 @@ in assert lib.getVersion wineUnstable == patch.version;
(lib.overrideDerivation wineUnstable (self: {
buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs;
name = "${self.name}-staging";
prePatch = self.prePatch or "" + ''
patchShebangs tools
cp -r ${patch}/patches .
cp -r ${patch}/patches ${patch}/staging .
chmod +w patches
cd patches
patchShebangs gitapply.sh
./patchinstall.sh DESTDIR="$PWD/.." --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
cd ..
patchShebangs ./patches/gitapply.sh
python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
'';
})) // {
meta = wineUnstable.meta // {

4
pkgs/applications/file-managers/lf/ctpv.nix
View File

@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
buildInputs = with pkgs; [
ffmpegthumbnailer ffmpeg
] ++ lib.optional waylandSupport [ chafa ]
++ lib.optional x11Support [ ueberzug ];
] ++ lib.optionals waylandSupport [ chafa ]
++ lib.optionals x11Support [ ueberzug ];
makeFlags = [ "PREFIX=$(out)" ];

2
pkgs/applications/misc/citations/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
gtksourceview5
libadwaita
poppler
] ++ lib.optional stdenv.isDarwin [
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation
];

57
pkgs/applications/misc/confy/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ appstream-glib
, desktop-file-utils
, fetchurl
, gobject-introspection
, gtk3
, lib
, libnotify
, libhandy
, meson
, ninja
, pkg-config
, python3
, stdenv
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "confy";
version = "0.6.4";
src = fetchurl {
url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz";
sha256 = "0v74pdyihj7r9gb3k2rkvbphan27ajlvycscd8xzrnsv74lcmbpm";
};
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
wrapGAppsHook
];
buildInputs = [
gobject-introspection
gtk3
libhandy
libnotify
(python3.withPackages (ps: with ps; [
icalendar
pygobject3
]))
];
postPatch = ''
# Remove executable bits so that meson runs the script with our Python interpreter
chmod -x build-aux/meson/postinstall.py
'';
meta = with lib; {
description = "Conferences schedule viewer";
homepage = "https://confy.kirgroup.net/";
changelog = "https://git.sr.ht/~fabrixxm/confy/refs/${version}";
license = licenses.gpl3;
maintainers = with maintainers; [ michaelgrahamevans ];
};
}

9
pkgs/applications/misc/deckmaster/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "deckmaster";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "muesli";
repo = "deckmaster";
rev = "v${version}";
sha256 = "sha256-q2rUHfAvTGXBAGrZUtHMuZr6fYWmpha+al2FG8sCC0Y=";
rev = "refs/tags/v${version}";
hash = "sha256-1hZ7yAKTvkk20ho+QOqFEtspBvFztAtfmITs2uxhdmQ=";
};
vendorSha256 = "sha256-kj4lRHuQ9e0TOC4p4Ak3AB3Lx0JN1jqXaVKlee9EtCg=";
vendorHash = "sha256-d38s5sSvENIou+rlphXIrrOcGOdsvkNaMJlhiXVWN6c=";
proxyVendor = true;
@ -39,6 +39,7 @@ buildGoModule rec {
meta = with lib; {
description = "An application to control your Elgato Stream Deck on Linux";
homepage = "https://github.com/muesli/deckmaster";
changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ianmjones ];
platforms = platforms.linux;

2
pkgs/applications/misc/mediaelch/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
qtsvg
qtwayland
quazip
] ++ lib.optional (qtVersion == "6") [
] ++ lib.optionals (qtVersion == "6") [
qt5compat
];

33
pkgs/applications/misc/monitorcontrol/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, fetchurl, stdenv, undmg }:
# This cannot be built from source due to the problematic nature of XCode - so
# this is what it's like when doves cry?
stdenv.mkDerivation rec {
pname = "MonitorControl";
version = "4.1.0";
src = fetchurl {
url =
"https://github.com/MonitorControl/${pname}/releases/download/v${version}/MonitorControl.${version}.dmg";
sha256 = "iaxM9j78Sq1EH5TCY240N+D5bG6quk2dZj8T7nt9ATo=";
};
nativeBuildInputs = [ undmg ];
sourceRoot = "MonitorControl.app";
installPhase = ''
mkdir -p "$out/Applications/MonitorControl.app"
cp -R . "$out/Applications/MonitorControl.app"
'';
meta = with lib; {
description = "A macOS system extension to control brightness and volume of external displays with native OSD";
longDescription = "Controls your external display brightness and volume and shows native OSD. Use menulet sliders or the keyboard, including native Apple keys!";
homepage = "https://github.com/MonitorControl/MonitorControl#readme";
license = licenses.mit;
maintainers = with maintainers; [ cbleslie ];
platforms = platforms.darwin;
};
}

7
pkgs/applications/misc/shell-genie/default.nix
View File

@ -1,20 +1,19 @@
{ lib
, python3
, fetchFromGitHub
, poetry
}:
with python3.pkgs;
buildPythonPackage rec {
pname = "shell-genie";
version = "0.2.6";
version = "0.2.8";
format = "pyproject";
src = fetchPypi {
pname = "shell_genie";
inherit version;
hash = "sha256-MgQFHsBXrihfWBB/cz45ITf8oJG2gSenf1wzdbrAbjw=";
hash = "sha256-6miqTjiGLK7r6evfchwuAXTHj+JwoH/CqgRoa5+jDJI=";
};
nativeBuildInputs = [
@ -28,7 +27,7 @@ buildPythonPackage rec {
rich
shellingham
typer
];
] ++ typer.optional-dependencies.all;
# No tests available
doCheck = false;

2
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
# "Illegal instruction (core dumped)"
gtk3
gtk4
] ++ lib.optional proprietaryCodecs [
] ++ lib.optionals proprietaryCodecs [
vivaldi-ffmpeg-codecs
];

8
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -21,7 +21,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "5.7.2921.53";
version = "5.7.2921.63";
suffix = {
aarch64-linux = "arm64";
@ -31,8 +31,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-U8mRXXLqBxc+humj4Cz9x5q75KC+H3pXlVe0rp1Hat0=";
x86_64-linux = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8=";
aarch64-linux = "sha256-Os2A3kbeuMIn9TFp8Ze+TwHDYLkVvECJF3UDMsQq5yU=";
x86_64-linux = "sha256-t9CYf3I+IrKjOD96tBZQGR3xwzPrZvnD1JvPMgTjz0M=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
@ -108,6 +108,8 @@ in stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = ./update-vivaldi.sh;
meta = with lib; {
description = "A Browser for our Friends, powerful and personal";
homepage = "https://vivaldi.com";

16
pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts
set -eu -o pipefail
version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
update_hash() {
url="https://downloads.vivaldi.com/stable/vivaldi-stable_$version-1_$2.deb"
hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$url"))
update-source-version vivaldi 0 sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB= --system=$1
update-source-version vivaldi "$version" "$hash" --system=$1
}
update_hash aarch64-linux arm64
update_hash x86_64-linux amd64

15
pkgs/applications/networking/browsers/vivaldi/update.sh
View File

@ -14,26 +14,23 @@ version() {
vivaldi_version_old=$(version vivaldi)
vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then
echo "vivaldi is already up-to-date"
if [[ ! "$vivaldi_version" = "$vivaldi_version_old" ]]; then
echo "vivaldi is not up-to-date, not updating codecs"
(cd "$root" && nix-shell maintainers/scripts/update.nix --argstr package vivaldi)
exit
fi
# Download vivaldi and save hash and file path.
echo "vivaldi is up-to-date, updating codecs"
# Download vivaldi and save file path.
url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}-1_amd64.deb"
mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
hash=${prefetch[0]}
path=${prefetch[1]}
nixpkgs="$(git rev-parse --show-toplevel)"
default_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix"
ffmpeg_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix"
(cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash")
git add "${default_nix}"
git commit -m "vivaldi: ${vivaldi_version_old} -> ${vivaldi_version}"
# Check vivaldi-ffmpeg-codecs version.
chromium_version_old=$(version vivaldi-ffmpeg-codecs)
ffmpeg_update_script=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/update-ffmpeg)

4
pkgs/applications/networking/calls/default.nix
View File

@ -33,7 +33,7 @@
stdenv.mkDerivation rec {
pname = "calls";
version = "43.2";
version = "43.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-gHlhbQGtdIjKLMAkTxfc2QOjvNUPGKKL+OK8/vm0Oac=";
hash = "sha256-GNICAk9SPrLc+zm3tHVwkQdiS20j4MVktGIbNWEEMHs=";
};
outputs = [ "out" "devdoc" ];

6
pkgs/applications/networking/circumflex/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circumflex";
version = "2.8.1";
version = "2.8.2";
src = fetchFromGitHub {
owner = "bensadeh";
repo = "circumflex";
rev = version;
hash = "sha256-hFhK1/ck37lfZJ2wpk1MGCfYEANhh8qzTb8m1t7EoBo=";
hash = "sha256-6g1x19FLC7IdShlcCNlKMuPQX1sBU5+eFr0CzTSu4nE=";
};
vendorHash = "sha256-rwqY6illp5+h/oHOnVg6QfZ6tRFJOamwqJxQx/zlpyI=";
vendorHash = "sha256-rztg2mIuyoqpI9SKQsp0ASMT4HO4h0/bxLX7+xtfLzo=";
nativeBuildInputs = [ makeWrapper ];

8
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -438,22 +438,22 @@
"vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM="
},
"google": {
"hash": "sha256-FdchvDE8aTGKZADeN1peeWMz2jVN4VL1pUf1Tf3e/3E=",
"hash": "sha256-tdsMjgGR9Tmk5wonihYlFqy8wzx60jEfnIh4dujvabY=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.56.0",
"rev": "v4.57.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk="
},
"google-beta": {
"hash": "sha256-u7tGES1uiKpn47msir3rn118eWJsD9bnUAM+HHNZUyA=",
"hash": "sha256-e0Qnlu1O6h9s9+vo9yELifl5AmNNqhQc3Y6XorNCRQ8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.56.0",
"rev": "v4.57.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk="
},

4
pkgs/applications/networking/instant-messengers/bluejeans/default.nix
View File

@ -44,11 +44,11 @@ in
stdenv.mkDerivation rec {
pname = "bluejeans";
version = "2.31.0.83";
version = "2.32.1.3";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
sha256 = "sha256-dzT6S6124l70uYqkB6fGgCpqZBXS2irgwOfkmupN8HU=";
sha256 = "sha256-lsUS7JymCMOa5wlWJOwLFm4KRnAYixi9Kk5CYHB17Ac=";
};
nativeBuildInputs = [ rpmextract makeWrapper ];

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.25";
ptb = "0.0.39";
canary = "0.0.148";
canary = "0.0.149";
} else {
stable = "0.0.264";
ptb = "0.0.59";
@ -22,7 +22,7 @@ let
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk=";
sha256 = "sha256-8DHr7adczIv9FXaxPxSfZPn+8ogWLWHRp9l0JpKhoiY=";
};
};
x86_64-darwin = {

2
pkgs/applications/networking/instant-messengers/nchat/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
readline
sqlite
zlib
] ++ lib.optional stdenv.isDarwin [ AppKit Cocoa Foundation ];
] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Foundation ];
cmakeFlags = [
"-DHAS_WHATSAPP=OFF" # go module build required

64
pkgs/applications/networking/localsend/default.nix Normal file
View File

@ -0,0 +1,64 @@
{ lib, stdenv, appimageTools, fetchurl, undmg }:
let
pname = "localsend";
version = "1.8.0";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage";
hash = "sha256-Setxw0urfJCiHI+Ms+Igroi1CLCgB0H5BsV6RkxyBME=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
hash = "sha256-uVZ/ULhr8CiV/wL9Yaw6q2IYAHNqld606ADKab/EVlU=";
};
};
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
appimageContents = appimageTools.extract { inherit pname version src; };
linux = appimageTools.wrapType2 rec {
inherit pname version src meta;
extraPkgs = p: [ p.libepoxy ];
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${appimageContents}/org.localsend.localsend_app.desktop \
$out/share/applications/${pname}.desktop
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Icon=application-vnd.appimage' 'Icon=${pname}' \
--replace 'Exec=localsend_app' 'Exec=$out/bin/localsend'
install -m 444 -D ${appimageContents}/application-vnd.appimage.svg \
$out/share/icons/hicolor/scalable/apps/${pname}.svg
'';
};
darwin = stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = ".";
installPhase = ''
mkdir -p $out/Applications
cp -r *.app $out/Applications
'';
};
meta = with lib; {
description = "An open source cross-platform alternative to AirDrop";
homepage = "https://localsend.org/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
platforms = builtins.attrNames srcs;
};
in
if stdenv.isDarwin
then darwin
else linux

4
pkgs/applications/office/super-productivity/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "super-productivity";
version = "7.12.2";
version = "7.13.1";
src = fetchurl {
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
sha256 = "sha256-iWKe4l3n5e0CWd2h+tUtbPfmTznJb+UuKo3shAUDs1E=";
sha256 = "sha256-ZZnyPdwzIX0WNywcD2uYxaDG/cbgU8nyiwe0r3YIrs0=";
name = "${pname}-${version}.AppImage";
};

12
pkgs/applications/science/biology/neuron/default.nix
View File

@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
bison
flex
git
] ++ lib.optional useCore [ perl gsl ]
++ lib.optional stdenv.isDarwin [ xcbuild ];
] ++ lib.optionals useCore [ perl gsl ]
++ lib.optionals stdenv.isDarwin [ xcbuild ];
buildInputs = lib.optional useIv [
buildInputs = lib.optionals useIv [
xorg.libX11.dev
xorg.libXcomposite.dev
xorg.libXext.dev
@ -47,11 +47,11 @@ stdenv.mkDerivation rec {
python3.pkgs.setuptools
python3.pkgs.scikit-build
python3.pkgs.matplotlib
] ++ lib.optional useMpi [
] ++ lib.optionals useMpi [
mpi
] ++ lib.optional useMpi [
] ++ lib.optionals useMpi [
python3.pkgs.mpi4py
] ++ lib.optional useRx3d [
] ++ lib.optionals useRx3d [
python3.pkgs.cython
python3.pkgs.numpy
];

4
pkgs/applications/science/math/calc/default.nix
View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "calc";
version = "2.14.1.3";
version = "2.14.1.5";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/v${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
sha256 = "sha256-5aAvYzjAkpLZGf9UE+Ta18Io9EwP769yYlVykiH4qd0=";
sha256 = "sha256-bPacYnEJBdQsIP+Z8D/ODskyEcvhgAy3ra4wasYMo6A=";
};
postPatch = ''

4
pkgs/applications/search/recoll/default.nix
View File

@ -79,9 +79,9 @@ mkDerivation rec {
python3Packages.mutagen
xapian
zlib
] ++ lib.optional withGui [
] ++ lib.optionals withGui [
qtbase
] ++ lib.optional stdenv.isDarwin [
] ++ lib.optionals stdenv.isDarwin [
libiconv
];

34
pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch
View File

@ -8,13 +8,13 @@ Subject: [PATCH] Remove geo from database.yml
1 file changed, 28 deletions(-)
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index 5329a8e9fd7..a4daab1fd0c 100644
index c1b1247b5b08..a81437d1e1b5 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -18,13 +18,6 @@ production:
# port: 8600
# record: secondary.postgresql.service.consul
# interval: 300
@@ -26,13 +26,6 @@ production:
# username: git
# password: "secure password"
# host: localhost
- geo:
- adapter: postgresql
- encoding: unicode
@ -25,10 +25,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644
#
# Development specific
@@ -39,13 +32,6 @@ development:
host: localhost
variables:
statement_timeout: 15s
@@ -57,13 +50,6 @@ development:
# host: localhost
# variables:
# statement_timeout: 15s
- geo:
- adapter: postgresql
- encoding: unicode
@ -39,10 +39,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644
#
# Staging specific
@@ -58,13 +44,6 @@ staging:
username: git
password: "secure password"
host: localhost
@@ -84,13 +70,6 @@ staging:
# username: git
# password: "secure password"
# host: localhost
- geo:
- adapter: postgresql
- encoding: unicode
@ -53,10 +53,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
@@ -80,10 +59,3 @@ test: &test
prepared_statements: false
variables:
statement_timeout: 15s
@@ -117,10 +96,3 @@ test: &test
# prepared_statements: false
# variables:
# statement_timeout: 15s
- geo:
- adapter: postgresql
- encoding: unicode

16
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,14 +1,14 @@
{
"version": "15.8.4",
"repo_hash": "sha256-8R2a934nC6n482Am7EruV3yHgxFSICuGcKgRBCy7GGI=",
"yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az",
"version": "15.9.3",
"repo_hash": "sha256-WYzhKknxx3NwCsXsQCPNQNdoya010YbVh9uTpcHgSl4=",
"yarn_hash": "0msrbzqz5hgyl0c6dcxyzi6qnf2k3fmg44d201pa578p08xb0lld",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.8.4-ee",
"rev": "v15.9.3-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.8.4",
"GITLAB_PAGES_VERSION": "15.8.4",
"GITLAB_SHELL_VERSION": "14.15.0",
"GITLAB_WORKHORSE_VERSION": "15.8.4"
"GITALY_SERVER_VERSION": "15.9.3",
"GITLAB_PAGES_VERSION": "15.9.3",
"GITLAB_SHELL_VERSION": "14.17.0",
"GITLAB_WORKHORSE_VERSION": "15.9.3"
}
}

1
pkgs/applications/version-management/gitlab/default.nix
View File

@ -166,6 +166,7 @@ stdenv.mkDerivation {
# path, not their relative state directory path. This gets rid of
# warnings and means we don't have to link back to lib from the
# state directory.
${replace}/bin/replace-literal -f -r -e '../../lib' "$out/share/gitlab/lib" config
${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config
${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config
'';

20
pkgs/applications/version-management/gitlab/gitaly/Gemfile
View File

@ -1,10 +1,10 @@
source 'https://rubygems.org'
gem 'rugged', '~> 1.2'
gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.1.6.1'
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools
gem 'sentry-raven', '~> 3.0', require: false
gem 'rugged', '~> 1.5.1'
gem 'gitlab-markup', '~> 1.8.0'
gem 'activesupport', '~> 6.1.7.2'
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem
gem 'sentry-raven', '~> 3.1', require: false
gem 'rbtrace', require: false
# The Gitaly Gem contains the Protobuf and gRPC definitions required by the
@ -12,13 +12,14 @@ gem 'rbtrace', require: false
gem 'gitaly', '~> 15.5.0'
# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.29'
gem 'gitlab-labkit', '~> 0.31'
# 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 'nokogiri', '~> 1.14'
# Rails is currently blocked on the upgrade to the new major version for Redis,
# so we don't upgrade either until the issue is resolved. This is an indirect
@ -26,12 +27,11 @@ gem 'google-protobuf', '~> 3.21.12'
gem 'redis', '~> 4.8.0'
group :development, :test do
gem 'rubocop', '~> 0.69', require: false
gem 'rspec', require: false
gem 'rubocop', '~> 1.38', require: false
gem 'rspec', '~> 3.12.0', require: false
gem 'rspec-parameterized', require: false
gem 'timecop', require: false
gem 'factory_bot', require: false
gem 'pry', '~> 0.12.2', require: false
gem 'pry', '~> 0.13.1', require: false
end
# Gems required in omnibus-gitlab pipeline

160
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View File

@ -1,52 +1,46 @@
GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
actionpack (6.1.6.1)
actionview (= 6.1.6.1)
activesupport (= 6.1.6.1)
actionpack (6.1.7.2)
actionview (= 6.1.7.2)
activesupport (= 6.1.7.2)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.6.1)
activesupport (= 6.1.6.1)
actionview (6.1.7.2)
activesupport (= 6.1.7.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.1.6.1)
activesupport (6.1.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2)
binding_ninja (0.2.3)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
builder (3.2.4)
coderay (1.1.2)
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.0)
crass (1.0.6)
debug_inspector (1.1.0)
diff-lcs (1.3)
dotenv (2.7.6)
equalizer (0.0.11)
erubi (1.11.0)
factory_bot (5.0.2)
activesupport (>= 4.2.0)
erubi (1.12.0)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.15.5)
gitaly (15.5.0)
grpc (~> 1.0)
gitlab-labkit (0.29.0)
gitlab-labkit (0.31.0)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
@ -61,7 +55,7 @@ GEM
tomlrb (>= 1.3, < 2.1)
with_env (= 1.1.0)
xml-simple (~> 1.1.5)
gitlab-markup (1.7.1)
gitlab-markup (1.8.1)
google-protobuf (3.21.12)
googleapis-common-protos-types (1.4.0)
google-protobuf (~> 3.14)
@ -70,10 +64,10 @@ GEM
googleapis-common-protos-types (~> 1.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaeger-client (1.1.0)
opentracing (~> 0.3)
thrift
json (2.6.3)
licensee (9.15.2)
dotenv (~> 2.0)
octokit (~> 4.20)
@ -83,14 +77,12 @@ GEM
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.2)
mini_portile2 (2.8.0)
minitest (5.16.3)
method_source (1.0.0)
mini_portile2 (2.8.1)
minitest (5.17.0)
msgpack (1.3.3)
multipart-post (2.1.1)
nokogiri (1.13.10)
nokogiri (1.14.1)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.20.0)
@ -98,120 +90,118 @@ GEM
sawyer (~> 0.8.0, >= 0.5.3)
opentracing (0.5.0)
optimist (3.0.1)
parallel (1.19.2)
parser (3.0.3.2)
parallel (1.22.1)
parser (3.2.0.0)
ast (~> 2.4.1)
pg_query (2.2.0)
pg_query (2.2.1)
google-protobuf (>= 3.19.2)
proc_to_ast (0.1.0)
coderay
parser
unparser
procto (0.0.3)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.7)
racc (1.6.1)
rack (2.2.4)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (>= 1.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.4)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rainbow (3.0.0)
rainbow (3.1.1)
rbtrace (0.4.14)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
redis (4.8.0)
regexp_parser (1.8.1)
regexp_parser (2.6.2)
reverse_markdown (1.4.0)
nokogiri
rexml (3.2.5)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.3)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.0)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-parameterized (0.4.2)
binding_ninja (>= 0.2.3)
rspec-support (~> 3.12.0)
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-support (3.8.0)
rubocop (0.86.0)
rspec-parameterized-table_syntax (1.0.0)
binding_of_caller
rspec-parameterized-core (< 2)
rspec-support (3.12.0)
rubocop (1.44.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 2.7.0.1)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.0.3, < 1.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.2.0)
parser (>= 2.7.0.1)
ruby-progressbar (1.10.1)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
rubyzip (2.3.2)
rugged (1.2.0)
rugged (1.5.1)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
sentry-raven (3.0.4)
sentry-raven (3.1.2)
faraday (>= 1.0)
thor (1.1.0)
thread_safe (0.3.6)
thrift (0.17.0)
timecop (0.9.1)
tomlrb (2.0.1)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
unparser (0.4.7)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
concord (~> 0.1.5)
unicode-display_width (2.4.2)
unparser (0.6.7)
diff-lcs (~> 1.3)
equalizer (~> 0.0.9)
parser (>= 2.6.5)
procto (~> 0.0.2)
parser (>= 3.2.0)
with_env (1.1.0)
xml-simple (1.1.9)
rexml
zeitwerk (2.6.0)
zeitwerk (2.6.6)
PLATFORMS
ruby
DEPENDENCIES
activesupport (~> 6.1.6.1)
activesupport (~> 6.1.7.2)
factory_bot
gitaly (~> 15.5.0)
gitlab-labkit (~> 0.29)
gitlab-labkit (~> 0.31)
gitlab-license_finder
gitlab-markup (~> 1.7.1)
gitlab-markup (~> 1.8.0)
google-protobuf (~> 3.21.12)
grpc (~> 1.42.0)
licensee (~> 9.15)
pry (~> 0.12.2)
nokogiri (~> 1.14)
pry (~> 0.13.1)
rbtrace
redis (~> 4.8.0)
rspec
rspec (~> 3.12.0)
rspec-parameterized
rubocop (~> 0.69)
rugged (~> 1.2)
sentry-raven (~> 3.0)
timecop
rubocop (~> 1.38)
rugged (~> 1.5.1)
sentry-raven (~> 3.1)
BUNDLED WITH
2.3.26
2.4.6

6
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.8.4";
version = "15.9.3";
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-att8MR94uINKOTYlj2sZLezMXZag11qP2p9T9a3Eklc=";
sha256 = "sha256-WBg1fo8tG0tfrsu8QtIo0SY1ZbktVHfcTf77Ny29DSM=";
};
vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA=";
vendorSha256 = "sha256-IIvvI7CKLWB2W4fi/HLFtfZdovehxDmtQ8GUEw24fbY=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];

276
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View File

@ -1,22 +1,14 @@
{
abstract_type = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14";
type = "gem";
};
version = "0.0.7";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m5x42s72mik9xkrgbway4ra139k71p2dfxcvg5gwdmac8maiq7k";
sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza";
type = "gem";
};
version = "6.1.6.1";
version = "6.1.7.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -24,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0syh8jwih5qvv87zfyzl37rz6sc1prhy6gia95bn76zyqk9cfzx8";
sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za";
type = "gem";
};
version = "6.1.6.1";
version = "6.1.7.2";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -35,19 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vb0xi7yvgfqky9h4clyncb886mr1wvz9amk7d9ffmgpwrpzvjaz";
sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2";
type = "gem";
};
version = "6.1.6.1";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak";
type = "gem";
};
version = "0.2.0";
version = "6.1.7.2";
};
addressable = {
dependencies = ["public_suffix"];
@ -70,15 +53,16 @@
};
version = "2.4.2";
};
binding_ninja = {
binding_of_caller = {
dependencies = ["debug_inspector"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa";
sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s";
type = "gem";
};
version = "0.2.3";
version = "1.0.0";
};
builder = {
groups = ["default"];
@ -98,24 +82,15 @@
};
version = "1.1.2";
};
concord = {
dependencies = ["adamantium" "equalizer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg";
type = "gem";
};
version = "0.1.5";
};
concurrent-ruby = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
type = "gem";
};
version = "1.1.10";
version = "1.2.0";
};
crass = {
groups = ["default"];
@ -127,6 +102,16 @@
};
version = "1.0.6";
};
debug_inspector = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga";
type = "gem";
};
version = "1.1.0";
};
diff-lcs = {
source = {
remotes = ["https://rubygems.org"];
@ -145,23 +130,15 @@
};
version = "2.7.6";
};
equalizer = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
type = "gem";
};
version = "0.0.11";
};
erubi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx";
sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7";
type = "gem";
};
version = "1.11.0";
version = "1.12.0";
};
factory_bot = {
dependencies = ["activesupport"];
@ -169,10 +146,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02ijqa3g6lb8l8mvi40z1zgh9bb3gr08p2r2ym159ghhfbcrmbwk";
sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq";
type = "gem";
};
version = "5.0.2";
version = "6.2.1";
};
faraday = {
dependencies = ["multipart-post"];
@ -212,10 +189,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb";
sha256 = "07zd8r189qcqr3xp6dinlw94sylxbyn56nnas7k0aw6xvr74q12v";
type = "gem";
};
version = "0.29.0";
version = "0.31.0";
};
gitlab-license_finder = {
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
@ -233,10 +210,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xnlra517pfj3hx07kasbqlcw51ix4xajr6bsd3mwg8bc92dlwy7";
sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb";
type = "gem";
};
version = "1.7.1";
version = "1.8.1";
};
google-protobuf = {
groups = ["default"];
@ -281,14 +258,6 @@
};
version = "1.12.0";
};
ice_nine = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
type = "gem";
};
version = "0.11.2";
};
jaeger-client = {
dependencies = ["opentracing" "thrift"];
groups = ["default"];
@ -300,6 +269,16 @@
};
version = "1.1.0";
};
json = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
type = "gem";
};
version = "2.6.3";
};
licensee = {
dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
groups = ["default"];
@ -322,42 +301,35 @@
};
version = "2.19.1";
};
memoizable = {
dependencies = ["thread_safe"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
type = "gem";
};
version = "0.4.2";
};
method_source = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
type = "gem";
};
version = "0.9.2";
version = "1.0.0";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
type = "gem";
};
version = "2.8.0";
version = "2.8.1";
};
minitest = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
type = "gem";
};
version = "5.16.3";
version = "5.17.0";
};
msgpack = {
groups = ["default"];
@ -385,10 +357,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk";
sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj";
type = "gem";
};
version = "1.13.10";
version = "1.14.1";
};
octokit = {
dependencies = ["faraday" "sawyer"];
@ -426,10 +398,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
type = "gem";
};
version = "1.19.2";
version = "1.22.1";
};
parser = {
dependencies = ["ast"];
@ -437,10 +409,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di";
sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623";
type = "gem";
};
version = "3.0.3.2";
version = "3.2.0.0";
};
pg_query = {
dependencies = ["google-protobuf"];
@ -448,10 +420,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4";
sha256 = "1slcbzzqdv6104l5h8ql6kj43zmnm16g2dav8bc8dasfpwmrg1k0";
type = "gem";
};
version = "2.2.0";
version = "2.2.1";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
@ -462,22 +434,16 @@
};
version = "0.1.0";
};
procto = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c";
type = "gem";
};
version = "0.0.3";
};
pry = {
dependencies = ["coderay" "method_source"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk";
type = "gem";
};
version = "0.12.2";
version = "0.13.1";
};
public_suffix = {
groups = ["default"];
@ -494,20 +460,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8";
sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
type = "gem";
};
version = "1.6.1";
version = "1.6.2";
};
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa";
sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
type = "gem";
};
version = "2.2.4";
version = "2.2.6.2";
};
rack-test = {
dependencies = ["rack"];
@ -537,18 +503,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9";
sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz";
type = "gem";
};
version = "1.4.4";
version = "1.5.0";
};
rainbow = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem";
};
version = "3.0.0";
version = "3.1.1";
};
rbtrace = {
dependencies = ["ffi" "msgpack" "optimist"];
@ -576,10 +544,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n";
sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2";
type = "gem";
};
version = "1.8.1";
version = "2.6.2";
};
reverse_markdown = {
dependencies = ["nokogiri"];
@ -608,10 +576,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
type = "gem";
};
version = "3.8.0";
version = "3.12.0";
};
rspec-core = {
dependencies = ["rspec-support"];
@ -619,10 +587,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p";
sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4";
type = "gem";
};
version = "3.8.0";
version = "3.12.0";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@ -630,10 +598,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c4gs5ybf7km0qshdm92p38zvg32n1j2kr5fgs2icacz7xf2y6fy";
sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
type = "gem";
};
version = "3.8.3";
version = "3.12.2";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
@ -641,42 +609,64 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp";
sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc";
type = "gem";
};
version = "3.8.0";
version = "3.12.3";
};
rspec-parameterized = {
dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31";
sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww";
type = "gem";
};
version = "0.4.2";
version = "1.0.0";
};
rspec-parameterized-core = {
dependencies = ["parser" "proc_to_ast" "rspec" "unparser"];
groups = ["default" "development" "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" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp";
type = "gem";
};
version = "1.0.0";
};
rspec-support = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609";
sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
type = "gem";
};
version = "3.8.0";
version = "3.12.0";
};
rubocop = {
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jl3ghxw1bpj272s5s3gl07l2rbd1vwr9z9jmlxxaa2faldn9gms";
sha256 = "0a2j57r6pvngqlzkmww031gs5isax3nsr9n7cbfpqnh34ljh2lk1";
type = "gem";
};
version = "0.86.0";
version = "1.44.0";
};
rubocop-ast = {
dependencies = ["parser"];
@ -684,20 +674,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w5rjkwxaxkr2jr1sl5wz0nffal27ik6b1qfzx5skl43vfk2jz97";
sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd";
type = "gem";
};
version = "0.2.0";
version = "1.24.1";
};
ruby-progressbar = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
type = "gem";
};
version = "1.10.1";
version = "1.11.0";
};
rubyzip = {
groups = ["default" "development" "omnibus" "test"];
@ -714,10 +704,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i";
sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58";
type = "gem";
};
version = "1.2.0";
version = "1.5.1";
};
sawyer = {
dependencies = ["addressable" "faraday"];
@ -736,10 +726,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0";
sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h";
type = "gem";
};
version = "3.0.4";
version = "3.1.2";
};
thor = {
groups = ["default"];
@ -751,14 +741,6 @@
};
version = "1.1.0";
};
thread_safe = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
type = "gem";
};
version = "0.3.6";
};
thrift = {
groups = ["default"];
platforms = [];
@ -769,14 +751,6 @@
};
version = "0.17.0";
};
timecop = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d7mm786180v4kzvn1f77rhfppsg5n0sq2bdx63x9nv114zm8jrp";
type = "gem";
};
version = "0.9.1";
};
tomlrb = {
groups = ["default" "development" "omnibus" "test"];
platforms = [];
@ -803,21 +777,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a";
type = "gem";
};
version = "1.7.0";
version = "2.4.2";
};
unparser = {
dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
dependencies = ["diff-lcs" "parser"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qg1apxlnf4kxfj9jpm6hhv73jsncbs4zpsgyan32p5r331q1gmx";
sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf";
type = "gem";
};
version = "0.4.7";
version = "0.6.7";
};
with_env = {
groups = ["default" "development" "omnibus" "test"];
@ -845,9 +819,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc";
sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv";
type = "gem";
};
version = "2.6.0";
version = "2.6.6";
};
}

10
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View File

@ -1,20 +1,20 @@
{ lib, fetchFromGitLab, buildGoModule, ruby }:
{ lib, fetchFromGitLab, buildGoModule, ruby, libkrb5 }:
buildGoModule rec {
pname = "gitlab-shell";
version = "14.15.0";
version = "14.17.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-GDhYBL5LT3r6UIjDDY3LV5VgcBch190hYLPb6uMWETs=";
sha256 = "sha256-GTy+1O6Z7i+L8SSSQpYnN6SRfqDutkJYrj66tpX4f5M=";
};
buildInputs = [ ruby ];
buildInputs = [ ruby libkrb5 ];
patches = [ ./remove-hardcoded-locations.patch ];
vendorSha256 = "sha256-2DpQNJw67ipIW3ctHDJthuDrKNZCYvjXGlDxzBEMGWs=";
vendorSha256 = "sha256-mFGkT5lyQfcaGz503vgqx/kP5S0V2Ks5HDmjx+BxZzg=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

4
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.8.4";
version = "15.9.3";
src = fetchFromGitLab {
owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-0FWR6cIV/0R2OrOAKhvuVnIY3Hkw4CIjyBUeF/paumw=";
vendorSha256 = "sha256-wvoMBzRGp8RX2kHKKz3REDq8YLTsHbDayEMYi7hSzTE=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

71
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View File

@ -13,9 +13,9 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
# NOTE: When incrementing the major or minor version here, also increment activerecord_version
# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
# https://gitlab.com/gitlab-org/gitlab/-/issues/375713
gem 'rails', '~> 6.1.6.1'
gem 'rails', '~> 6.1.7.2'
gem 'bootsnap', '~> 1.15.0', require: false
gem 'bootsnap', '~> 1.16.0', require: false
# Pin openssl to match the version bundled with our supported Rubies.
# See https://stdgems.org/openssl/#gem-version.
@ -39,7 +39,7 @@ gem 'default_value_for', '~> 3.4.0'
# Supported DBs
gem 'pg', '~> 1.4.5'
gem 'rugged', '~> 1.2'
gem 'rugged', '~> 1.5'
gem 'grape-path-helpers', '~> 1.7.1'
gem 'faraday', '~> 1.0'
@ -62,25 +62,26 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
gem 'omniauth-alicloud', '~> 2.0.0'
gem 'omniauth-alicloud', '~> 2.0.1'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '2.0.1'
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
gem 'omniauth-google-oauth2', '~> 1.1'
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 2.0.0'
gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
gem 'omniauth-authentiq', '~> 0.3.3'
gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect'
gem 'omniauth_openid_connect', '~> 0.6.1'
# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
# See https://docs.gitlab.com/ee/development/emails.html#rationale.
gem 'openid_connect', '= 1.3.0'
gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.21.3'
gem 'jwt', '~> 2.1.0'
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
gem 'gssapi', '~> 1.3.1', group: :kerberos
gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
# Spam and anti-bot protection
@ -150,11 +151,26 @@ gem 'fog-google', '~> 1.19', require: 'fog/google'
gem 'fog-local', '~> 0.8'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm'
# 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,
# which may have knock-on effects on other features using `RestClient`.
# We may want to update this dependency if this is ever addressed upstream, e.g. via
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
gem 'fog-aliyun', '~> 0.4'
gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/azurerm'
# for Google storage
gem 'google-api-client', '~> 0.33'
gem 'google-cloud-storage', '~> 1.44.0'
gem 'google-apis-core', '~> 0.10.0'
gem 'google-apis-compute_v1', '~> 0.57.0'
gem 'google-apis-container_v1', '~> 0.43.0'
gem 'google-apis-container_v1beta1', '~> 0.43.0'
gem 'google-apis-cloudbilling_v1', '~> 0.21.0'
gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0'
gem 'google-apis-iam_v1', '~> 0.36.0'
gem 'google-apis-serviceusage_v1', '~> 0.28.0'
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0'
# for aws storage
gem 'unf', '~> 0.1.4'
@ -166,16 +182,16 @@ 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.168.4'
gem 'aws-sdk-core', '~> 3.170.0'
gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1.117.2'
gem 'aws-sdk-s3', '~> 1.119.1'
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.14.3'
gem 'deckar01-task_list', '2.3.2'
gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup'
gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup'
gem 'commonmarker', '~> 0.23.6'
gem 'kramdown', '~> 2.3.1'
gem 'RedCloth', '~> 4.3.2'
@ -189,8 +205,7 @@ gem 'asciidoctor-plantuml', '~> 0.0.16'
gem 'asciidoctor-kroki', '~> 0.7.0', require: false
gem 'rouge', '~> 3.30.0'
gem 'truncato', '~> 0.7.12'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.13.10'
gem 'nokogiri', '~> 1.14.1'
# Calendar rendering
gem 'icalendar'
@ -223,7 +238,7 @@ gem 'redis-namespace', '~> 1.9.0'
gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
gem 'fugit', '~> 1.2.1'
gem 'fugit', '~> 1.8.1'
# HTTP requests
gem 'httparty', '~> 0.20.0'
@ -329,15 +344,15 @@ gem 'sentry-sidekiq', '~> 5.1.1'
# PostgreSQL query parsing
#
gem 'pg_query', '~> 2.2'
gem 'pg_query', '~> 2.2', '>= 2.2.1'
gem 'premailer-rails', '~> 1.10.3'
gem 'gitlab-labkit', '~> 0.29.0'
gem 'gitlab-labkit', '~> 0.30.1'
gem 'thrift', '>= 0.16.0'
# I18n
gem 'ruby_parser', '~> 3.15', require: false
gem 'ruby_parser', '~> 3.19', require: false
gem 'rails-i18n', '~> 7.0'
gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -358,12 +373,12 @@ gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client'
gem 'warning', '~> 1.3.0'
group :development do
gem 'lefthook', '~> 1.2.7', require: false
gem 'lefthook', '~> 1.2.9', require: false
gem 'rubocop'
gem 'solargraph', '~> 0.47.2', require: false
gem 'letter_opener_web', '~> 2.0.0'
gem 'lookbook', '~> 1.4', '>= 1.4.5'
gem 'lookbook', '~> 1.5', '>= 1.5.3'
# Better errors handler
gem 'better_errors', '~> 2.9.1'
@ -378,13 +393,13 @@ group :development, :test do
gem 'bullet', '~> 7.0.2'
gem 'pry-byebug'
gem 'pry-rails', '~> 0.3.9'
gem 'pry-shell', '~> 0.5.1'
gem 'pry-shell', '~> 0.6.1'
gem 'awesome_print', require: false
gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 6.2.0'
gem 'rspec-rails', '~> 5.0.1'
gem 'rspec-rails', '~> 6.0.1'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.11.0'
@ -395,7 +410,7 @@ group :development, :test do
gem 'spring', '~> 4.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 9.2.0', require: false
gem 'gitlab-styles', '~> 10.0.0', require: false
gem 'haml_lint', '~> 0.40.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -421,7 +436,7 @@ group :development, :test do
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 3.6.4', require: false
gem 'gitlab-dangerfiles', '~> 3.7.0', require: false
end
group :development, :test, :coverage do
@ -496,7 +511,7 @@ gem 'ssh_data', '~> 1.3'
gem 'spamcheck', '~> 1.0.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 15.5.2'
gem 'gitaly', '~> 15.9.0-rc3'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
@ -544,7 +559,7 @@ gem 'lockbox', '~> 1.1.1'
gem 'valid_email', '~> 0.1'
# JSON
gem 'json', '~> 2.5.1'
gem 'json', '~> 2.6.3'
gem 'json_schemer', '~> 0.2.18'
gem 'oj', '~> 3.13.21'
gem 'oj-introspect', '~> 0.7'

424
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -100,63 +100,63 @@ GEM
acme-client (2.0.11)
faraday (>= 1.0, < 3.0.0)
faraday-retry (~> 1.0)
actioncable (6.1.6.1)
actionpack (= 6.1.6.1)
activesupport (= 6.1.6.1)
actioncable (6.1.7.2)
actionpack (= 6.1.7.2)
activesupport (= 6.1.7.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.6.1)
actionpack (= 6.1.6.1)
activejob (= 6.1.6.1)
activerecord (= 6.1.6.1)
activestorage (= 6.1.6.1)
activesupport (= 6.1.6.1)
actionmailbox (6.1.7.2)
actionpack (= 6.1.7.2)
activejob (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
mail (>= 2.7.1)
actionmailer (6.1.6.1)
actionpack (= 6.1.6.1)
actionview (= 6.1.6.1)
activejob (= 6.1.6.1)
activesupport (= 6.1.6.1)
actionmailer (6.1.7.2)
actionpack (= 6.1.7.2)
actionview (= 6.1.7.2)
activejob (= 6.1.7.2)
activesupport (= 6.1.7.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.6.1)
actionview (= 6.1.6.1)
activesupport (= 6.1.6.1)
actionpack (6.1.7.2)
actionview (= 6.1.7.2)
activesupport (= 6.1.7.2)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.6.1)
actionpack (= 6.1.6.1)
activerecord (= 6.1.6.1)
activestorage (= 6.1.6.1)
activesupport (= 6.1.6.1)
actiontext (6.1.7.2)
actionpack (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
nokogiri (>= 1.8.5)
actionview (6.1.6.1)
activesupport (= 6.1.6.1)
actionview (6.1.7.2)
activesupport (= 6.1.7.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.6.1)
activesupport (= 6.1.6.1)
activejob (6.1.7.2)
activesupport (= 6.1.7.2)
globalid (>= 0.3.6)
activemodel (6.1.6.1)
activesupport (= 6.1.6.1)
activerecord (6.1.6.1)
activemodel (= 6.1.6.1)
activesupport (= 6.1.6.1)
activemodel (6.1.7.2)
activesupport (= 6.1.7.2)
activerecord (6.1.7.2)
activemodel (= 6.1.7.2)
activesupport (= 6.1.7.2)
activerecord-explain-analyze (0.1.0)
activerecord (>= 4)
pg
activestorage (6.1.6.1)
actionpack (= 6.1.6.1)
activejob (= 6.1.6.1)
activerecord (= 6.1.6.1)
activesupport (= 6.1.6.1)
activestorage (6.1.7.2)
actionpack (= 6.1.7.2)
activejob (= 6.1.7.2)
activerecord (= 6.1.7.2)
activesupport (= 6.1.7.2)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.6.1)
activesupport (6.1.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -168,6 +168,9 @@ GEM
public_suffix (>= 2.0.2, < 6.0)
aes_key_wrap (1.1.0)
akismet (3.0.0)
aliyun-sdk (0.8.0)
nokogiri (~> 1.6)
rest-client (~> 2.0)
android_key_attestation (0.3.0)
apollo_upload_server (2.1.0)
actionpack (>= 4.2)
@ -197,19 +200,19 @@ GEM
awesome_print (1.9.2)
awrence (1.1.1)
aws-eventstream (1.2.0)
aws-partitions (1.674.0)
aws-partitions (1.703.0)
aws-sdk-cloudformation (1.41.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.168.4)
aws-sdk-core (3.170.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.61.0)
aws-sdk-kms (1.62.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.117.2)
aws-sdk-s3 (1.119.1)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@ -241,11 +244,8 @@ GEM
rack (>= 0.9.0)
bindata (2.4.11)
binding_ninja (0.2.3)
bootsnap (1.15.0)
bootsnap (1.16.0)
msgpack (~> 1.2)
bootstrap_form (4.2.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
browser (5.3.1)
builder (3.2.4)
bullet (7.0.2)
@ -266,11 +266,11 @@ GEM
capybara-screenshot (1.0.22)
capybara (>= 1.0, < 4)
launchy
carrierwave (1.3.2)
carrierwave (1.3.3)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
ssrf_filter (~> 1.0)
ssrf_filter (~> 1.0, < 1.1.0)
cbor (0.5.9.6)
character_set (1.4.1)
sorted_set (~> 1.0)
@ -294,7 +294,7 @@ GEM
coderay (1.1.3)
colored2 (3.1.2)
commonmarker (0.23.6)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.0)
connection_pool (2.3.0)
cork (0.3.0)
colored2 (~> 3.1)
@ -334,7 +334,6 @@ GEM
deckar01-task_list (2.3.2)
html-pipeline
declarative (0.0.20)
declarative-option (0.1.0)
declarative_policy (1.1.0)
default_value_for (3.4.0)
activerecord (>= 3.2.0, < 7.0)
@ -368,6 +367,8 @@ GEM
diff-lcs (1.5.0)
diff_match_patch (0.1.0)
diffy (3.4.2)
digest-crc (0.6.4)
rake (>= 12.0.0, < 14.0.0)
discordrb-webhooks (3.4.2)
rest-client (>= 2.0.0)
docile (1.4.0)
@ -422,7 +423,7 @@ GEM
launchy (~> 2.1)
mail (~> 2.7)
encryptor (3.0.0)
erubi (1.11.0)
erubi (1.12.0)
escape_utils (1.2.1)
et-orbi (1.2.7)
tzinfo
@ -477,7 +478,7 @@ GEM
faraday_middleware
multi_json
fast_blank (1.0.0)
fast_gettext (2.1.0)
fast_gettext (2.3.0)
ffaker (2.10.0)
ffi (1.15.5)
ffi-compiler (1.0.1)
@ -494,7 +495,9 @@ GEM
flipper-active_support_cache_store (0.25.0)
activesupport (>= 4.2, < 8)
flipper (~> 0.25.0)
fog-aliyun (0.3.3)
fog-aliyun (0.4.0)
addressable (~> 2.8.0)
aliyun-sdk (~> 0.8.0)
fog-core
fog-json
ipaddress (~> 0.8)
@ -538,15 +541,14 @@ GEM
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.2.5)
fugit (1.2.3)
et-orbi (~> 1.1, >= 1.1.8)
raabro (~> 1.1)
fugit (1.8.1)
et-orbi (~> 1, >= 1.2.7)
raabro (~> 1.4)
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
fuzzyurl (0.9.0)
gemoji (3.0.1)
gems (1.2.0)
get_process_mem (0.2.7)
ffi (~> 1.0)
gettext (3.3.6)
@ -561,28 +563,28 @@ GEM
rails (>= 3.2.0)
git (1.11.0)
rchardet (~> 1.8)
gitaly (15.5.2)
gitaly (15.9.0.pre.rc3)
grpc (~> 1.0)
gitlab (4.19.0)
httparty (~> 0.20)
terminal-table (>= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (3.6.4)
gitlab-dangerfiles (3.7.0)
danger (>= 8.4.5)
danger-gitlab (>= 8.0.0)
rake
gitlab-experiment (0.7.1)
activesupport (>= 3.0)
request_store (>= 1.0)
gitlab-fog-azure-rm (1.4.0)
gitlab-fog-azure-rm (1.7.0)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
fog-core (= 2.1.0)
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.29.0)
gitlab-labkit (0.30.1)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
@ -592,22 +594,17 @@ GEM
redis (> 3.0.0, < 6.0.0)
gitlab-license (2.2.1)
gitlab-mail_room (0.0.9)
gitlab-markup (1.8.1)
gitlab-markup (1.9.0)
gitlab-net-dns (0.9.1)
gitlab-omniauth-openid-connect (0.10.0)
addressable (~> 2.7)
omniauth (>= 1.9, < 3)
openid_connect (~> 1.2)
gitlab-sidekiq-fetcher (0.9.0)
json (>= 2.5)
sidekiq (~> 6.1)
gitlab-styles (9.2.0)
rubocop (~> 1.38.0)
rubocop-gitlab-security (~> 0.1.1)
rubocop-graphql (~> 0.14)
rubocop-performance (~> 1.14)
rubocop-rails (~> 2.15)
rubocop-rspec (~> 2.15)
gitlab-styles (10.0.0)
rubocop (~> 1.43.0)
rubocop-graphql (~> 0.18)
rubocop-performance (~> 1.15)
rubocop-rails (~> 2.17)
rubocop-rspec (~> 2.18)
gitlab_chronic_duration (0.10.6.2)
numerizer (~> 0.2)
gitlab_omniauth-ldap (2.2.0)
@ -622,12 +619,17 @@ GEM
i18n (>= 0.7)
multi_json
request_store (>= 1.0)
google-api-client (0.53.0)
google-apis-core (~> 0.1)
google-apis-generator (~> 0.1)
google-apis-compute_v1 (0.53.0)
google-apis-core (>= 0.9.0, < 2.a)
google-apis-core (0.9.1)
google-apis-cloudbilling_v1 (0.21.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-cloudresourcemanager_v1 (0.31.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-compute_v1 (0.57.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-container_v1 (0.43.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-container_v1beta1 (0.43.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-core (0.10.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
@ -636,28 +638,36 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-discovery_v1 (0.12.0)
google-apis-core (>= 0.9.0, < 2.a)
google-apis-dns_v1 (0.28.0)
google-apis-core (>= 0.9.0, < 2.a)
google-apis-generator (0.11.0)
activesupport (>= 5.0)
gems (~> 1.2)
google-apis-iam_v1 (0.36.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-discovery_v1 (~> 0.5)
thor (>= 0.20, < 2.a)
google-apis-iamcredentials_v1 (0.15.0)
google-apis-core (>= 0.9.0, < 2.a)
google-apis-monitoring_v3 (0.37.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-pubsub_v1 (0.30.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-sqladmin_v1beta4 (0.38.0)
google-apis-core (>= 0.9.0, < 2.a)
google-apis-storage_v1 (0.20.0)
google-apis-serviceusage_v1 (0.28.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-sqladmin_v1beta4 (0.41.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-storage_v1 (0.19.0)
google-apis-core (>= 0.9.0, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.0)
google-cloud-storage (1.44.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.19.0)
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.14)
@ -716,7 +726,7 @@ GEM
grpc (1.42.0)
google-protobuf (~> 3.18)
googleapis-common-protos-types (~> 1.0)
gssapi (1.2.0)
gssapi (1.3.1)
ffi (>= 1.0.1)
guard (2.16.2)
formatador (>= 0.2.4)
@ -799,7 +809,7 @@ GEM
character_set (~> 1.4)
regexp_parser (~> 2.5)
regexp_property_values (~> 1.0)
json (2.5.1)
json (2.6.3)
json-jwt (1.15.3)
activesupport (>= 4.2)
aes_key_wrap
@ -835,7 +845,7 @@ GEM
kramdown (~> 2.0)
launchy (2.5.0)
addressable (~> 2.7)
lefthook (1.2.7)
lefthook (1.2.9)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (2.0.0)
@ -873,7 +883,7 @@ GEM
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lookbook (1.4.5)
lookbook (1.5.3)
actioncable
activemodel
css_parser
@ -883,7 +893,7 @@ GEM
railties (>= 5.0)
redcarpet (~> 3.5)
rouge (>= 3.26, < 5.0)
view_component (~> 2.0)
view_component (> 2.0, < 4)
yard (~> 0.9.25)
zeitwerk (~> 2.5)
lru_redux (1.1.0)
@ -903,7 +913,7 @@ GEM
mini_histogram (0.3.1)
mini_magick (4.10.1)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
mini_portile2 (2.8.1)
minitest (5.11.3)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
@ -924,7 +934,7 @@ GEM
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.2.3)
murmurhash3 (0.1.6)
murmurhash3 (0.1.7)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
mustermann-grape (1.0.1)
@ -941,7 +951,7 @@ GEM
netrc (0.11.0)
nio4r (2.5.8)
no_proxy_fix (0.1.2)
nokogiri (1.13.10)
nokogiri (1.14.1)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
notiffany (0.1.3)
@ -973,22 +983,19 @@ GEM
train-core
wmi-lite (~> 1.0)
oj (3.13.23)
oj-introspect (0.7.1)
oj-introspect (0.7.2)
oj (>= 3.13.23)
omniauth (2.1.0)
hashie (>= 3.4.6)
rack (>= 2.2.3)
rack-protection
omniauth-alicloud (2.0.0)
omniauth-alicloud (2.0.1)
omniauth-oauth2 (~> 1.8)
omniauth-atlassian-oauth2 (0.2.0)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.5)
omniauth-auth0 (2.0.0)
omniauth-oauth2 (~> 1.4)
omniauth-authentiq (0.3.3)
jwt (>= 1.5)
omniauth-oauth2 (>= 1.5)
omniauth-azure-activedirectory-v2 (2.0.0)
omniauth-oauth2 (~> 1.8)
omniauth-dingtalk-oauth2 (1.0.1)
@ -1015,11 +1022,12 @@ GEM
omniauth-saml (2.0.0)
omniauth (~> 2.0)
ruby-saml (~> 1.9)
omniauth-shibboleth (1.3.0)
omniauth (>= 1.0.0)
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
omniauth_openid_connect (0.6.1)
omniauth (>= 1.9, < 3)
openid_connect (~> 1.1)
open4 (1.3.4)
openid_connect (1.3.0)
activemodel
@ -1039,7 +1047,7 @@ GEM
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
os (1.1.1)
os (1.1.4)
pact (1.63.0)
pact-mock_service (~> 3.0, >= 3.3.1)
pact-support (~> 1.16, >= 1.16.9)
@ -1064,7 +1072,7 @@ GEM
expgen (~> 0.1)
rainbow (~> 3.1.1)
parallel (1.22.1)
parser (3.1.3.0)
parser (3.2.0.0)
ast (~> 2.4.1)
parslet (1.8.2)
pastel (0.8.0)
@ -1072,7 +1080,7 @@ GEM
peek (1.1.0)
railties (>= 4.0.0)
pg (1.4.5)
pg_query (2.2.0)
pg_query (2.2.1)
google-protobuf (>= 3.19.2)
plist (3.6.0)
png_quantizator (0.2.1)
@ -1090,16 +1098,16 @@ GEM
parser
unparser
prometheus-client-mmap (0.17.0)
pry (0.13.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.9.0)
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (~> 0.13.0)
pry (>= 0.13, < 0.15)
pry-rails (0.3.9)
pry (>= 0.10.4)
pry-shell (0.5.1)
pry (~> 0.13.0)
pry-shell (0.6.1)
pry (>= 0.13.0)
tty-markdown
tty-prompt
public_suffix (5.0.0)
@ -1110,7 +1118,7 @@ GEM
puma (>= 2.7)
pyu-ruby-sasl (0.0.3.3)
raabro (1.4.0)
racc (1.6.1)
racc (1.6.2)
rack (2.2.6.2)
rack-accept (0.4.5)
rack (>= 0.4)
@ -1131,20 +1139,20 @@ GEM
rack-test (2.0.2)
rack (>= 1.3)
rack-timeout (0.6.3)
rails (6.1.6.1)
actioncable (= 6.1.6.1)
actionmailbox (= 6.1.6.1)
actionmailer (= 6.1.6.1)
actionpack (= 6.1.6.1)
actiontext (= 6.1.6.1)
actionview (= 6.1.6.1)
activejob (= 6.1.6.1)
activemodel (= 6.1.6.1)
activerecord (= 6.1.6.1)
activestorage (= 6.1.6.1)
activesupport (= 6.1.6.1)
rails (6.1.7.2)
actioncable (= 6.1.7.2)
actionmailbox (= 6.1.7.2)
actionmailer (= 6.1.7.2)
actionpack (= 6.1.7.2)
actiontext (= 6.1.7.2)
actionview (= 6.1.7.2)
activejob (= 6.1.7.2)
activemodel (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
bundler (>= 1.15.0)
railties (= 6.1.6.1)
railties (= 6.1.7.2)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
@ -1153,14 +1161,14 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.4)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rails-i18n (7.0.3)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (6.1.6.1)
actionpack (= 6.1.6.1)
activesupport (= 6.1.6.1)
railties (6.1.7.2)
actionpack (= 6.1.7.2)
activesupport (= 6.1.7.2)
method_source
rake (>= 12.2)
thor (~> 1.0)
@ -1173,14 +1181,14 @@ GEM
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rbtree (0.4.4)
rbtree (0.4.6)
rchardet (1.8.0)
rdoc (6.3.2)
re2 (1.6.0)
recaptcha (5.12.3)
json
recursive-open-struct (1.1.3)
redcarpet (3.5.1)
redcarpet (3.6.0)
redis (4.8.0)
redis-actionpack (5.3.0)
actionpack (>= 5, < 8)
@ -1195,9 +1203,9 @@ GEM
redis (>= 4, < 5)
regexp_parser (2.6.0)
regexp_property_values (1.0.0)
representable (3.0.4)
representable (3.2.0)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
request_store (1.5.1)
rack (>= 1.4)
@ -1220,40 +1228,40 @@ GEM
chunky_png
rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-benchmark (0.6.0)
benchmark-malloc (~> 0.2)
benchmark-perf (~> 0.6)
benchmark-trend (~> 0.4)
rspec (>= 3.0)
rspec-core (3.10.2)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
rspec-core (3.12.0)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.3)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (~> 3.12.0)
rspec-parameterized (0.5.0)
binding_ninja (>= 0.2.3)
parser
proc_to_ast
rspec (>= 2.13, < 4)
unparser
rspec-rails (5.0.1)
actionpack (>= 5.2)
activesupport (>= 5.2)
railties (>= 5.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-rails (6.0.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.11)
rspec-expectations (~> 3.11)
rspec-mocks (~> 3.11)
rspec-support (~> 3.11)
rspec-retry (0.6.1)
rspec-core (> 3.3)
rspec-support (3.10.3)
rspec-support (3.12.0)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.6)
@ -1261,31 +1269,32 @@ GEM
pg
rails
sqlite3
rubocop (1.38.0)
rubocop (1.43.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.1.2.1)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.23.0, < 2.0)
rubocop-ast (>= 1.24.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.23.0)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
rubocop-graphql (0.18.0)
rubocop-capybara (2.17.0)
rubocop (~> 1.41)
rubocop-graphql (0.19.0)
rubocop (>= 0.87, < 2)
rubocop-performance (1.15.1)
rubocop-performance (1.16.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.17.3)
rubocop-rails (2.17.4)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.16.0)
rubocop-rspec (2.18.1)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
ruby-fogbugz (0.3.0)
crack (~> 0.4)
multipart-post (~> 2.0)
@ -1297,12 +1306,12 @@ GEM
rexml
ruby-statistics (3.0.0)
ruby2_keywords (0.0.5)
ruby_parser (3.15.0)
sexp_processor (~> 4.9)
ruby_parser (3.19.2)
sexp_processor (~> 4.16)
rubyntlm (0.6.3)
rubypants (0.2.0)
rubyzip (2.3.2)
rugged (1.2.0)
rugged (1.5.1)
safe_yaml (1.0.4)
safety_net_attestation (0.4.0)
jwt (~> 2.0)
@ -1348,7 +1357,7 @@ GEM
sidekiq (>= 3.0)
set (1.0.1)
settingslogic (2.0.9)
sexp_processor (4.15.1)
sexp_processor (4.16.1)
shellany (0.0.1)
shoulda-matchers (5.1.0)
activesupport (>= 5.2.0)
@ -1412,9 +1421,10 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
sqlite3 (1.6.0)
mini_portile2 (~> 2.8.0)
ssh_data (1.3.0)
ssrf_filter (1.0.7)
ssrf_filter (1.0.8)
stackprof (0.2.21)
state_machines (0.5.0)
state_machines-activemodel (0.8.0)
@ -1465,6 +1475,7 @@ GEM
tpm-key_attestation (0.9.0)
bindata (~> 2.4)
openssl-signature_algorithm (~> 0.4.0)
trailblazer-option (0.1.2)
train-core (3.4.9)
addressable (~> 2.5)
ffi (!= 1.13.0)
@ -1477,7 +1488,7 @@ GEM
nokogiri (>= 1.7.0, <= 2.0)
tty-color (0.6.0)
tty-cursor (0.7.1)
tty-markdown (0.7.0)
tty-markdown (0.7.1)
kramdown (>= 1.16.2, < 3.0)
pastel (~> 0.8)
rouge (~> 3.14)
@ -1494,18 +1505,18 @@ GEM
tty-screen (0.8.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.5)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
u2f (0.2.1)
uber (0.1.0)
undercover (0.4.4)
undercover (0.4.5)
imagen (>= 0.1.8)
rainbow (>= 2.1, < 4.0)
rugged (>= 0.27, < 1.3)
rugged (>= 0.27, < 1.6)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
unicode-display_width (2.4.2)
unicode_utils (1.4.0)
uniform_notifier (1.16.0)
unleash (3.2.2)
@ -1596,8 +1607,8 @@ DEPENDENCIES
autoprefixer-rails (= 10.2.5.1)
awesome_print
aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3.168.4)
aws-sdk-s3 (~> 1.117.2)
aws-sdk-core (~> 3.170.0)
aws-sdk-s3 (~> 1.119.1)
babosa (~> 1.0.4)
base32 (~> 0.3.0)
batch-loader (~> 2.0.1)
@ -1605,8 +1616,7 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
benchmark-memory (~> 0.1)
better_errors (~> 2.9.1)
bootsnap (~> 1.15.0)
bootstrap_form (~> 4.2.0)
bootsnap (~> 1.16.0)
browser (~> 5.3.1)
bullet (~> 7.0.2)
bundler-audit (~> 0.7.0.1)
@ -1652,35 +1662,43 @@ DEPENDENCIES
flipper (~> 0.25.0)
flipper-active_record (~> 0.25.0)
flipper-active_support_cache_store (~> 0.25.0)
fog-aliyun (~> 0.3)
fog-aliyun (~> 0.4)
fog-aws (~> 3.15)
fog-core (= 2.1.0)
fog-google (~> 1.19)
fog-local (~> 0.8)
fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
fugit (~> 1.2.1)
fugit (~> 1.8.1)
fuubar (~> 2.2.0)
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 15.5.2)
gitaly (~> 15.9.0.pre.rc3)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 3.6.4)
gitlab-dangerfiles (~> 3.7.0)
gitlab-experiment (~> 0.7.1)
gitlab-fog-azure-rm (~> 1.4.0)
gitlab-labkit (~> 0.29.0)
gitlab-fog-azure-rm (~> 1.7.0)
gitlab-labkit (~> 0.30.1)
gitlab-license (~> 2.2.1)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.8.0)
gitlab-markup (~> 1.9.0)
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.10.0)
gitlab-sidekiq-fetcher (= 0.9.0)
gitlab-styles (~> 9.2.0)
gitlab-styles (~> 10.0.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.2.0)
gon (~> 6.4.0)
google-api-client (~> 0.33)
google-apis-cloudbilling_v1 (~> 0.21.0)
google-apis-cloudresourcemanager_v1 (~> 0.31.0)
google-apis-compute_v1 (~> 0.57.0)
google-apis-container_v1 (~> 0.43.0)
google-apis-container_v1beta1 (~> 0.43.0)
google-apis-core (~> 0.10.0)
google-apis-iam_v1 (~> 0.36.0)
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)
gpgme (~> 2.0.22)
grape (~> 1.5.2)
@ -1695,7 +1713,7 @@ DEPENDENCIES
graphql (~> 1.13.12)
graphql-docs (~> 2.1.0)
grpc (~> 1.42.0)
gssapi
gssapi (~> 1.3.1)
guard-rspec
haml_lint (~> 0.40.0)
hamlit (~> 2.15.0)
@ -1712,7 +1730,7 @@ DEPENDENCIES
ipynbdiff!
jira-ruby (~> 2.1.4)
js_regex (~> 3.8)
json (~> 2.5.1)
json (~> 2.6.3)
json_schemer (~> 0.2.18)
jwt (~> 2.1.0)
kaminari (~> 1.2.2)
@ -1720,7 +1738,7 @@ DEPENDENCIES
knapsack (~> 1.21.1)
kramdown (~> 2.3.1)
kubeclient (~> 4.9.3)!
lefthook (~> 1.2.7)
lefthook (~> 1.2.9)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
licensee (~> 9.15)
@ -1728,7 +1746,7 @@ DEPENDENCIES
lockbox (~> 1.1.1)
lograge (~> 0.5)
loofah (~> 2.19.1)
lookbook (~> 1.4, >= 1.4.5)
lookbook (~> 1.5, >= 1.5.3)
lru_redux
mail (= 2.7.1)
mail-smtp_pool (~> 0.1.0)!
@ -1740,17 +1758,16 @@ DEPENDENCIES
multi_json (~> 1.14.1)
net-ldap (~> 0.17.1)
net-ntp
nokogiri (~> 1.13.10)
nokogiri (~> 1.14.1)
oauth2 (~> 2.0)
octokit (~> 4.15)
ohai (~> 16.10)
oj (~> 3.13.21)
oj-introspect (~> 0.7)
omniauth (~> 2.1.0)
omniauth-alicloud (~> 2.0.0)
omniauth-alicloud (~> 2.0.1)
omniauth-atlassian-oauth2 (~> 0.2.0)
omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.3)
omniauth-azure-activedirectory-v2 (~> 2.0)
omniauth-azure-oauth2 (~> 0.0.9)!
omniauth-cas3 (~> 1.1.4)!
@ -1762,9 +1779,10 @@ DEPENDENCIES
omniauth-oauth2-generic (~> 0.2.2)
omniauth-salesforce (~> 1.0.5)!
omniauth-saml (~> 2.0.0)
omniauth-shibboleth (~> 1.3.0)
omniauth-twitter (~> 1.4)
omniauth_crowd (~> 2.4.0)!
omniauth_openid_connect (~> 0.6.1)
openid_connect (= 1.3.0)
openssl (= 2.2.2)
org-ruby (~> 0.9.12)
pact (~> 1.63)
@ -1772,13 +1790,13 @@ DEPENDENCIES
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.4.5)
pg_query (~> 2.2)
pg_query (~> 2.2, >= 2.2.1)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.17)
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.5.1)
pry-shell (~> 0.6.1)
puma (~> 5.6.5)
puma_worker_killer (~> 0.3.1)
rack (~> 2.2.6, >= 2.2.6.2)
@ -1787,7 +1805,7 @@ DEPENDENCIES
rack-oauth2 (~> 1.21.3)
rack-proxy (~> 0.7.6)
rack-timeout (~> 0.6.3)
rails (~> 6.1.6.1)
rails (~> 6.1.7.2)
rails-controller-testing
rails-i18n (~> 7.0)
rainbow (~> 3.0)
@ -1806,7 +1824,7 @@ DEPENDENCIES
rqrcode-rails3 (~> 0.1.7)
rspec-benchmark (~> 0.6.0)
rspec-parameterized
rspec-rails (~> 5.0.1)
rspec-rails (~> 6.0.1)
rspec-retry (~> 0.6.1)
rspec_junit_formatter
rspec_profiling (~> 0.0.6)
@ -1815,9 +1833,9 @@ DEPENDENCIES
ruby-magic (~> 0.5)
ruby-progressbar (~> 1.10)
ruby-saml (~> 1.13.0)
ruby_parser (~> 3.15)
ruby_parser (~> 3.19)
rubyzip (~> 2.3.2)
rugged (~> 1.2)
rugged (~> 1.5)
sanitize (~> 6.0)
sassc-rails (~> 2.1.0)
sd_notify (~> 0.1.0)
@ -1875,4 +1893,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)
BUNDLED WITH
2.3.26
2.4.6

539
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

File diff suppressed because it is too large Load Diff

23
pkgs/applications/video/vokoscreen-ng/default.nix
View File

@ -15,28 +15,24 @@
, gst-plugins-good
, gst-plugins-bad
, gst-plugins-ugly
, wayland
, wrapQtAppsHook
}:
mkDerivation rec {
mkDerivation rec {
pname = "vokoscreen-ng";
version = "3.0.8";
version = "3.5.0";
src = fetchFromGitHub {
owner = "vkohaupt";
repo = "vokoscreenNG";
rev = version;
sha256 = "1302663hyp2xxhaavhfky24a2p9gz23i3rykmrc6c1n23h24snri";
sha256 = "sha256-4VEIQj9/rSzXM5EQFt2I+cKKOM1URKlblf+6vlWEuO0=";
};
patches = [
# Adaptation of previously used https://github.com/City-busz/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637 patch
# used for 3.0.5 but incompatible at least since 3.0.8. The issue is addressed here https://github.com/vkohaupt/vokoscreenNG/issues/139
./linux-support-installation-target.patch
];
qmakeFlags = [ "src/vokoscreenNG.pro" ];
nativeBuildInputs = [ qttools pkg-config qmake ];
nativeBuildInputs = [ qttools pkg-config qmake wrapQtAppsHook ];
buildInputs = [
gstreamer
libX11
@ -44,7 +40,7 @@ mkDerivation rec {
qtbase
qtmultimedia
qtx11extras
wayland
gst-plugins-base
gst-plugins-good
gst-plugins-bad
@ -57,7 +53,12 @@ mkDerivation rec {
'';
postInstall = ''
mkdir -p $out/bin $out/share/applications $out/share/icons
cp ./vokoscreenNG $out/bin/
cp ./src/applications/vokoscreenNG.desktop $out/share/applications/
cp ./src/applications/vokoscreenNG.png $out/share/icons/
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
wrapQtApp $out/bin/vokoscreenNG
'';
meta = with lib; {

40
pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch
View File

@ -1,40 +0,0 @@
Seulement dans b: patch.patch
Seulement dans b: ..rej
diff --color -ur a/src/vokoscreenNG.pro b/src/vokoscreenNG.pro
--- a/src/vokoscreenNG.pro 2021-02-03 15:00:57.377401016 +0100
+++ b/src/vokoscreenNG.pro 2021-02-03 15:09:18.141905863 +0100
@@ -160,7 +160,32 @@
# systrayAlternative
include(systrayAlternative/systrayAlternative.pri)
+unix:!macx {
+ isEmpty(PREFIX) {
+ PREFIX = /usr/local
+ }
+ isEmpty(BINDIR) {
+ BINDIR = $$PREFIX/bin
+ }
+ isEmpty(DATADIR) {
+ DATADIR = $$PREFIX/share
+ }
+
+ target.path = $$BINDIR
+
+ icon.files = applications/vokoscreenNG.png
+ icon.path = $$DATADIR/icons/hicolor/256x256/apps/
+
+ desktop.files = applications/vokoscreenNG.desktop
+ desktop.path = $$DATADIR/applications/
+
+ appdata.files = applications/vokoscreenNG.appdata.xml
+ appdata.path = $$DATADIR/metainfo/
+
+ INSTALLS += target icon desktop appdata
+}
# ciscoOpenh264
win32:include(ciscoOpenh264/ciscoOpenh264.pri)
-unix:include(wayland/wayland.pri)
\ Pas de fin de ligne à la fin du fichier
+unix:include(wayland/wayland.pri)
+

58
pkgs/applications/window-managers/gamescope/default.nix
View File

@ -1,11 +1,13 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, meson
, pkg-config
, ninja
, xorg
, libdrm
, vulkan-loader
, vulkan-headers
, wayland
, wayland-protocols
, libxkbcommon
@ -18,15 +20,25 @@
, seatd
, xwayland
, glslang
, hwdata
, openvr
, stb
, wlroots
, libliftoff
, libdisplay-info
, lib
, makeBinaryWrapper
}:
let
pname = "gamescope";
version = "3.11.49";
version = "3.11.52-beta6";
vkroots = fetchFromGitHub {
owner = "Joshua-Ashton";
repo = "vkroots";
rev = "26757103dde8133bab432d172b8841df6bb48155";
sha256 = "sha256-eet+FMRO2aBQJcCPOKNKGuQv5oDIrgdVPRO00c5gkL0=";
};
in
stdenv.mkDerivation {
inherit pname version;
@ -35,10 +47,37 @@ stdenv.mkDerivation {
owner = "Plagman";
repo = "gamescope";
rev = "refs/tags/${version}";
hash = "sha256-GRq/b013wFRHzFz2YCulJRtcwzX/dhJKd8dkATSLug0=";
hash = "sha256-2gn6VQfmwwl86mmnRh+J1uxSIpA5x/Papq578seJ3n8=";
};
patches = [ ./use-pkgconfig.patch ];
patches = [
./use-pkgconfig.patch
# https://github.com/Plagman/gamescope/pull/811
(fetchpatch {
name = "fix-openvr-dependency-name.patch";
url = "https://github.com/Plagman/gamescope/commit/557e56badec7d4c56263d3463ca9cdb195e368d7.patch";
sha256 = "sha256-9Y1tJ24EsdtZEOCEA30+FJBrdzXX+Nj3nTb5kgcPfBE=";
})
# https://github.com/Plagman/gamescope/pull/813
(fetchpatch {
name = "fix-openvr-include.patch";
url = "https://github.com/Plagman/gamescope/commit/1331b9f81ea4b3ae692a832ed85a464c3fd4c5e9.patch";
sha256 = "sha256-wDtFpM/nMcqSbIpR7K5Tyf0845r3l4kQHfwll1VL4Mc=";
})
# https://github.com/Plagman/gamescope/pull/812
(fetchpatch {
name = "bump-libdisplay-info-maximum-version.patch";
url = "https://github.com/Plagman/gamescope/commit/b430c5b9a05951755051fd4e41ce20496705fbbc.patch";
sha256 = "sha256-YHtwudMUHiE8i3ZbiC9gkSjrlS0/7ydjmJsY1a8ZI2E=";
})
# https://github.com/Plagman/gamescope/pull/824
(fetchpatch {
name = "update-libdisplay-info-pkgconfig-filename.patch";
url = "https://github.com/Plagman/gamescope/commit/5a672f09aa07c7c5d674789f3c685c8173e7a2cf.patch";
sha256 = "sha256-7NX54WIsJDvZT3C58N2FQasV9PJyKkJrLGYS1r4f+kc=";
})
];
nativeBuildInputs = [
meson
@ -56,9 +95,11 @@ stdenv.mkDerivation {
xorg.libXtst
xorg.libXres
xorg.libXi
xorg.libXmu
libdrm
libliftoff
vulkan-loader
vulkan-headers
glslang
SDL2
wayland
@ -73,8 +114,17 @@ stdenv.mkDerivation {
pipewire
libcap
stb
hwdata
openvr
vkroots
libdisplay-info
];
postUnpack = ''
rm -rf source/subprojects/vkroots
ln -s ${vkroots} source/subprojects/vkroots
'';
# --debug-layers flag expects these in the path
postInstall = ''
wrapProgram "$out/bin/gamescope" \
@ -85,7 +135,7 @@ stdenv.mkDerivation {
description = "SteamOS session compositing window manager";
homepage = "https://github.com/Plagman/gamescope";
license = licenses.bsd2;
maintainers = with maintainers; [ nrdxp zhaofengli ];
maintainers = with maintainers; [ nrdxp pedrohlc Scrumplex zhaofengli ];
platforms = platforms.linux;
};
}

19
pkgs/applications/window-managers/hyprwm/hypr/default.nix
View File

@ -20,28 +20,19 @@
, xmodmap
}:
stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation (self: {
pname = "hypr";
version = "unstable-2022-05-25";
version = "unstable-2023-01-26";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "Hypr";
rev = "3e3d943c446ae77c289611a1a875c8dff8883c1e";
hash = "sha256-lyaGGm53qxg7WVoFxZ7kerLe12P1N3JbN8nut6oZS50=";
rev = "af4641847b578b233a6f06806f575b3f320d74da";
hash = "sha256-FUKR5nceEhm9GWa61hHO8+y4GBz7LYKXPB0OpQcQ674=";
};
patches = [
./000-dont-set-compiler.diff
# TODO: remove on next release
(fetchpatch {
url = "https://github.com/hyprwm/Hypr/commit/08d6af2caf882247943f0e8518ad782f35d1aba4.patch";
sha256 = "sha256-WjR12ZH8CE+l9xSeQUAPYW5r5HzoPpod5YqDPJTdTY8=";
})
(fetchpatch {
url = "https://github.com/hyprwm/Hypr/commit/7512a3ab91865b1e11b8c4a9dfdffb25c2b153de.patch";
sha256 = "sha256-0Hq5n115z0U44op7A1FO9tUOeMEPV0QgD5E5zcmend0=";
})
];
nativeBuildInputs = [
@ -81,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
meta = with lib; {
inherit (finalAttrs.src.meta) homepage;
inherit (self.src.meta) homepage;
description = "A tiling X11 window manager written in modern C++";
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];

6
pkgs/applications/window-managers/i3/status-rust.nix
View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.22.0";
version = "0.30.4";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-9Fp5k14QkV1CwLSL1nUUu6NYIpjfvI9vNJRYNqvyr3M=";
hash = "sha256-yJFM7+fpG/vnYvHRT+34rqToCfj8pjKpPRKQ49p2mh0=";
};
cargoSha256 = "sha256-MzosatZ4yPHAdANqOBPVW2wpjnojLo9B9N9o4DtU0Iw=";
cargoHash = "sha256-G2Yveyplq/SdHgc+sipQqQ67YAU/dPteESVJ8My5Hqs=";
nativeBuildInputs = [ pkg-config makeWrapper ];

10
pkgs/build-support/fetchdarcs/builder.sh
View File

@ -3,11 +3,15 @@ source $stdenv/setup
tagtext=""
tagflags=""
if test -n "$rev"; then
tagtext="(tag $rev) "
# Darcs hashes are sha1 (120 bits, 40-character hex)
if [[ "$rev" =~ [a-fA-F0-9]{40} ]]; then
tagtext="(hash $rev)"
tagflags="--to-hash=$rev"
elif test -n "$rev"; then
tagtext="(tag $rev)"
tagflags="--tag=$rev"
elif test -n "$context"; then
tagtext="(context) "
tagtext="(context)"
tagflags="--context=$context"
fi

11
pkgs/build-support/fetchdarcs/default.nix
View File

@ -1,12 +1,17 @@
{stdenvNoCC, darcs, cacert}:
{url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
{ url
, rev ? null
, context ? null
, md5 ? ""
, sha256 ? ""
, name ? "fetchdarcs"
}:
if md5 != "" then
throw "fetchdarcs does not support md5 anymore, please use sha256"
else
stdenvNoCC.mkDerivation {
name = "fetchdarcs";
builder = ./builder.sh;
nativeBuildInputs = [cacert darcs];
@ -14,5 +19,5 @@ stdenvNoCC.mkDerivation {
outputHashMode = "recursive";
outputHash = sha256;
inherit url rev context;
inherit url rev context name;
}

5
pkgs/build-support/ocaml/dune.nix
View File

@ -30,7 +30,10 @@ stdenv.mkDerivation ({
'';
installPhase = ''
runHook preInstall
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname}
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \
${if lib.versionAtLeast Dune.version "2.9"
then "--docdir $out/share/doc"
else ""}
runHook postInstall
'';

6
pkgs/data/fonts/mononoki/default.nix
View File

@ -2,19 +2,19 @@
stdenvNoCC.mkDerivation rec {
pname = "mononoki";
version = "1.3";
version = "1.5";
src = fetchzip {
url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip";
stripRoot = false;
hash = "sha256-bZYBRdmbQVs4i6UzMIHwJnoLWggX4CW8ZogNFYiX/9w=";
hash = "sha256-H5Iu7nSrB5UGlCSjTM3SLu+IjaAffk9TCm5OoOleKvw=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts/mononoki
cp webfont/* $out/share/fonts/mononoki
cp * $out/share/fonts/mononoki
runHook postInstall
'';

4
pkgs/data/misc/clash-geoip/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "clash-geoip";
version = "20230212";
version = "20230312";
src = fetchurl {
url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
sha256 = "sha256-Tnma6tpET4Vrm5G8KmLpsVnpD2JIKts56kZQsBIbRZ8=";
sha256 = "sha256-Y/glz6HUfjox9Mn+gPzA8+tUHqV/KkIInUn4SyajUiE=";
};
dontUnpack = true;

7
pkgs/desktops/deepin/apps/deepin-terminal/default.nix
View File

@ -8,6 +8,7 @@
, dde-qt-dbus-factory
, cmake
, qtbase
, qtsvg
, qttools
, qtx11extras
, pkg-config
@ -21,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "deepin-terminal";
version = "5.4.34";
version = "5.9.40";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-CpI7dyQwrYOYzqVZ6aa+/OAUC3xRyY4ZwzH1mqURTfY=";
sha256 = "sha256-GtrbR59IUYNAOmioW5NYhDsPKBmK4uybyDjHsbelkE4=";
};
patches = [
@ -49,6 +50,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
qtbase
qtsvg
dtkwidget
qt5platform-plugins
dde-qt-dbus-factory

4
pkgs/desktops/deepin/library/gio-qt/default.nix
View File

@ -26,12 +26,12 @@ stdenv.mkDerivation rec {
cmake
pkg-config
wrapQtAppsHook
] ++ lib.optional buildDocs [ doxygen qttools.dev ];
] ++ lib.optionals buildDocs [ doxygen qttools.dev ];
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DPROJECT_VERSION=${version}"
] ++ lib.optional (!buildDocs) [ "-DBUILD_DOCS=OFF" ];
] ++ lib.optionals (!buildDocs) [ "-DBUILD_DOCS=OFF" ];
propagatedBuildInputs = [ glibmm ];

2
pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
qmakeFlags = [
"INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
]
++ lib.optional (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ];
++ lib.optionals (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ];
meta = with lib; {
description = "Qt platform plugins for DDE";

4
pkgs/desktops/gnome/extensions/collisions.json
View File

@ -241,6 +241,10 @@
"workspace-indicator@gnome-shell-extensions.gcampax.github.com",
"horizontal-workspace-indicator@tty2.io"
],
"persian-calendar": [
"PersianCalendar@oxygenws.com",
"persian-calendar@iamrezamousavi.gmail.com"
],
"clipboard-indicator": [
"clipboard-indicator@tudmotu.com",
"clipboard-indicator@Dieg0Js.github.io"

3
pkgs/desktops/gnome/extensions/extensionRenames.nix
View File

@ -12,6 +12,9 @@
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
"PersianCalendar@oxygenws.com" = "persian-calendar";
"persian-calendar@iamrezamousavi.gmail.com" = "persian-calendar-2";
"clipboard-indicator@tudmotu.com" = "clipboard-indicator";
"clipboard-indicator@Dieg0Js.github.io" = "clipboard-indicator-2";

57
pkgs/desktops/gnome/extensions/extensions.json
View File

File diff suppressed because one or more lines are too long

6
pkgs/development/compilers/cudatoolkit/common.nix
View File

@ -151,6 +151,10 @@ backendStdenv.mkDerivation rec {
# Refer to comments in the overrides for cuda_nvcc for explanation
# CUDA_TOOLKIT_ROOT_DIR is legacy,
# Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
# NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the compiled
# binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as
# the default set of CUDA capabilities we build can regularly cause this to occur (for
# example, with Magma).
''
mkdir -p $out/nix-support
cat <<EOF >> $out/nix-support/setup-hook
@ -160,7 +164,7 @@ backendStdenv.mkDerivation rec {
if [ -z "\''${CUDAHOSTCXX-}" ]; then
export CUDAHOSTCXX=${backendStdenv.cc}/bin;
fi
export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin'
export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin -Xfatbin=-compress-all'
EOF
# Move some libraries to the lib output so that programs that

32
pkgs/development/compilers/cudatoolkit/flags.nix
View File

@ -4,12 +4,8 @@
}:
# Type aliases
# Gpu = {
# archName: String, # e.g., "Hopper"
# computeCapability: String, # e.g., "9.0"
# minCudaVersion: String, # e.g., "11.8"
# maxCudaVersion: String, # e.g., "12.0"
# }
# Gpu :: AttrSet
# - See the documentation in ./gpus.nix.
let
inherit (lib) attrsets lists strings trivial versions;
@ -34,22 +30,40 @@ let
# gpus :: List Gpu
gpus = builtins.import ./gpus.nix;
# isVersionIn :: Gpu -> Bool
# isSupported :: Gpu -> Bool
isSupported = gpu:
let
inherit (gpu) minCudaVersion maxCudaVersion;
lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion;
upperBoundSatisfied = !(strings.versionOlder maxCudaVersion cudaVersion);
upperBoundSatisfied = (maxCudaVersion == null)
|| !(strings.versionOlder maxCudaVersion cudaVersion);
in
lowerBoundSatisfied && upperBoundSatisfied;
# isDefault :: Gpu -> Bool
isDefault = gpu:
let
inherit (gpu) dontDefaultAfter;
newGpu = dontDefaultAfter == null;
recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaVersion;
in
recentGpu;
# supportedGpus :: List Gpu
# GPUs which are supported by the provided CUDA version.
supportedGpus = builtins.filter isSupported gpus;
# defaultGpus :: List Gpu
# GPUs which are supported by the provided CUDA version and we want to build for by default.
defaultGpus = builtins.filter isDefault supportedGpus;
# supportedCapabilities :: List Capability
supportedCapabilities = lists.map (gpu: gpu.computeCapability) supportedGpus;
# defaultCapabilities :: List Capability
# The default capabilities to target, if not overridden by the user.
defaultCapabilities = lists.map (gpu: gpu.computeCapability) defaultGpus;
# cudaArchNameToVersions :: AttrSet String (List String)
# Maps the name of a GPU architecture to different versions of that architecture.
# For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ].
@ -151,6 +165,6 @@ assert (formatCapabilities { cudaCapabilities = [ "7.5" "8.6" ]; }) == {
# dropDot :: String -> String
inherit dropDot;
} // formatCapabilities {
cudaCapabilities = config.cudaCapabilities or supportedCapabilities;
cudaCapabilities = config.cudaCapabilities or defaultCapabilities;
enableForwardCompat = config.cudaForwardCompat or true;
}

66
pkgs/development/compilers/cudatoolkit/gpus.nix
View File

@ -1,110 +1,148 @@
[
# Type alias
# Gpu = {
# archName: String
# - The name of the microarchitecture.
# computeCapability: String
# - The compute capability of the GPU.
# minCudaVersion: String
# - The minimum (inclusive) CUDA version that supports this GPU.
# dontDefaultAfter: null | String
# - The CUDA version after which to exclude this GPU from the list of default capabilities
# we build. null means we always include this GPU in the default capabilities if it is
# supported.
# maxCudaVersion: null | String
# - The maximum (exclusive) CUDA version that supports this GPU. null means there is no
# maximum.
# }
{
archName = "Kepler";
computeCapability = "3.0";
minCudaVersion = "10.0";
dontDefaultAfter = "10.2";
maxCudaVersion = "10.2";
}
{
archName = "Kepler";
computeCapability = "3.2";
minCudaVersion = "10.0";
dontDefaultAfter = "10.2";
maxCudaVersion = "10.2";
}
{
archName = "Kepler";
computeCapability = "3.5";
minCudaVersion = "10.0";
dontDefaultAfter = "11.0";
maxCudaVersion = "11.8";
}
{
archName = "Kepler";
computeCapability = "3.7";
minCudaVersion = "10.0";
dontDefaultAfter = "11.0";
maxCudaVersion = "11.8";
}
{
archName = "Maxwell";
computeCapability = "5.0";
minCudaVersion = "10.0";
maxCudaVersion = "12.0";
dontDefaultAfter = "11.0";
maxCudaVersion = null;
}
{
archName = "Maxwell";
computeCapability = "5.2";
minCudaVersion = "10.0";
maxCudaVersion = "12.0";
dontDefaultAfter = "11.0";
maxCudaVersion = null;
}
{
archName = "Maxwell";
computeCapability = "5.3";
minCudaVersion = "10.0";
maxCudaVersion = "12.0";
dontDefaultAfter = "11.0";
maxCudaVersion = null;
}
{
archName = "Pascal";
computeCapability = "6.0";
minCudaVersion = "10.0";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
{
archName = "Pascal";
computeCapability = "6.1";
minCudaVersion = "10.0";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
{
archName = "Pascal";
computeCapability = "6.2";
minCudaVersion = "10.0";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
{
archName = "Volta";
computeCapability = "7.0";
minCudaVersion = "10.0";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
{
archName = "Volta";
computeCapability = "7.2";
minCudaVersion = "10.0";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
{
archName = "Turing";
computeCapability = "7.5";
minCudaVersion = "10.0";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
{
archName = "Ampere";
computeCapability = "8.0";
minCudaVersion = "11.2";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
{
archName = "Ampere";
computeCapability = "8.6";
minCudaVersion = "11.2";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
{
archName = "Ampere";
computeCapability = "8.7";
minCudaVersion = "11.5";
maxCudaVersion = "12.0";
# NOTE: This is purposefully before 11.5 to ensure it is never a capability we target by
# default. 8.7 is the Jetson Orin series of devices which are a very specific platform.
# We keep this entry here in case we ever want to target it explicitly, but we don't
# want to target it by default.
dontDefaultAfter = "11.4";
maxCudaVersion = null;
}
{
archName = "Ada";
computeCapability = "8.9";
minCudaVersion = "11.8";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
{
archName = "Hopper";
computeCapability = "9.0";
minCudaVersion = "11.8";
maxCudaVersion = "12.0";
dontDefaultAfter = null;
maxCudaVersion = null;
}
]

6
pkgs/development/compilers/cudatoolkit/redist/overrides.nix
View File

@ -41,6 +41,10 @@ in
# uses the last --compiler-bindir it gets on the command line.
# FIXME: this results in "incompatible redefinition" warnings.
# https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin
# NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the
# compiled binaries. If binaries grow over 2GB, they will fail to link. This is a problem
# for us, as the default set of CUDA capabilities we build can regularly cause this to
# occur (for example, with Magma).
postInstall = (oldAttrs.postInstall or "") + ''
mkdir -p $out/nix-support
cat <<EOF >> $out/nix-support/setup-hook
@ -49,7 +53,7 @@ in
if [ -z "\''${CUDAHOSTCXX-}" ]; then
export CUDAHOSTCXX=${cc}/bin;
fi
export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin'
export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin -Xfatbin=-compress-all'
EOF
'';
});

2
pkgs/development/compilers/gnatboot/default.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
sourceHighlight
xz
zlib
] ++ lib.optional stdenv.buildPlatform.isLinux [
] ++ lib.optionals stdenv.buildPlatform.isLinux [
autoPatchelfHook
elfutils
glibc

26
pkgs/development/libraries/amf-headers/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "amf-headers";
version = "1.4.29";
src = fetchFromGitHub {
owner = "GPUOpen-LibrariesAndSDKs";
repo = "AMF";
rev = "v${version}";
sha256 = "sha256-gu8plGUUVE/De2bRjTUN8JKsmj/0r/IsqhMpln1DZGU=";
};
installPhase = ''
mkdir -p $out/include/AMF
cp -r amf/public/include/* $out/include/AMF
'';
meta = with lib; {
description = "Headers for The Advanced Media Framework (AMF)";
homepage = "https://github.com/GPUOpen-LibrariesAndSDKs/AMF";
license = licenses.mit;
maintainers = with maintainers; [ devusb ];
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/aws-c-cal/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-cal";
version = "0.5.20";
version = "0.5.21";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YBZrOyianmD0E5WcklLkud1WGF/t08XIbfu5qbEo+g4=";
sha256 = "sha256-WMCLVwRrgwFsaqoKtbQNt0bHVYi1LUZt5r0i3oAfWFE=";
};
nativeBuildInputs = [ cmake ];

2
pkgs/development/libraries/jbig2enc/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
hash = "sha256-IAL4egXgaGmCilzcryjuvOoHhahyrfGWY68GBfXXgAM=";
};
buildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook ];
propagatedBuildInputs = [
leptonica
zlib

2
pkgs/development/libraries/libax25/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
pname = "libax25";
version = "0.0.12-rc5";
buildInputs = [ glibc ] ++ lib.optional stdenv.hostPlatform.isStatic [ glibc.static ];
buildInputs = [ glibc ] ++ lib.optionals stdenv.hostPlatform.isStatic [ glibc.static ];
# Due to recent unsolvable administrative domain problems with linux-ax25.org,
# the new domain is linux-ax25.in-berlin.de

3
pkgs/development/libraries/libdatovka/default.nix
View File

@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
"--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook"
];
buildInputs = [ pkg-config autoreconfHook expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ];
meta = with lib; {
description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";

2
pkgs/development/libraries/libfabric/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optional enablePsm2 [ libpsm2 ];
buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optionals enablePsm2 [ libpsm2 ];
configureFlags = [
(if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2")

4
pkgs/development/libraries/libime/default.nix
View File

@ -26,13 +26,13 @@ let
in
stdenv.mkDerivation rec {
pname = "libime";
version = "1.0.15";
version = "1.0.17";
src = fetchFromGitHub {
owner = "fcitx";
repo = "libime";
rev = version;
sha256 = "sha256-QZxXhrrSkxe7bDY7V7Ns5YZaaYJiEnGmHgGLstGMBzc=";
sha256 = "sha256-mc0Mknqki0pY4oKf8B6H67N+1eMu7wbqF7wES22Kw1A=";
fetchSubmodules = true;
};

6
pkgs/development/libraries/libliftoff/default.nix
View File

@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "libliftoff";
version = "0.3.0";
version = "0.4.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MbXDUkAA9gY6Qb6Ok33MNuqIfb4bPIEHd1IVH/UmH10=";
sha256 = "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY=";
};
nativeBuildInputs = [ meson pkg-config ninja ];
@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/emersion/libliftoff/releases/tag/v${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
maintainers = with maintainers; [ pedrohlc primeos Scrumplex ];
};
}

55
pkgs/development/libraries/openvr/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ lib
, stdenv
, cmake
, libGL
, jsoncpp
, fetchFromGitHub
, fetchpatch2
}:
stdenv.mkDerivation rec {
pname = "openvr";
version = "1.23.8";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = pname;
rev = "v${version}";
hash = "sha256-ZdL1HDRSpPykbV3M0CjCZkOt7XlF7Z7OAhOey2ALeHg=";
};
patches = [
# https://github.com/ValveSoftware/openvr/pull/594
(fetchpatch2 {
name = "use-correct-CPP11-definition-for-vsprintf_s.patch";
url = "https://github.com/ValveSoftware/openvr/commit/0fa21ba17748efcca1816536e27bdca70141b074.patch";
sha256 = "sha256-0sPNDx5qKqCzN35FfArbgJ0cTztQp+SMLsXICxneLx4=";
})
# https://github.com/ValveSoftware/openvr/pull/1716
(fetchpatch2 {
name = "add-ability-to-build-with-system-installed-jsoncpp.patch";
url = "https://github.com/ValveSoftware/openvr/commit/54a58e479f4d63e62e9118637cd92a2013a4fb95.patch";
sha256 = "sha256-aMojjbNjLvsGev0JaBx5sWuMv01sy2tG/S++I1NUi7U=";
})
];
postUnpack = ''
# Move in-tree jsoncpp out to complement the patch above
# fetchpatch2 is not able to handle these renames
mkdir source/thirdparty
mv source/src/json source/thirdparty/jsoncpp
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ jsoncpp libGL ];
cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" "-DBUILD_SHARED=1" ];
meta = with lib;{
homepage = "https://github.com/ValveSoftware/openvr";
description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting";
license = licenses.bsd3;
maintainers = with maintainers; [ pedrohlc Scrumplex ];
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/xcb-imdkit/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "xcb-imdkit";
version = "1.0.4";
version = "1.0.5";
src = fetchFromGitHub {
owner = "fcitx";
repo = "xcb-imdkit";
rev = version;
sha256 = "sha256-WSJBEB6VHRYUkzXr7frdLLpKihuS00ZUINW7e4oYOlY=";
sha256 = "sha256-jbIhcxZzGlklpoMjLAYkKlh/CBE8R4jARO6nfnzSXOQ=";
};
nativeBuildInputs = [

2
pkgs/development/misc/datafusion/default.nix
View File

@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-w+/5Ig+U8y4nwu7QisnZvc3UlZaEU/kovV6birOWndE=";
buildInputs = lib.optional stdenv.isDarwin [
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];

16
pkgs/development/php-packages/msgpack/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ buildPecl, lib }:
buildPecl rec {
version = "2.2.0RC2";
pname = "msgpack";
sha256 = "sha256-bVV043knbk7rionXqB70RKa1zlJ5K/Nw0oTXZllmJOg=";
meta = with lib; {
changelog = "https://pecl.php.net/package-info.php?package=msgpack&version=${version}";
description = "PHP extension for interfacing with MessagePack";
license = licenses.bsd3;
homepage = "https://github.com/msgpack/msgpack-php";
maintainers = teams.php.members ++ [ maintainers.ostrolucky ];
};
}

19
pkgs/development/php-packages/ssh2/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ buildPecl, lib, libssh2 }:
buildPecl rec {
version = "1.3.1";
pname = "ssh2";
sha256 = "sha256-kJOh+NJNxlg2AnsOI5xQ3o1err+DlrwzMf3TjF1pr9k=";
buildInputs = [ libssh2 ];
configureFlags = [ "--with-ssh2=${libssh2.dev}" ];
meta = with lib; {
changelog = "https://pecl.php.net/package-info.php?package=ssh2&version=${version}";
description = "PHP bindings for the libssh2 library";
license = licenses.php301;
homepage = "https://github.com/php/pecl-networking-ssh2";
maintainers = teams.php.members ++ [ maintainers.ostrolucky ];
};
}

80
pkgs/development/python-modules/bc-detect-secrets/default.nix Normal file
View File

@ -0,0 +1,80 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, gibberish-detector
, mock
, pkgs
, pyahocorasick
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, responses
, unidiff
}:
buildPythonPackage rec {
pname = "bc-detect-secrets";
version = "1.4.14";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "detect-secrets";
rev = "refs/tags/${version}";
hash = "sha256-WgUbVpn5KoayiWv3sYp+hZxqfQg73k0pXkxgUK8wrPg=";
};
propagatedBuildInputs = [
pyyaml
requests
unidiff
];
passthru.optional-dependencies = {
word_list = [
pyahocorasick
];
gibberish = [
gibberish-detector
];
};
nativeCheckInputs = [
mock
pkgs.gitMinimal
pytestCheckHook
responses
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
preCheck = ''
export HOME=$(mktemp -d);
'';
disabledTests = [
# Tests are failing for various reasons (missing git repo, missing test data, etc.)
"test_baseline_filters_out_known_secrets"
"test_make_decisions"
"test_saves_to_baseline"
"test_start_halfway"
"TestCreate"
"TestDiff"
"TestGetFilesToScan"
"TestLineNumberChanges"
"TestModifiesBaselineFromVersionChange"
];
pythonImportsCheck = [
"detect_secrets"
];
meta = with lib; {
description = "Tool to detect secrets in the code";
homepage = "https://github.com/bridgecrewio/detect-secrets";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

48
pkgs/development/python-modules/bc-jsonpath-ng/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, decorator
, fetchFromGitHub
, ply
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "bc-jsonpath-ng";
version = "1.5.9";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "jsonpath-ng";
rev = "refs/tags/${version}";
hash = "sha256-Uho+slKmKkTrcJBKi+9GJv1JrvDrTP4/6uqmMn3qptU=";
};
propagatedBuildInputs = [
decorator
ply
];
nativeCheckInputs = [
pytestCheckHook
];
disabledTestPaths = [
# Exclude tests that require oslotest
"tests/test_jsonpath_rw_ext.py"
];
pythonImportsCheck = [
"bc_jsonpath_ng"
];
meta = with lib; {
description = "JSONPath implementation for Python";
homepage = "https://github.com/bridgecrewio/jsonpath-ng";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/bthome-ble/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "2.8.0";
version = "2.9.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-SdYS/S3wBmIl/f+0H67PcMRX7GiJqAkysvlENshB1yY=";
hash = "sha256-qVPlrj6EVTPJ/HiwynIg6iuJzUGb6Lan/QKC29C2YNk=";
};
nativeBuildInputs = [

12
pkgs/development/python-modules/crownstone-cloud/default.nix
View File

@ -3,6 +3,7 @@
, asynctest
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, certifi
, pythonOlder
, pytestCheckHook
@ -18,10 +19,19 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "crownstone";
repo = "crownstone-lib-python-cloud";
rev = version;
rev = "refs/tags/${version}";
hash = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0=";
};
patches = [
# Remove asynctest, https://github.com/crownstone/crownstone-lib-python-cloud/pull/4
(fetchpatch {
name = "remove-asynctest.patch";
url = "https://github.com/crownstone/crownstone-lib-python-cloud/commit/7f22c9b284bf8d7f6f43e205816787dd3bb37e78.patch";
hash = "sha256-LS1O9LVB14WyBXfuHf/bs1juJ59zWhJ8pL4aGtVrTG8=";
})
];
propagatedBuildInputs = [
aiohttp
asynctest

28
pkgs/development/python-modules/exrex/default.nix
View File

@ -1,31 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pythonOlder
}:
buildPythonPackage rec {
pname = "exrex";
version = "unstable-2021-04-22";
version = "0.11.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "asciimoo";
repo = "exrex";
rev = "9a66706e7582a9cf31c4121629c9035e329bbe21";
hash = "sha256-g31tHY+LzGxwBmUpSa0DV7ruLfYwmuDg+XyBxMZRa9U=";
# https://github.com/asciimoo/exrex/issues/68
rev = "239e4da37ff3a66d8b4b398d189299ae295594c3";
hash = "sha256-Tn/XIIy2wnob+1FmP9bdD9+gHLQZDofF2c1FqOijKWA=";
};
patches = [
(fetchpatch {
# https://github.com/asciimoo/exrex/pull/65
url = "https://github.com/asciimoo/exrex/commit/44712bfb1350a509581a5834d9fa8aebcd9434db.patch";
hash = "sha256-thKotSvdVdVjXaG/AhsXmW51FHLOYUeYTYw8SA/k2t4=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace "version=about['__version__']," "version='${version}',"
'';
# Projec thas no released tests
doCheck = false;
pythonImportsCheck = [ "exrex" ];
pythonImportsCheck = [
"exrex"
];
meta = with lib; {
description = "Irregular methods on regular expressions";

2
pkgs/development/python-modules/extractcode/7z.nix
View File

@ -27,7 +27,7 @@ buildPythonPackage rec {
rm 7z 7z.so
ln -s ${p7zip}/bin/7z 7z
ln -s ${p7zip}/lib/p7zip/7z.so 7z.so
ln -s ${lib.getLib p7zip}/lib/p7zip/7z.so 7z.so
popd
'';

2
pkgs/development/python-modules/google-nest-sdm/default.nix
View File

@ -1,6 +1,5 @@
{ lib
, aiohttp
, asynctest
, buildPythonPackage
, coreutils
, fetchFromGitHub
@ -37,7 +36,6 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
asynctest
coreutils
pytest-aiohttp
pytest-asyncio

6
pkgs/development/python-modules/idasen/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "idasen";
version = "0.9.4";
version = "0.9.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "newAM";
repo = "idasen";
rev = "v${version}";
hash = "sha256-GYQj7hiwyrCQDK19tZ7gN/pS1mFDSHgRfz7eCsKise4=";
rev = "refs/tags/v${version}";
hash = "sha256-tjjoKUaX1v06I43TkkvKRHmd1rDuXqjEIHSTatbzyQk=";
};
nativeBuildInputs = [

13
pkgs/development/python-modules/ismartgate/default.nix
View File

@ -1,5 +1,4 @@
{ lib
, asynctest
, buildPythonPackage
, click
, defusedxml
@ -29,6 +28,11 @@ buildPythonPackage rec {
hash = "sha256-o2yzMxrF0WB6MbeL1Tuf0Sq4wS4FDIWZZx1x2rvwLmY=";
};
postPatch = ''
substituteInPlace setup.py \
--replace '"pytest-runner>=5.2",' ""
'';
propagatedBuildInputs = [
click
defusedxml
@ -39,18 +43,12 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
asynctest
pytest-asyncio
pytest-raises
pytestCheckHook
respx
];
postPatch = ''
substituteInPlace setup.py \
--replace '"pytest-runner>=5.2",' ""
'';
pythonImportsCheck = [
"ismartgate"
];
@ -58,6 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module to work with the ismartgate and gogogate2 API";
homepage = "https://github.com/bdraco/ismartgate";
changelog = "https://github.com/bdraco/ismartgate/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

596
pkgs/development/python-modules/json-stream-rs-tokenizer/Cargo.lock generated Normal file
View File

@ -0,0 +1,596 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "arrayvec"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bytecount"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
[[package]]
name = "camino"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055"
dependencies = [
"serde",
]
[[package]]
name = "cargo-platform"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
dependencies = [
"serde",
]
[[package]]
name = "cargo_metadata"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
dependencies = [
"camino",
"cargo-platform",
"semver",
"serde",
"serde_json",
]
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "error-chain"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
dependencies = [
"version_check",
]
[[package]]
name = "fastrand"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
dependencies = [
"instant",
]
[[package]]
name = "glob"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "indoc"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780"
[[package]]
name = "instant"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
"cfg-if",
]
[[package]]
name = "itoa"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
[[package]]
name = "json-stream-rs-tokenizer"
version = "0.1.0"
dependencies = [
"num-bigint",
"pyo3",
"pyo3-build-config 0.17.3",
"pyo3-file",
"thiserror",
"utf8-chars",
]
[[package]]
name = "libc"
version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
name = "lock_api"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
dependencies = [
"autocfg",
"scopeguard",
]
[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "num-bigint"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
dependencies = [
"autocfg",
"num-integer",
"num-traits",
]
[[package]]
name = "num-integer"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
"autocfg",
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
"autocfg",
]
[[package]]
name = "once_cell"
version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]]
name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-sys",
]
[[package]]
name = "proc-macro2"
version = "1.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pulldown-cmark"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
dependencies = [
"bitflags",
"memchr",
"unicase",
]
[[package]]
name = "pyo3"
version = "0.16.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0220c44442c9b239dd4357aa856ac468a4f5e1f0df19ddb89b2522952eb4c6ca"
dependencies = [
"cfg-if",
"indoc",
"libc",
"num-bigint",
"parking_lot",
"pyo3-build-config 0.16.6",
"pyo3-ffi",
"pyo3-macros",
"unindent",
]
[[package]]
name = "pyo3-build-config"
version = "0.16.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c819d397859445928609d0ec5afc2da5204e0d0f73d6bf9e153b04e83c9cdc2"
dependencies = [
"once_cell",
"target-lexicon",
]
[[package]]
name = "pyo3-build-config"
version = "0.17.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8"
dependencies = [
"once_cell",
"target-lexicon",
]
[[package]]
name = "pyo3-ffi"
version = "0.16.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca882703ab55f54702d7bfe1189b41b0af10272389f04cae38fe4cd56c65f75f"
dependencies = [
"libc",
"pyo3-build-config 0.16.6",
]
[[package]]
name = "pyo3-file"
version = "0.5.0"
source = "git+https://github.com/smheidrich/pyo3-file.git?branch=divide-buf-length-by-4-to-fix-textio-bug-forjsonstream#c29bf591842e3487e8b00890b91e0d4841103138"
dependencies = [
"pyo3",
"skeptic",
]
[[package]]
name = "pyo3-macros"
version = "0.16.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "568749402955ad7be7bad9a09b8593851cd36e549ac90bfd44079cea500f3f21"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
"syn",
]
[[package]]
name = "pyo3-macros-backend"
version = "0.16.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "611f64e82d98f447787e82b8e7b0ebc681e1eb78fc1252668b2c605ffb4e1eb8"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "quote"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
dependencies = [
"proc-macro2",
]
[[package]]
name = "redox_syscall"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags",
]
[[package]]
name = "remove_dir_all"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
dependencies = [
"winapi",
]
[[package]]
name = "ryu"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
[[package]]
name = "same-file"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
dependencies = [
"winapi-util",
]
[[package]]
name = "scopeguard"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "semver"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
dependencies = [
"serde",
]
[[package]]
name = "serde"
version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_json"
version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
dependencies = [
"itoa",
"ryu",
"serde",
]
[[package]]
name = "skeptic"
version = "0.13.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8"
dependencies = [
"bytecount",
"cargo_metadata",
"error-chain",
"glob",
"pulldown-cmark",
"tempfile",
"walkdir",
]
[[package]]
name = "smallvec"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "syn"
version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "target-lexicon"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
[[package]]
name = "tempfile"
version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
dependencies = [
"cfg-if",
"fastrand",
"libc",
"redox_syscall",
"remove_dir_all",
"winapi",
]
[[package]]
name = "thiserror"
version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "unicase"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
dependencies = [
"version_check",
]
[[package]]
name = "unicode-ident"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
[[package]]
name = "unindent"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
[[package]]
name = "utf8-chars"
version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "437bc4a6a3acdb2a99491b19ec1c2131a536d9f1d7da112341ec5c9e5f4dfc3a"
dependencies = [
"arrayvec",
]
[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "walkdir"
version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
dependencies = [
"same-file",
"winapi",
"winapi-util",
]
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi",
]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
[[package]]
name = "windows_i686_gnu"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
[[package]]
name = "windows_i686_msvc"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"

63
pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix Normal file
View File

@ -0,0 +1,63 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, rustPlatform
, setuptools-rust
, json-stream-rs-tokenizer
, json-stream
}:
buildPythonPackage rec {
pname = "json-stream-rs-tokenizer";
version = "0.4.13";
format = "setuptools";
src = fetchFromGitHub {
owner = "smheidrich";
repo = "py-json-stream-rs-tokenizer";
rev = "refs/tags/v${version}";
hash = "sha256-9pJi80V7WKvsgtp0ffItWnjoOvFvfE/Sz6y2VlsU+wQ=";
};
postPatch = ''
cp ${./Cargo.lock} ./Cargo.lock
'';
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src postPatch;
name = "${pname}-${version}";
hash = "sha256-TjRdHSXHmF6fzCshX1I4Sq+A/fEmBHDPGZvJUxL13aM=";
};
nativeBuildInputs = [
setuptools-rust
]
++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
# Tests depend on json-stream, which depends on this package.
# To avoid infinite recursion, we only enable tests when building passthru.tests.
doCheck = false;
checkInputs = [
json-stream
];
pythonImportsCheck = [
"json_stream_rs_tokenizer"
];
passthru.tests = {
runTests = json-stream-rs-tokenizer.overrideAttrs (_: { doCheck = true; });
};
meta = with lib; {
description = "A faster tokenizer for the json-stream Python library";
homepage = "https://github.com/smheidrich/py-json-stream-rs-tokenizer";
license = licenses.mit;
maintainers = with maintainers; [ winter ];
};
}

8
pkgs/development/python-modules/json-stream/default.nix
View File

@ -1,9 +1,12 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, iconv
, pytestCheckHook
, pythonOlder
, requests
, json-stream-rs-tokenizer
, setuptools
}:
@ -23,8 +26,13 @@ buildPythonPackage rec {
setuptools
];
buildInputs = lib.optionals stdenv.isDarwin [
iconv
];
propagatedBuildInputs = [
requests
json-stream-rs-tokenizer
];
nativeCheckInputs = [

4
pkgs/development/python-modules/mkdocs-minify/default.nix
View File

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "mkdocs-minify";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "byrnereese";
repo = "${pname}-plugin";
rev = "refs/tags/${version}";
hash = "sha256-ABoLt5sFpt8Hm07tkqeAcs63ZvJ4vTbGw4QRYVYpMEA=";
hash = "sha256-ajXkEKLBC86Y8YzDCZXd6x6QtLLrCDJkb6kDrRE536o=";
};
propagatedBuildInputs = [

25
pkgs/development/python-modules/myjwt/default.nix
View File

@ -6,6 +6,7 @@
, cryptography
, exrex
, fetchFromGitHub
, poetry-core
, pyopenssl
, pyperclip
, pytest-mock
@ -18,18 +19,28 @@
buildPythonPackage rec {
pname = "myjwt";
version = "1.6.0";
format = "setuptools";
version = "1.6.1";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "mBouamama";
repo = "MyJWT";
rev = "refs/tags/${version}";
hash = "sha256-A9tsQ6L+y3doL5pJbau3yKnmQtX2IPXWyW/YCLhS7nc=";
hash = "sha256-qdDA8DpJ9kAPTvCkQcPBHNlUqxwsS0vAESglvUygXhg=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "1.6.0" "${version}" \
--replace 'cryptography = "^39.0.2"' 'cryptography = "^39.0.0"'
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
click
colorama
@ -47,11 +58,6 @@ buildPythonPackage rec {
requests-mock
];
postPatch = ''
# Remove all version pinning (E.g., tornado==5.1.1 -> tornado)
sed -i -e "s/==[0-9.]*//" requirements.txt
'';
pythonImportsCheck = [
"myjwt"
];
@ -59,6 +65,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)";
homepage = "https://github.com/mBouamama/MyJWT";
changelog = "https://github.com/tyki6/MyJWT/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
# Build failures

2
pkgs/development/python-modules/pyregion/default.nix
View File

@ -48,7 +48,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook pytest-astropy ];
disabledTests = lib.optional (!stdenv.hostPlatform.isDarwin) [
disabledTests = lib.optionals (!stdenv.hostPlatform.isDarwin) [
# Skipping 2 tests because it's failing. Domain knowledge was unavailable on decision.
# Error logs: https://gist.github.com/superherointj/3f616f784014eeb2e3039b0f4037e4e9
"test_calculate_rotation_angle"

4
pkgs/development/python-modules/python-otbr-api/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "python-otbr-api";
version = "1.0.7";
version = "1.0.9";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-R6H+h6IbyI/Qhwb6ACT2sx/YWmLDMyg4gLMJdmNj2wk=";
hash = "sha256-Rg5+EOsxRse618WvP4+9ybiu0mJpizrzCmeIbRnFgaA=";
};
nativeBuildInputs = [

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