Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bcc4d12e17
64 changed files with 436 additions and 190 deletions
|
|
@ -6580,7 +6580,7 @@
|
|||
githubId = 4158274;
|
||||
name = "Michiel Leenaars";
|
||||
};
|
||||
legendofmiracles = {
|
||||
lom = {
|
||||
email = "legendofmiracles@protonmail.com";
|
||||
matrix = "@legendofmiracles:matrix.org";
|
||||
github = "legendofmiracles";
|
||||
|
|
|
|||
|
|
@ -402,5 +402,43 @@ let self = {
|
|||
"21.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-06dc98082bc55c1fc";
|
||||
"21.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-04737dd49b98936c6";
|
||||
|
||||
latest = self."21.05";
|
||||
# 21.11.333823.96b4157790f-x86_64-linux
|
||||
"21.11".eu-west-1.x86_64-linux.hvm-ebs = "ami-01d0304a712f2f3f0";
|
||||
"21.11".eu-west-2.x86_64-linux.hvm-ebs = "ami-00e828bfc1e5d09ac";
|
||||
"21.11".eu-west-3.x86_64-linux.hvm-ebs = "ami-0e1ea64430d8103f2";
|
||||
"21.11".eu-central-1.x86_64-linux.hvm-ebs = "ami-0fcf28c07e86142c5";
|
||||
"21.11".eu-north-1.x86_64-linux.hvm-ebs = "ami-0ee83a3c6590fd6b1";
|
||||
"21.11".us-east-1.x86_64-linux.hvm-ebs = "ami-099756bfda4540da0";
|
||||
"21.11".us-east-2.x86_64-linux.hvm-ebs = "ami-0b20a80b82052d23f";
|
||||
"21.11".us-west-1.x86_64-linux.hvm-ebs = "ami-088ea590004b01752";
|
||||
"21.11".us-west-2.x86_64-linux.hvm-ebs = "ami-0025b9d4831b911a7";
|
||||
"21.11".ca-central-1.x86_64-linux.hvm-ebs = "ami-0e67089f898e74443";
|
||||
"21.11".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0dc8d718279d3402d";
|
||||
"21.11".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0155e842329970187";
|
||||
"21.11".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-07c95eda953bf5435";
|
||||
"21.11".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-04167df3cd952b3bd";
|
||||
"21.11".ap-south-1.x86_64-linux.hvm-ebs = "ami-0680e05531b3db677";
|
||||
"21.11".ap-east-1.x86_64-linux.hvm-ebs = "ami-0835a3e481dc240f9";
|
||||
"21.11".sa-east-1.x86_64-linux.hvm-ebs = "ami-0f7c354c421348e51";
|
||||
|
||||
# 21.11.333823.96b4157790f-aarch64-linux
|
||||
"21.11".eu-west-1.aarch64-linux.hvm-ebs = "ami-048f3eea6a12c4b3b";
|
||||
"21.11".eu-west-2.aarch64-linux.hvm-ebs = "ami-0e6f18f2009806add";
|
||||
"21.11".eu-west-3.aarch64-linux.hvm-ebs = "ami-0a28d593f5e938d80";
|
||||
"21.11".eu-central-1.aarch64-linux.hvm-ebs = "ami-0b9c95d926ab9474c";
|
||||
"21.11".eu-north-1.aarch64-linux.hvm-ebs = "ami-0f2d400b4a2368a1a";
|
||||
"21.11".us-east-1.aarch64-linux.hvm-ebs = "ami-05afb75585567d386";
|
||||
"21.11".us-east-2.aarch64-linux.hvm-ebs = "ami-07f360673c2fccf8d";
|
||||
"21.11".us-west-1.aarch64-linux.hvm-ebs = "ami-0a6892c61d85774db";
|
||||
"21.11".us-west-2.aarch64-linux.hvm-ebs = "ami-04eaf20283432e852";
|
||||
"21.11".ca-central-1.aarch64-linux.hvm-ebs = "ami-036b69828502e7fdf";
|
||||
"21.11".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-0d52e51e68b6954ef";
|
||||
"21.11".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-000a3019e003f4fb9";
|
||||
"21.11".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-09b0c7928780e25b6";
|
||||
"21.11".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-05f80f3c83083ff62";
|
||||
"21.11".ap-south-1.aarch64-linux.hvm-ebs = "ami-05b2a3ff8489c3f59";
|
||||
"21.11".ap-east-1.aarch64-linux.hvm-ebs = "ami-0aa3b50a4f2822a00";
|
||||
"21.11".sa-east-1.aarch64-linux.hvm-ebs = "ami-00f68eff453d3fe69";
|
||||
|
||||
latest = self."21.11";
|
||||
}; in self
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/lawl/NoiseTorch";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ panaeon legendofmiracles ];
|
||||
maintainers = with maintainers; [ panaeon lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schismtracker";
|
||||
version = "20210525";
|
||||
version = "20211116";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "06ybkbqry7f7lmzgwb9s7ipafshl5gdj98lcjsjkcbnywj8r9b3h";
|
||||
sha256 = "1kcw4rwphyqh0hwwjsydzwg484xj17rb5lc8pfsixsg77z50ayzz";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-dependency-tracking" ]
|
||||
|
|
@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Music tracker application, free reimplementation of Impulse Tracker";
|
||||
homepage = "http://schismtracker.org/";
|
||||
|
|
|
|||
|
|
@ -47,7 +47,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
runHook preInstall
|
||||
|
||||
substituteInPlace mime/*.desktop \
|
||||
--replace "Exec=mcomix" "Exec=mcomix3"
|
||||
--replace "Exec=mcomix" "Exec=mcomix3" \
|
||||
--replace "Icon=mcomix" "Icon=${pname}"
|
||||
${python3.executable} installer.py --srcdir=mcomix --target=$libdir
|
||||
mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname}
|
||||
mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb
|
||||
|
|
|
|||
|
|
@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Use your tablet as graphic tablet/touch screen on your computer";
|
||||
homepage = "https://github.com/H-M-H/Weylus";
|
||||
license = with licenses; [ agpl3Only ];
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,6 @@ buildDotnetModule rec {
|
|||
homepage = "https://github.com/JustArchiNET/ArchiSteamFarm";
|
||||
license = licenses.asl20;
|
||||
platforms = dotnetCorePackages.aspnetcore_5_0.meta.platforms;
|
||||
maintainers = with maintainers; [ SuperSandro2000 legendofmiracles ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Simple and fast TUI file manager with no dependencies";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
homepage = "https://github.com/willeccles/cfm";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.9.4",
|
||||
"version": "1.9.5",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "1.9.4",
|
||||
"desktopSrcHash": "sTY55DWeEKV3Ma5DTr4W6K6BjrE019aY8LRk/5f8pPM=",
|
||||
"version": "1.9.5",
|
||||
"desktopSrcHash": "8x3TBu0zSNEVWp+ULydule8bPSd01pMkCZHdJbQf82U=",
|
||||
"desktopYarnHash": "0axz0d5qryd0k89lrziah1r6j1154c1cibf1qsjk1azlri3k4298",
|
||||
"webHash": "141iz2jcvwyv3fpi63ddi697qzkk6jg100d0lz6iam98m8m35g24"
|
||||
"webHash": "04pabvvb3l88gp866fkbjngl9r20s300pvw7qykynl0ps8fjms0l"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b9wxjwnhhs3vi1x55isdqck67lh1r7nf3dwmhlwcg5887smwp5c";
|
||||
sha256 = "sha256-ovg+oMlt3XzOxG9w/5Li3awMyRdIt1/JnIFfZktftkw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1s278d73mwqpq3n5vmrn5jb6g5dafaaplnhs8346pwcc6y16w3d3";
|
||||
cargoSha256 = "sha256-0CA0HwFI86VfSyBNn0nlC1n4BVgOc9BLh1it7ReT8+Y=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec {
|
|||
homepage = "https://github.com/sdushantha/tmpmail";
|
||||
description = "A temporary email right from your terminal written in POSIX sh ";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.legendofmiracles ];
|
||||
maintainers = [ maintainers.lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,7 +90,16 @@ stdenv.mkDerivation rec {
|
|||
cd Installer
|
||||
# don't restrict PATH, that has already been done
|
||||
sed -i -e 's/^PATH=/# PATH=/' MathInstaller
|
||||
sed -i -e 's/\/bin\/bash/\/bin\/sh/' MathInstaller
|
||||
|
||||
# Fix the installation script as follows:
|
||||
# 1. Adjust the shebang
|
||||
# 2. Use the wrapper in the desktop items
|
||||
substituteInPlace MathInstaller \
|
||||
--replace "/bin/bash" "/bin/sh" \
|
||||
--replace "Executables/Mathematica" "../../bin/mathematica"
|
||||
|
||||
# Install the desktop items
|
||||
export XDG_DATA_HOME="$out/share"
|
||||
|
||||
echo "=== Running MathInstaller ==="
|
||||
./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent
|
||||
|
|
|
|||
|
|
@ -11,20 +11,19 @@ with lib;
|
|||
let
|
||||
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
|
||||
pname = "gitkraken";
|
||||
version = "8.1.0";
|
||||
version = "8.1.1";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchzip {
|
||||
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
sha256 = "sha256-yC7MGTVxD8xEutlleH3WKRnendnv0KijhUwQ00wwJYQ";
|
||||
sha256 = "sha256-C6R7/ucQhMsugg7qT+B8OG77AMOx2nmZlVAQcxAfpmc=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
|
||||
sha256 = "sha256-SP+LCsxjl5YNOu4rDZOiDIqkynGE+iiLJtxi8tFugKM=";
|
||||
sha256 = "sha256-l0K9Ha+0KqVqNQOSouT2rwRRi4YoIjMNnZnmBY8Loa8=";
|
||||
};
|
||||
|
||||
aarch64-darwin = srcs.x86_64-darwin;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "14.4.2",
|
||||
"repo_hash": "0zhac96b6p7p9vpj083ajfsj5a2fwkv602zxv79cjvpd924c5ws2",
|
||||
"yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw",
|
||||
"version": "14.5.0",
|
||||
"repo_hash": "sha256-HKm2zxr9jHN5NvoKoR0YnEsna84oz+ax6BYmDiWrODc=",
|
||||
"yarn_hash": "081c06ds723mv95ivpnlh3ida2ra3brrm1lzfh2pmlg5wz9vi1cs",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.4.2-ee",
|
||||
"rev": "v14.5.0-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.4.2",
|
||||
"GITLAB_PAGES_VERSION": "1.46.0",
|
||||
"GITLAB_SHELL_VERSION": "13.21.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.4.2"
|
||||
"GITALY_SERVER_VERSION": "14.5.0",
|
||||
"GITLAB_PAGES_VERSION": "1.48.0",
|
||||
"GITLAB_SHELL_VERSION": "13.22.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.5.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rugged', '~> 1.1'
|
||||
gem 'rugged', '~> 1.2'
|
||||
gem 'github-linguist', '~> 7.12', require: 'linguist'
|
||||
gem 'gitlab-markup', '~> 1.7.1'
|
||||
gem 'activesupport', '~> 6.1.4.1'
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ GEM
|
|||
parallel (1.19.2)
|
||||
parser (2.7.2.0)
|
||||
ast (~> 2.4.1)
|
||||
pg_query (2.1.0)
|
||||
pg_query (2.1.1)
|
||||
google-protobuf (>= 3.17.1)
|
||||
proc_to_ast (0.1.0)
|
||||
coderay
|
||||
|
|
@ -184,7 +184,7 @@ GEM
|
|||
rubocop-ast (0.2.0)
|
||||
parser (>= 2.7.0.1)
|
||||
ruby-progressbar (1.10.1)
|
||||
rugged (1.1.0)
|
||||
rugged (1.2.0)
|
||||
sanitize (4.6.6)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.4.4)
|
||||
|
|
@ -234,7 +234,7 @@ DEPENDENCIES
|
|||
rspec
|
||||
rspec-parameterized
|
||||
rubocop (~> 0.69)
|
||||
rugged (~> 1.1)
|
||||
rugged (~> 1.2)
|
||||
sentry-raven (~> 3.0)
|
||||
timecop
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,18 @@
|
|||
, libgit2, openssl, zlib, pcre, http-parser }:
|
||||
|
||||
let
|
||||
# git2go 32.0.5 does not support libgit2 1.2.0 or 1.3.0.
|
||||
# It needs a specific commit in between those two releases.
|
||||
libgit2_custom = libgit2.overrideAttrs (oldAttrs: rec {
|
||||
version = "1.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "libgit2";
|
||||
repo = "libgit2";
|
||||
rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e";
|
||||
sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI=";
|
||||
};
|
||||
});
|
||||
|
||||
rubyEnv = bundlerEnv rec {
|
||||
name = "gitaly-env";
|
||||
inherit ruby;
|
||||
|
|
@ -21,7 +33,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
version = "14.4.2";
|
||||
version = "14.5.0";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
|
|
@ -33,10 +45,10 @@ buildGoModule {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MzYUSoG+HjW9o2zn6Q9Pd5NfI7hZkw1xFXOXHbbxJvo=";
|
||||
sha256 = "sha256-DbyxZKxW+S2u23+F8VQxkDXWp+L1WeISs6OEBb5DavA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";
|
||||
vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0=";
|
||||
|
||||
passthru = {
|
||||
inherit rubyEnv;
|
||||
|
|
@ -46,7 +58,7 @@ buildGoModule {
|
|||
|
||||
tags = [ "static,system_libgit2" ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
|
||||
buildInputs = [ rubyEnv.wrappedRuby libgit2_custom openssl zlib pcre http-parser ];
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -554,10 +554,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12dibsqndfnckc24yryy8v467rxp7p80jx21jhm8z7swp8118jhx";
|
||||
sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
};
|
||||
proc_to_ast = {
|
||||
dependencies = ["coderay" "parser" "unparser"];
|
||||
|
|
@ -830,10 +830,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy";
|
||||
sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
};
|
||||
sanitize = {
|
||||
dependencies = ["crass" "nokogiri" "nokogumbo"];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-shell";
|
||||
version = "13.21.1";
|
||||
version = "13.22.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FBkxJLl58ZbqM1P4LohsozGiKg38gQwVGOV9AAjVE0M=";
|
||||
sha256 = "sha256-jMFTNyGdegdBO+f6Pw36iuhvyzcM8rCbnfSyLSOiEjY=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.4.2";
|
||||
version = "14.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ source 'https://rubygems.org'
|
|||
|
||||
gem 'rails', '~> 6.1.4.1'
|
||||
|
||||
gem 'bootsnap', '~> 1.4.6'
|
||||
gem 'bootsnap', '~> 1.9.1', require: false
|
||||
|
||||
# Responders respond_to and respond_with
|
||||
gem 'responders', '~> 3.0'
|
||||
|
|
@ -17,14 +17,14 @@ gem 'default_value_for', '~> 3.4.0'
|
|||
# Supported DBs
|
||||
gem 'pg', '~> 1.1'
|
||||
|
||||
gem 'rugged', '~> 1.1'
|
||||
gem 'rugged', '~> 1.2'
|
||||
gem 'grape-path-helpers', '~> 1.7.0'
|
||||
|
||||
gem 'faraday', '~> 1.0'
|
||||
gem 'marginalia', '~> 1.10.0'
|
||||
|
||||
# Authorization
|
||||
gem 'declarative_policy', '~> 1.0.0'
|
||||
gem 'declarative_policy', '~> 1.1.0'
|
||||
|
||||
# Authentication libraries
|
||||
gem 'devise', '~> 4.7.2'
|
||||
|
|
@ -38,6 +38,7 @@ gem 'omniauth-auth0', '~> 2.0.0'
|
|||
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
|
||||
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
|
||||
gem 'omniauth-cas3', '~> 1.1.4'
|
||||
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
|
||||
gem 'omniauth-facebook', '~> 4.0.0'
|
||||
gem 'omniauth-github', '~> 1.4'
|
||||
gem 'omniauth-gitlab', '~> 1.0.2'
|
||||
|
|
@ -129,7 +130,7 @@ gem 'fog-local', '~> 0.6'
|
|||
gem 'fog-openstack', '~> 1.0'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
gem 'fog-aliyun', '~> 0.3'
|
||||
gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false
|
||||
gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm'
|
||||
|
||||
# for Google storage
|
||||
gem 'google-api-client', '~> 0.33'
|
||||
|
|
@ -186,6 +187,7 @@ gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
|
|||
group :puma do
|
||||
gem 'puma', '~> 5.3.1', require: false
|
||||
gem 'puma_worker_killer', '~> 0.3.1', require: false
|
||||
gem 'sd_notify', '~> 0.1.0', require: false
|
||||
end
|
||||
|
||||
# State machine
|
||||
|
|
@ -290,7 +292,7 @@ gem 'autoprefixer-rails', '10.2.5.1'
|
|||
gem 'terser', '1.0.2'
|
||||
|
||||
gem 'addressable', '~> 2.8'
|
||||
gem 'gemojione', '~> 3.3'
|
||||
gem 'tanuki_emoji', '~> 0.5'
|
||||
gem 'gon', '~> 6.4.0'
|
||||
gem 'request_store', '~> 1.5'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
|
@ -341,13 +343,15 @@ group :development do
|
|||
gem 'lefthook', '~> 0.7.0', require: false
|
||||
gem 'solargraph', '~> 0.43', require: false
|
||||
|
||||
gem 'letter_opener_web', '~> 1.4.1'
|
||||
gem 'letter_opener_web', '~> 2.0.0'
|
||||
|
||||
# Better errors handler
|
||||
gem 'better_errors', '~> 2.9.0'
|
||||
|
||||
# thin instead webrick
|
||||
gem 'thin', '~> 1.8.0'
|
||||
|
||||
gem 'sprite-factory', '~> 1.7'
|
||||
end
|
||||
|
||||
group :development, :test do
|
||||
|
|
@ -372,7 +376,7 @@ group :development, :test do
|
|||
gem 'spring', '~> 2.1.0'
|
||||
gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
|
||||
gem 'gitlab-styles', '~> 6.3.0', require: false
|
||||
gem 'gitlab-styles', '~> 6.4.0', require: false
|
||||
|
||||
gem 'haml_lint', '~> 0.36.0', require: false
|
||||
gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
|
|
@ -396,7 +400,7 @@ group :development, :test do
|
|||
end
|
||||
|
||||
group :development, :test, :danger do
|
||||
gem 'gitlab-dangerfiles', '~> 2.3.0', require: false
|
||||
gem 'gitlab-dangerfiles', '~> 2.5.0', require: false
|
||||
end
|
||||
|
||||
group :development, :test, :coverage do
|
||||
|
|
@ -474,7 +478,7 @@ end
|
|||
gem 'spamcheck', '~> 0.1.0'
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
gem 'gitaly', '~> 14.3.0.pre.rc2'
|
||||
gem 'gitaly', '~> 14.4.0.pre.rc43'
|
||||
|
||||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.0.2'
|
||||
|
|
@ -535,4 +539,4 @@ gem 'ipaddress', '~> 0.8.3'
|
|||
|
||||
gem 'parslet', '~> 1.8'
|
||||
|
||||
gem 'sd_notify'
|
||||
gem 'ipynbdiff', '0.3.7'
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ GEM
|
|||
rack (>= 0.9.0)
|
||||
bindata (2.4.10)
|
||||
binding_ninja (0.2.3)
|
||||
bootsnap (1.4.6)
|
||||
bootsnap (1.9.1)
|
||||
msgpack (~> 1.0)
|
||||
bootstrap_form (4.2.0)
|
||||
actionpack (>= 5.0)
|
||||
|
|
@ -215,7 +215,7 @@ GEM
|
|||
css_parser (1.7.0)
|
||||
addressable
|
||||
daemons (1.3.1)
|
||||
danger (8.3.1)
|
||||
danger (8.4.1)
|
||||
claide (~> 1.0)
|
||||
claide-plugins (>= 0.9.2)
|
||||
colored2 (~> 3.1)
|
||||
|
|
@ -237,7 +237,7 @@ GEM
|
|||
html-pipeline
|
||||
declarative (0.0.20)
|
||||
declarative-option (0.1.0)
|
||||
declarative_policy (1.0.0)
|
||||
declarative_policy (1.1.0)
|
||||
default_value_for (3.4.0)
|
||||
activerecord (>= 3.2.0, < 7.0)
|
||||
deprecation_toolkit (1.5.1)
|
||||
|
|
@ -429,8 +429,6 @@ GEM
|
|||
ruby-progressbar (~> 1.4)
|
||||
fuzzyurl (0.9.0)
|
||||
gemoji (3.0.1)
|
||||
gemojione (3.3.0)
|
||||
json
|
||||
get_process_mem (0.2.5)
|
||||
ffi (~> 1.0)
|
||||
gettext (3.3.6)
|
||||
|
|
@ -445,7 +443,7 @@ GEM
|
|||
rails (>= 3.2.0)
|
||||
git (1.7.0)
|
||||
rchardet (~> 1.8)
|
||||
gitaly (14.3.0.pre.rc2)
|
||||
gitaly (14.4.0.pre.rc43)
|
||||
grpc (~> 1.0)
|
||||
github-markup (1.7.0)
|
||||
gitlab (4.16.1)
|
||||
|
|
@ -453,7 +451,7 @@ GEM
|
|||
terminal-table (~> 1.5, >= 1.5.1)
|
||||
gitlab-chronic (0.10.5)
|
||||
numerizer (~> 0.2)
|
||||
gitlab-dangerfiles (2.3.0)
|
||||
gitlab-dangerfiles (2.5.0)
|
||||
danger (>= 8.3.1)
|
||||
danger-gitlab (>= 8.0.0)
|
||||
gitlab-experiment (0.6.4)
|
||||
|
|
@ -485,7 +483,7 @@ GEM
|
|||
openid_connect (~> 1.2)
|
||||
gitlab-sidekiq-fetcher (0.8.0)
|
||||
sidekiq (~> 6.1)
|
||||
gitlab-styles (6.3.0)
|
||||
gitlab-styles (6.4.0)
|
||||
rubocop (~> 0.91, >= 0.91.1)
|
||||
rubocop-gitlab-security (~> 0.1.1)
|
||||
rubocop-performance (~> 1.9.2)
|
||||
|
|
@ -635,6 +633,9 @@ GEM
|
|||
invisible_captcha (1.1.0)
|
||||
rails (>= 4.2)
|
||||
ipaddress (0.8.3)
|
||||
ipynbdiff (0.3.7)
|
||||
diffy (= 3.3.0)
|
||||
json (= 2.5.1)
|
||||
jaeger-client (1.1.0)
|
||||
opentracing (~> 0.3)
|
||||
thrift
|
||||
|
|
@ -692,10 +693,11 @@ GEM
|
|||
lefthook (0.7.5)
|
||||
letter_opener (1.7.0)
|
||||
launchy (~> 2.2)
|
||||
letter_opener_web (1.4.1)
|
||||
actionmailer (>= 3.2)
|
||||
letter_opener (~> 1.0)
|
||||
railties (>= 3.2)
|
||||
letter_opener_web (2.0.0)
|
||||
actionmailer (>= 5.2)
|
||||
letter_opener (~> 1.7)
|
||||
railties (>= 5.2)
|
||||
rexml
|
||||
libyajl2 (1.2.0)
|
||||
license_finder (6.0.0)
|
||||
bundler
|
||||
|
|
@ -832,6 +834,8 @@ GEM
|
|||
addressable (~> 2.3)
|
||||
nokogiri (~> 1.7, >= 1.7.1)
|
||||
omniauth (~> 1.2)
|
||||
omniauth-dingtalk-oauth2 (1.0.0)
|
||||
omniauth-oauth2 (~> 1.7.1)
|
||||
omniauth-facebook (4.0.0)
|
||||
omniauth-oauth2 (~> 1.2)
|
||||
omniauth-github (1.4.0)
|
||||
|
|
@ -852,7 +856,7 @@ GEM
|
|||
omniauth-oauth (1.1.0)
|
||||
oauth
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2 (1.7.1)
|
||||
omniauth-oauth2 (1.7.2)
|
||||
oauth2 (~> 1.4)
|
||||
omniauth (>= 1.9, < 3)
|
||||
omniauth-oauth2-generic (0.2.2)
|
||||
|
|
@ -1122,7 +1126,7 @@ GEM
|
|||
rubyntlm (0.6.2)
|
||||
rubypants (0.2.0)
|
||||
rubyzip (2.0.0)
|
||||
rugged (1.1.0)
|
||||
rugged (1.2.0)
|
||||
safe_yaml (1.0.4)
|
||||
safety_net_attestation (0.4.0)
|
||||
jwt (~> 2.0)
|
||||
|
|
@ -1148,7 +1152,7 @@ GEM
|
|||
addressable (>= 2.3.5)
|
||||
faraday (> 0.8, < 2.0)
|
||||
scientist (1.6.0)
|
||||
sd_notify (0.1.1)
|
||||
sd_notify (0.1.0)
|
||||
securecompare (1.0.0)
|
||||
seed-fu (2.3.7)
|
||||
activerecord (>= 3.1)
|
||||
|
|
@ -1210,6 +1214,7 @@ GEM
|
|||
spring (2.1.1)
|
||||
spring-commands-rspec (1.0.4)
|
||||
spring (>= 0.9.1)
|
||||
sprite-factory (1.7.1)
|
||||
sprockets (3.7.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
|
|
@ -1240,6 +1245,7 @@ GEM
|
|||
sys-filesystem (1.1.9)
|
||||
ffi
|
||||
sysexits (1.2.0)
|
||||
tanuki_emoji (0.5.0)
|
||||
temple (0.8.2)
|
||||
terminal-table (1.8.0)
|
||||
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||
|
|
@ -1393,7 +1399,7 @@ DEPENDENCIES
|
|||
benchmark-ips (~> 2.3.0)
|
||||
benchmark-memory (~> 0.1)
|
||||
better_errors (~> 2.9.0)
|
||||
bootsnap (~> 1.4.6)
|
||||
bootsnap (~> 1.9.1)
|
||||
bootstrap_form (~> 4.2.0)
|
||||
browser (~> 4.2)
|
||||
bullet (~> 6.1.3)
|
||||
|
|
@ -1410,7 +1416,7 @@ DEPENDENCIES
|
|||
crystalball (~> 0.7.0)
|
||||
database_cleaner (~> 1.7.0)
|
||||
deckar01-task_list (= 2.3.1)
|
||||
declarative_policy (~> 1.0.0)
|
||||
declarative_policy (~> 1.1.0)
|
||||
default_value_for (~> 3.4.0)
|
||||
deprecation_toolkit (~> 1.5.1)
|
||||
derailed_benchmarks
|
||||
|
|
@ -1448,14 +1454,13 @@ DEPENDENCIES
|
|||
fog-rackspace (~> 0.1.1)
|
||||
fugit (~> 1.2.1)
|
||||
fuubar (~> 2.2.0)
|
||||
gemojione (~> 3.3)
|
||||
gettext (~> 3.3)
|
||||
gettext_i18n_rails (~> 1.8.0)
|
||||
gettext_i18n_rails_js (~> 1.3)
|
||||
gitaly (~> 14.3.0.pre.rc2)
|
||||
gitaly (~> 14.4.0.pre.rc43)
|
||||
github-markup (~> 1.7.0)
|
||||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-dangerfiles (~> 2.3.0)
|
||||
gitlab-dangerfiles (~> 2.5.0)
|
||||
gitlab-experiment (~> 0.6.4)
|
||||
gitlab-fog-azure-rm (~> 1.2.0)
|
||||
gitlab-labkit (~> 0.21.1)
|
||||
|
|
@ -1465,7 +1470,7 @@ DEPENDENCIES
|
|||
gitlab-net-dns (~> 0.9.1)
|
||||
gitlab-omniauth-openid-connect (~> 0.8.0)
|
||||
gitlab-sidekiq-fetcher (= 0.8.0)
|
||||
gitlab-styles (~> 6.3.0)
|
||||
gitlab-styles (~> 6.4.0)
|
||||
gitlab_chronic_duration (~> 0.10.6.2)
|
||||
gitlab_omniauth-ldap (~> 2.1.1)
|
||||
gon (~> 6.4.0)
|
||||
|
|
@ -1495,6 +1500,7 @@ DEPENDENCIES
|
|||
icalendar
|
||||
invisible_captcha (~> 1.1.0)
|
||||
ipaddress (~> 0.8.3)
|
||||
ipynbdiff (= 0.3.7)
|
||||
jira-ruby (~> 2.1.4)
|
||||
js_regex (~> 3.7)
|
||||
json (~> 2.5.1)
|
||||
|
|
@ -1506,7 +1512,7 @@ DEPENDENCIES
|
|||
kramdown (~> 2.3.1)
|
||||
kubeclient (~> 4.9.2)
|
||||
lefthook (~> 0.7.0)
|
||||
letter_opener_web (~> 1.4.1)
|
||||
letter_opener_web (~> 2.0.0)
|
||||
license_finder (~> 6.0)
|
||||
licensee (~> 9.14.1)
|
||||
lockbox (~> 0.6.2)
|
||||
|
|
@ -1535,6 +1541,7 @@ DEPENDENCIES
|
|||
omniauth-azure-activedirectory-v2 (~> 1.0)
|
||||
omniauth-azure-oauth2 (~> 0.0.9)
|
||||
omniauth-cas3 (~> 1.1.4)
|
||||
omniauth-dingtalk-oauth2 (~> 1.0)
|
||||
omniauth-facebook (~> 4.0.0)
|
||||
omniauth-github (~> 1.4)
|
||||
omniauth-gitlab (~> 1.0.2)
|
||||
|
|
@ -1596,10 +1603,10 @@ DEPENDENCIES
|
|||
ruby-saml (~> 1.13.0)
|
||||
ruby_parser (~> 3.15)
|
||||
rubyzip (~> 2.0.0)
|
||||
rugged (~> 1.1)
|
||||
rugged (~> 1.2)
|
||||
sanitize (~> 5.2.1)
|
||||
sassc-rails (~> 2.1.0)
|
||||
sd_notify
|
||||
sd_notify (~> 0.1.0)
|
||||
seed-fu (~> 2.3.7)
|
||||
selenium-webdriver (~> 3.142)
|
||||
sentry-raven (~> 3.1)
|
||||
|
|
@ -1616,11 +1623,13 @@ DEPENDENCIES
|
|||
spamcheck (~> 0.1.0)
|
||||
spring (~> 2.1.0)
|
||||
spring-commands-rspec (~> 1.0.4)
|
||||
sprite-factory (~> 1.7)
|
||||
sprockets (~> 3.7.0)
|
||||
sshkey (~> 2.0)
|
||||
stackprof (~> 0.2.15)
|
||||
state_machines-activerecord (~> 0.8.0)
|
||||
sys-filesystem (~> 1.1.6)
|
||||
tanuki_emoji (~> 0.5)
|
||||
terser (= 1.0.2)
|
||||
test-prof (~> 1.0.7)
|
||||
test_file_finder (~> 0.1.3)
|
||||
|
|
|
|||
|
|
@ -557,10 +557,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bz62p9vc7lcrmzhiz4pf7myww086mq287cw3jjj7fyc7jhmamw0";
|
||||
sha256 = "1ndjra3h86dq28njm2swmaw6n3vsywrycrf7i5iy9l8hrhfhv4x2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.6";
|
||||
version = "1.9.1";
|
||||
};
|
||||
bootstrap_form = {
|
||||
dependencies = ["actionpack" "activemodel"];
|
||||
|
|
@ -931,10 +931,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12nmycrlwr8ca2s0fx76k81gjw12iz15k1n0qanszv5d4l1ykj2l";
|
||||
sha256 = "1f9p7sdj542cbn352qz58m4n26kamv6vbnxzpc06j0pxi50z3i0v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.3.1";
|
||||
version = "8.4.1";
|
||||
};
|
||||
danger-gitlab = {
|
||||
dependencies = ["danger" "gitlab"];
|
||||
|
|
@ -1007,10 +1007,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0k2wl0jr0jq64gy7ibb1ipm2dzqil7y66vyffwx81g7sqchh7xh6";
|
||||
sha256 = "1jri6fqpyrlnhl99mhqlqwpi6z8idb7g421rysxz40yyk8lwzx4s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
};
|
||||
default_value_for = {
|
||||
dependencies = ["activerecord"];
|
||||
|
|
@ -1838,17 +1838,6 @@
|
|||
};
|
||||
version = "3.0.1";
|
||||
};
|
||||
gemojione = {
|
||||
dependencies = ["json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.0";
|
||||
};
|
||||
get_process_mem = {
|
||||
dependencies = ["ffi"];
|
||||
groups = ["default" "puma" "unicorn"];
|
||||
|
|
@ -1910,10 +1899,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "197db842msm326ib8r3gqlavf5d11r4cd9jg4wjnyar3ccyr9dn7";
|
||||
sha256 = "022amhic8rs09qmp3hy1zz5inxbxnrvg8j82bq4l2s8ml9hqfs3a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "14.3.0.pre.rc2";
|
||||
version = "14.4.0.pre.rc43";
|
||||
};
|
||||
github-markup = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1953,10 +1942,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07ckvf7vk0494s70ql7zp3ckn8q70mhwa0143hj6bjh0bpgmgsnw";
|
||||
sha256 = "1488s24c9fm55z2a2pbry2fjx72fzgzv0y48krgldvf0qy43l0kz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.5.0";
|
||||
};
|
||||
gitlab-experiment = {
|
||||
dependencies = ["activesupport" "request_store" "scientist"];
|
||||
|
|
@ -2059,10 +2048,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vxg5j9405r5xvwnswhm2r7pg9pn6pqg675pxz6f8d3sxy5z963p";
|
||||
sha256 = "16d90sd0x6qfkhgfjysswwrzk82zs82xs9azn9w287irpzdkvj7f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.3.0";
|
||||
version = "6.4.0";
|
||||
};
|
||||
gitlab_chronic_duration = {
|
||||
dependencies = ["numerizer"];
|
||||
|
|
@ -2589,6 +2578,17 @@
|
|||
};
|
||||
version = "0.8.3";
|
||||
};
|
||||
ipynbdiff = {
|
||||
dependencies = ["diffy" "json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18337bzcwssmnyg2wf3za50z0zh2b1sh17wgaapavd1ffr24svkx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.7";
|
||||
};
|
||||
jaeger-client = {
|
||||
dependencies = ["opentracing" "thrift"];
|
||||
groups = ["default"];
|
||||
|
|
@ -2826,15 +2826,15 @@
|
|||
version = "1.7.0";
|
||||
};
|
||||
letter_opener_web = {
|
||||
dependencies = ["actionmailer" "letter_opener" "railties"];
|
||||
dependencies = ["actionmailer" "letter_opener" "railties" "rexml"];
|
||||
groups = ["development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kgz2n0cyw3m8ipvijlikb6bldmzhnq451b9d7w5l74gw2fhqckg";
|
||||
sha256 = "0vvvaz2ngaxv0s6sj25gdvp73vd8pfl8q3jharadg18p3va0m1ik";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.1";
|
||||
version = "2.0.0";
|
||||
};
|
||||
libyajl2 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -3489,6 +3489,17 @@
|
|||
};
|
||||
version = "1.1.4";
|
||||
};
|
||||
omniauth-dingtalk-oauth2 = {
|
||||
dependencies = ["omniauth-oauth2"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sflfy1jvn9wqpral7gcfmbys7msvykp6rlnl33r8qgnbksn54y8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
omniauth-facebook = {
|
||||
dependencies = ["omniauth-oauth2"];
|
||||
groups = ["default"];
|
||||
|
|
@ -3572,10 +3583,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10fr2b58sp7l6nfdvxpbi67374hkrvsf507cvda89jjs0jacy319";
|
||||
sha256 = "1ry65f309rnzhgdjvqybkd5i4qp9rpk1gbp4dz02h4l6bkk6ya10";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
};
|
||||
omniauth-oauth2-generic = {
|
||||
dependencies = ["omniauth-oauth2"];
|
||||
|
|
@ -4778,10 +4789,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy";
|
||||
sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -4881,14 +4892,14 @@
|
|||
version = "1.6.0";
|
||||
};
|
||||
sd_notify = {
|
||||
groups = ["default"];
|
||||
groups = ["puma"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb";
|
||||
sha256 = "0qx6hwi10s0ir46l3aq4lspkxlcs1x4cjhvdhpdxyxaicciqddi2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
version = "0.1.0";
|
||||
};
|
||||
securecompare = {
|
||||
groups = ["default"];
|
||||
|
|
@ -5144,6 +5155,16 @@
|
|||
};
|
||||
version = "1.0.4";
|
||||
};
|
||||
sprite-factory = {
|
||||
groups = ["development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18hvn14vz1v3j1gvbqjypa59hgj3c4mqbimby50k407c395551jm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.1";
|
||||
};
|
||||
sprockets = {
|
||||
dependencies = ["concurrent-ruby" "rack"];
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
@ -5291,6 +5312,16 @@
|
|||
};
|
||||
version = "1.2.0";
|
||||
};
|
||||
tanuki_emoji = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qw0qa3xz4h3izwl5qsvmg5vvfsfjhmv4mdxaw1v1w1qgp7j7gws";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
};
|
||||
temple = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
|
|
|
|||
|
|
@ -143,7 +143,6 @@ def update_rubyenv():
|
|||
f.write(repo.get_file('Gemfile.lock', rev))
|
||||
with open(rubyenv_dir / 'Gemfile', 'w') as f:
|
||||
original = repo.get_file('Gemfile', rev)
|
||||
original += "\ngem 'sd_notify'\n"
|
||||
f.write(re.sub(r".*mail-smtp_pool.*", "", original))
|
||||
|
||||
subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
homepage = "https://github.com/phisch/giph";
|
||||
description = "Simple gif recorder";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.legendofmiracles ];
|
||||
maintainers = [ maintainers.lom ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,6 @@ stdenvNoCC.mkDerivation {
|
|||
homepage = "https://github.com/rushmj/mpv-video-cutter";
|
||||
# repo doesn't have a license
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "ElKowars wacky widgets";
|
||||
homepage = "https://github.com/elkowar/eww";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda legendofmiracles ];
|
||||
maintainers = with maintainers; [ figsoda lom ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }:
|
||||
{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-icon-theme";
|
||||
version = "20200710";
|
||||
version = "20211106";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = "flat-remix";
|
||||
rev = version;
|
||||
sha256 = "0rlrmgimvs9rrj64g5jn04jgyi7wmn2dnsk7ckmxk6p8cdfjd0hx";
|
||||
sha256 = "1dlz88bg764zzd0s3yqci4m1awhwdrrql9l9plsjjzgdx9r7ndmf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -11,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pop-icon-theme";
|
||||
version = "2020-03-04";
|
||||
version = "2021-11-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "icon-theme";
|
||||
rev = "11f18cb48455b47b6535018f1968777100471be1";
|
||||
sha256 = "1s4pjwv2ynw400gnzgzczlxzw3gxh5s8cxxbi9zpxq4wzjg6jqyv";
|
||||
rev = "9998b20b78f3ff65ecbf2253bb863d1e669abe74";
|
||||
sha256 = "0lwdmaxs9xj4bm21ldh64bzyb6iz5d5k1256iwvyjp725l7686cl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -14,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pop-gtk-theme";
|
||||
version = "2020-06-30";
|
||||
version = "2021-08-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "gtk-theme";
|
||||
rev = "8c31be9f9257375bf7a049069cb4ecbac7d281a1";
|
||||
sha256 = "16dxxazpllcxlbiblynqq4b65wfn9k1jab8dl69l819v73z303ky";
|
||||
rev = "6615e4510485c5dc0b379746acc40f538d987c86";
|
||||
sha256 = "16h03x2m4j4hfwp7pdmw1navcy5q7di38jvigfgf263wajyxbznr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,13 @@ with lib; mkCoqDerivation {
|
|||
owner = "thery";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.12" "8.13"; out = "8.12"; }
|
||||
{ case = range "8.12" "8.14"; out = "8.14.1"; }
|
||||
{ case = range "8.10" "8.11"; out = "8.10"; }
|
||||
{ case = range "8.8" "8.9"; out = "8.8"; }
|
||||
{ case = "8.7"; out = "8.7.2"; }
|
||||
] null;
|
||||
|
||||
release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7";
|
||||
release."8.12".sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj";
|
||||
release."8.10".sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
|
||||
release."8.8".sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
|
||||
|
|
|
|||
3
pkgs/development/interpreters/asmrepl/Gemfile
Normal file
3
pkgs/development/interpreters/asmrepl/Gemfile
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
source 'https://rubygems.org' do
|
||||
gem 'asmrepl'
|
||||
end
|
||||
18
pkgs/development/interpreters/asmrepl/Gemfile.lock
Normal file
18
pkgs/development/interpreters/asmrepl/Gemfile.lock
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
GEM
|
||||
specs:
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
asmrepl (1.0.3)
|
||||
fisk (~> 2)
|
||||
fisk (2.3.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
asmrepl!
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.24
|
||||
17
pkgs/development/interpreters/asmrepl/default.nix
Normal file
17
pkgs/development/interpreters/asmrepl/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, bundlerApp, bundlerUpdateScript }:
|
||||
|
||||
bundlerApp {
|
||||
pname = "asmrepl";
|
||||
gemdir = ./.;
|
||||
exes = [ "asmrepl" ];
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "asmrepl";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A REPL for x86-64 assembly language";
|
||||
homepage = "https://github.com/tenderlove/asmrepl";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
platforms = platforms.x86_64;
|
||||
};
|
||||
}
|
||||
23
pkgs/development/interpreters/asmrepl/gemset.nix
Normal file
23
pkgs/development/interpreters/asmrepl/gemset.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{
|
||||
asmrepl = {
|
||||
dependencies = ["fisk"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10d0zvkhk3ja48vvx28hfsqfrzfl66vdpmk3gcgb5viy174c72v6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
fisk = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mq2a7hjs9xfg514ci0xw90c33rzq1y58ywpnmhp7w767ll6wldd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
};
|
||||
}
|
||||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "evcxr";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "evcxr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JziLEsY6kF5UeDt17q/HDrTlNtHj7DWy1tTq3s2eZHE=";
|
||||
sha256 = "sha256-sD/eykXoeJq43o3xyFx2VIoH+xZrMmb6vZKVt4CO7B4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-I164eXgc/yiKKskloh6FGYD3bLCLWXaM6uWa01PRDXs=";
|
||||
cargoSha256 = "sha256-eySdhzavm9NGv2xjgdq/C2iv6lxdulhgYNs9ehnSzKQ=";
|
||||
|
||||
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +1,24 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, fetchpatch, cmake, stdenv }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, cmake, stdenv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lunatic";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunatic-solutions";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r";
|
||||
sha256 = "sha256-+4014p+4QJ7nytFHHszAOYQHXLYXqR+Cip+vHxsH9l8=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# NOTE: remove on next update
|
||||
# update dependencies to resolve incompatibility with rust 1.56
|
||||
(fetchpatch {
|
||||
name = "update-wasmtime.patch";
|
||||
url = "https://github.com/lunatic-solutions/lunatic/commit/cd8db51732712c19a8114db290882d1bb6b928c0.patch";
|
||||
sha256 = "sha256-eyoIOTqGSU/XNfF55FG+WrQPSMvt9L/S/KBsUQB5z1k=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-yoG4gCk+nHE8pBqV6ND9NCegx4bxbdGEU5hY5JauloM=";
|
||||
cargoSha256 = "sha256-RnaAiumTP4cW2eHUbnwyPdgJQLK65gqDI/NP2SOrO4E=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An Erlang inspired runtime for WebAssembly";
|
||||
homepage = "https://lunatic.solutions";
|
||||
changelog = "https://github.com/lunatic-solutions/lunatic/blob/v${version}/RELEASES.md";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
broken = stdenv.isDarwin;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/google/snappy/pull/142/commits/658cb2fcf67b626fff2122a3dbf7a3560c58f7ee.patch";
|
||||
sha256 = "1kg3lxjwmhc7gjx36nylilnf444ddbnr3px1wpvyc6l1nh6zh4al";
|
||||
})
|
||||
# Re-enable RTTI, without which other applications can't subclass
|
||||
# snappy::Source (this breaks Ceph, as one example)
|
||||
# https://tracker.ceph.com/issues/53060
|
||||
# https://build.opensuse.org/package/show/openSUSE:Factory/snappy
|
||||
(fetchpatch {
|
||||
url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d";
|
||||
sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }:
|
||||
|
||||
let
|
||||
zero_or_one = cond: if cond then 1 else 0;
|
||||
|
||||
_arrow-cpp = arrow-cpp.override { python3 = python; };
|
||||
in
|
||||
|
||||
|
|
@ -18,9 +20,9 @@ buildPythonPackage rec {
|
|||
|
||||
PYARROW_BUILD_TYPE = "release";
|
||||
|
||||
PYARROW_WITH_DATASET = true;
|
||||
PYARROW_WITH_FLIGHT = _arrow-cpp.enableFlight;
|
||||
PYARROW_WITH_PARQUET = true;
|
||||
PYARROW_WITH_DATASET = zero_or_one true;
|
||||
PYARROW_WITH_FLIGHT = zero_or_one _arrow-cpp.enableFlight;
|
||||
PYARROW_WITH_PARQUET = zero_or_one true;
|
||||
|
||||
PYARROW_CMAKE_OPTIONS = [
|
||||
"-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ buildPythonPackage rec {
|
|||
description = "Python context manager for managing pid files";
|
||||
homepage = "https://github.com/mosquito/python-pidfile";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jtc";
|
||||
version = "1.75d";
|
||||
version = "1.76";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldn-softdev";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0vgb5hcgml0vmdal494231jq6dlr0qgssqhnrgsvqqjapy8xhnpw";
|
||||
sha256 = "sha256-VATRlOOV4wBInLOm9J0Dp2vhtL5mb0Yxdl/ya0JiqEU=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
$CXX -o jtc -Wall -std=gnu++14 -Ofast jtc.cpp
|
||||
$CXX -o jtc -Wall -std=gnu++14 -Ofast -pthread -lpthread jtc.cpp
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strace";
|
||||
version = "5.14";
|
||||
version = "5.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-kBvubbXhfeutRTDdn/tNyalsSmVu2+HDFBt8swexHnM=";
|
||||
sha256 = "sha256-68rCLylzNSlNxlRCXLw84BM0O+zm2iaZ467Iau6Nctw=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper }:
|
||||
|
||||
{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, darwin }:
|
||||
let
|
||||
target = if stdenv.isDarwin then "macOS" else "Linux";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sumneko-lua-language-server";
|
||||
version = "2.5.1";
|
||||
|
|
@ -17,12 +19,32 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cd 3rd/luamake
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
# Needed for the test
|
||||
export HOME=/var/empty
|
||||
# This package uses the program clang for C and C++ files. The language
|
||||
# is selected via the command line argument -std, but this do not work
|
||||
# in combination with the nixpkgs clang wrapper. Therefor we have to
|
||||
# find all c++ compiler statements and replace $cc (which expands to
|
||||
# clang) with clang++.
|
||||
sed -i compile/ninja/macos.ninja \
|
||||
-e '/c++/s,$cc,clang++,' \
|
||||
-e '/test.lua/s,= .*,= true,' \
|
||||
-e '/ldl/s,$cc,clang++,'
|
||||
sed -i scripts/compiler/gcc.lua \
|
||||
-e '/cxx_/s,$cc,clang++,'
|
||||
'';
|
||||
|
||||
ninjaFlags = [
|
||||
"-fcompile/ninja/linux.ninja"
|
||||
"-fcompile/ninja/${lib.toLower target}.ninja"
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
|
|
@ -33,15 +55,15 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dt "$out"/share/lua-language-server/bin/Linux bin/Linux/lua-language-server
|
||||
install -m644 -t "$out"/share/lua-language-server/bin/Linux bin/Linux/*.*
|
||||
install -Dt "$out"/share/lua-language-server/bin/${target} bin/${target}/lua-language-server
|
||||
install -m644 -t "$out"/share/lua-language-server/bin/${target} bin/${target}/*.*
|
||||
install -m644 -t "$out"/share/lua-language-server {debugger,main}.lua
|
||||
cp -r locale meta script "$out"/share/lua-language-server
|
||||
|
||||
# necessary for --version to work:
|
||||
install -m644 -t "$out"/share/lua-language-server changelog.md
|
||||
|
||||
makeWrapper "$out"/share/lua-language-server/bin/Linux/lua-language-server \
|
||||
makeWrapper "$out"/share/lua-language-server/bin/${target}/lua-language-server \
|
||||
$out/bin/lua-language-server \
|
||||
--add-flags "-E $out/share/lua-language-server/main.lua \
|
||||
--logpath='~/.cache/sumneko_lua/log' \
|
||||
|
|
@ -55,7 +77,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/sumneko/lua-language-server";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mjlbach ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
mainProgram = "lua-language-server";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://ddnet.tw";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ sirseruju legendofmiracles ];
|
||||
maintainers = with maintainers; [ sirseruju lom ];
|
||||
mainProgram = "DDNet";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Your filesystem as a dungeon";
|
||||
homepage = "https://github.com/facundoolano/rpg-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Rust TUI client for steamcmd";
|
||||
homepage = "https://github.com/dmadisetti/steam-tui";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
# steam only supports that platform
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Simple command-line tool to send text and files to discord";
|
||||
homepage = "https://github.com/somebody1234/cliscord";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
mainProgram = "cliscord";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,6 @@ python3Packages.buildPythonPackage rec {
|
|||
description = "A terminal-based presentation tool with colors and effects.";
|
||||
homepage = "https://github.com/vinayak-mehta/present";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "A simple and easy to use Wikipedia Text User Interface";
|
||||
homepage = "https://github.com/builditluc/wiki-tui";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
mainProgram = "wiki-tui";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ with builtins;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbpf";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libbpf";
|
||||
repo = "libbpf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L23Ba+slJW/ALj8AepwByrrHgYMY5/Jh+AoD0p4qryI=";
|
||||
sha256 = "sha256-p9wUDC7r6+ElbheNkTkZW4eMNAvPbvpUyQjTjCE34ck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Upstream mirror of libbpf";
|
||||
homepage = "https://github.com/libbpf/libbpf";
|
||||
license = with licenses; [ lgpl21 /* or */ bsd2 ];
|
||||
maintainers = with maintainers; [ thoughtpolice vcunat ];
|
||||
maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roundcube";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
|
||||
sha256 = "sha256-L9x7FmPl6ZcGv/NAk6pHMdS/IqWMtVWiUg7RveeNASw=";
|
||||
sha256 = "sha256-YRsNgCJ9C3AonHFXh7LYX9Fe2RXrVtWFwQTCQ3YDboM=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
description = "A qmk keymap.c visualizer";
|
||||
homepage = "https://github.com/yskoht/keymapviz";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcpuid";
|
||||
|
|
@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
# Work around https://github.com/anrieff/libcpuid/pull/102.
|
||||
./stdint.patch
|
||||
# Fixes cross-compilation to NetBSD, remove me for libcpuid > 0.5.1
|
||||
(fetchpatch {
|
||||
name = "use-popcount-from-libc.patch";
|
||||
url = "https://github.com/anrieff/libcpuid/commit/1acaf9980b55ae180cc08db218b9face28202519.patch";
|
||||
sha256 = "0lvsv9baq0sria1f1ncn1b2783js29lfs5fv8milp54pg1wd5b7q";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
buildFeatures = lib.optional (!stdenv.isDarwin) "notify-rust";
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash fish zsh; do
|
||||
STARSHIP_CACHE=$TMPDIR $out/bin/starship completions $shell > starship.$shell
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "An extended cp(1)";
|
||||
homepage = "https://github.com/tarka/xcp";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lldpd";
|
||||
version = "1.0.11";
|
||||
version = "1.0.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-tR0VcA+678t/uFw1BrSdMxc6DxXXAPkz7wRAZ7QtRuQ=";
|
||||
sha256 = "sha256-1jmCf9iidyDRv9lLxS7KJK9j3cw8nS2mB4h3iInYRwE=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments";
|
||||
homepage = "https://vincentbernat.github.io/lldpd/";
|
||||
homepage = "https://lldpd.github.io/";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nixpkgs-review";
|
||||
version = "2.6.3";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "nixpkgs-review";
|
||||
rev = version;
|
||||
sha256 = "sha256-DzqttjYkCSgsHjF1YN93zioGpTGDm9H0F8JzKmHPHro=";
|
||||
sha256 = "sha256-6vKMaCTilPXd8K3AuLqtYInVyyFhdun0o9cX1WRMmWo=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ stdenv.mkDerivation {
|
|||
IOKit
|
||||
Metal
|
||||
QuartzCore
|
||||
darwin.DarwinTools
|
||||
]);
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudmonkey";
|
||||
version = "6.1.0";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "cloudstack-cloudmonkey";
|
||||
rev = version;
|
||||
sha256 = "sha256-OmVM6ayrtrLl+PADnkUnrssbsq1GZp2KiMBOXPgfi5Y=";
|
||||
sha256 = "sha256-C9e2KsnoggjWZp8gx757MbFdGxmfh+TtAd+luS3ycHU=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clipman";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yory8";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Yq71nYNL3bFvwhVzrQ1g8n7/4tMmLuYUJ9pMBmxL8e8=";
|
||||
sha256 = "sha256-aZvtgeaS3xxl5/A/Pwlbu0sI7bw2MONbEIK42IDcMy0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Z/sVCJz/igPDdeczC6pemLub6X6z4ZGlBwBmRsEnXKI=";
|
||||
|
|
|
|||
45
pkgs/tools/wayland/wl-mirror/default.nix
Normal file
45
pkgs/tools/wayland/wl-mirror/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, wlr-protocols
|
||||
, libGL
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wl-mirror";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ferdi265";
|
||||
repo = "wl-mirror";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wjdjzj6h1q51yg70gdrq2yrgg6ihamcwhizxfrjq8955yy2y6ly";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'WL_PROTOCOL_DIR "/usr' 'WL_PROTOCOL_DIR "${wayland-protocols}' \
|
||||
--replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wayland-scanner ];
|
||||
buildInputs = [
|
||||
libGL
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlr-protocols
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Ferdi265/wl-mirror";
|
||||
description = "Mirrors an output onto a Wayland surface.";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ twitchyliquid64 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1996,6 +1996,8 @@ with pkgs;
|
|||
|
||||
asmfmt = callPackage ../development/tools/asmfmt { };
|
||||
|
||||
asmrepl = callPackage ../development/interpreters/asmrepl { };
|
||||
|
||||
aspcud = callPackage ../tools/misc/aspcud { };
|
||||
|
||||
at = callPackage ../tools/system/at { };
|
||||
|
|
@ -2561,6 +2563,8 @@ with pkgs;
|
|||
|
||||
wl-clipboard = callPackage ../tools/wayland/wl-clipboard { };
|
||||
|
||||
wl-mirror = callPackage ../tools/wayland/wl-mirror { };
|
||||
|
||||
wlogout = callPackage ../tools/wayland/wlogout { };
|
||||
|
||||
wlr-randr = callPackage ../tools/wayland/wlr-randr { };
|
||||
|
|
@ -5761,9 +5765,7 @@ with pkgs;
|
|||
|
||||
gitleaks = callPackage ../tools/security/gitleaks { };
|
||||
|
||||
gitaly = callPackage ../applications/version-management/gitlab/gitaly {
|
||||
libgit2 = libgit2_1_1; # git2go only supports v1.1.x
|
||||
};
|
||||
gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
|
||||
|
||||
gitstats = callPackage ../applications/version-management/gitstats { };
|
||||
|
||||
|
|
|
|||
|
|
@ -166,8 +166,7 @@ in
|
|||
i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded;
|
||||
x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded;
|
||||
|
||||
# TODO: fix cross compilation of nix{,Unstable} to netbsd and switch to common
|
||||
x86_64-netbsd = mapTestOnCross lib.systems.examples.x86_64-netbsd embedded;
|
||||
x86_64-netbsd = mapTestOnCross lib.systems.examples.x86_64-netbsd common;
|
||||
|
||||
# we test `embedded` instead of `linuxCommon` because very few packages
|
||||
# successfully cross-compile to Redox so far
|
||||
|
|
|
|||
Loading…
Reference in a new issue