Merge master into haskell-updates

This commit is contained in:
github-actions[bot]
2021-08-28 00:05:53 +00:00
committed by GitHub
148 changed files with 1249 additions and 647 deletions
+6
View File
@@ -7655,6 +7655,12 @@
githubId = 628342;
name = "Tim Steinbach";
};
nerdypepper = {
email = "nerdy@peppe.rs";
github = "nerdypepper";
githubId = 23743547;
name = "Akshay Oppiliappan";
};
nessdoor = {
name = "Tomas Antonio Lopez";
email = "entropy.overseer@protonmail.com";
+3 -3
View File
@@ -117,6 +117,7 @@ let
shared.path = "${cfg.statePath}/shared";
gitaly.client_path = "${cfg.packages.gitaly}/bin";
backup = {
gitaly_backup_path = "${cfg.packages.gitaly}/bin/gitaly-backup";
path = cfg.backup.path;
keep_time = cfg.backup.keepTime;
} // (optionalAttrs (cfg.backup.uploadOptions != {}) {
@@ -1299,7 +1300,7 @@ in {
Restart = "on-failure";
WorkingDirectory = gitlabEnv.HOME;
ExecStart =
"${cfg.packages.gitlab-workhorse}/bin/gitlab-workhorse "
"${cfg.packages.gitlab-workhorse}/bin/workhorse "
+ "-listenUmask 0 "
+ "-listenNetwork unix "
+ "-listenAddr /run/gitlab/gitlab-workhorse.socket "
@@ -1352,9 +1353,8 @@ in {
procps
gnupg
];
serviceConfig = {
Type = "simple";
Type = "notify";
User = cfg.user;
Group = cfg.group;
TimeoutSec = "infinity";
+2 -1
View File
@@ -145,7 +145,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
)
gitlab.succeed("systemd-tmpfiles --create")
gitlab.succeed("rm -rf ${nodes.gitlab.config.services.postgresql.dataDir}")
gitlab.systemctl("start gitlab-config.service gitlab-postgresql.service")
gitlab.systemctl("start gitlab-config.service gitaly.service gitlab-postgresql.service")
gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitaly.socket")
gitlab.succeed(
"sudo -u gitlab -H gitlab-rake gitlab:backup:restore RAILS_ENV=production BACKUP=dump force=yes"
)
+1 -1
View File
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "graylog";
meta.maintainers = with lib.maintainers; [ ma27 ];
meta.maintainers = with lib.maintainers; [ ];
machine = { pkgs, ... }: {
virtualisation.memorySize = 4096;
+1 -1
View File
@@ -6,7 +6,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "nexus";
meta = with pkgs.lib.maintainers; {
maintainers = [ ironpinguin ma27 ];
maintainers = [ ironpinguin ];
};
nodes = {
+1 -1
View File
@@ -4,7 +4,7 @@ with lib;
{
name = "xautolock";
meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
meta.maintainers = with pkgs.lib.maintainers; [ ];
nodes.machine = {
imports = [ ./common/x11.nix ./common/user-account.nix ];
+1 -1
View File
@@ -4,7 +4,7 @@ with lib;
{
name = "xss-lock";
meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
meta.maintainers = with pkgs.lib.maintainers; [ ];
nodes = {
simple = {
+1 -1
View File
@@ -5,7 +5,7 @@ with lib;
{
name = "yabar";
meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ];
maintainers = [ ];
};
machine = {
@@ -27,6 +27,8 @@ mkDerivation rec {
];
qtWrapperArgs = [
# MuseScore JACK backend loads libjack at runtime.
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}"
# Work around crash on update from 3.4.2 to 3.5.0
# https://bugreports.qt.io/browse/QTBUG-85967
"--set QML_DISABLE_DISK_CACHE 1"
+2 -2
View File
@@ -8,13 +8,13 @@
python3Packages.buildPythonApplication rec {
pname = "vorta";
version = "0.7.7";
version = "0.7.8";
src = fetchFromGitHub {
owner = "borgbase";
repo = "vorta";
rev = "v${version}";
sha256 = "sha256-AH9CvoWAaNLPLC+NL+VXtYq9CNCMt0AFtC1ZGXSlcHQ=";
sha256 = "sha256-qNBswy1dsCE6TEQLr/r7nnZWegDD8BD9pMkcpcuT7Q0=";
};
nativeBuildInputs = [ wrapQtAppsHook ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
ln -s $out/bin/Exodus $out/bin/exodus
ln -s $out/exodus.desktop $out/share/applications
substituteInPlace $out/share/applications/exodus.desktop \
--replace 'Exec=bash -c "cd `dirname %k` && ./Exodus"' "Exec=Exodus"
--replace 'Exec=bash -c "cd \`dirname %k\` && ./Exodus %u"' "Exec=Exodus %u"
'';
dontPatchELF = true;
+2 -2
View File
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "mob";
version = "1.9.0";
version = "1.10.0";
goPackagePath = "github.com/remotemobprogramming/mob";
src = fetchFromGitHub {
rev = "v${version}";
owner = "remotemobprogramming";
repo = pname;
sha256 = "sha256-PvFECy5wgpdOdToeYsW+NiVC2LXkBCMBorIl8m++Lic=";
sha256 = "sha256-O732PNmE+RDmETHAX/vlaSF4ZUShmO7P1B41kCw+/cQ=";
};
meta = with lib; {
@@ -81,9 +81,6 @@ in stdenv.mkDerivation {
description = "Cross-platform file manager";
license = licenses.gpl3;
maintainers = with maintainers; [ volth ];
# build is broken on MacOS
# https://github.com/NixOS/nixpkgs/pull/105784
broken = stdenv.isDarwin;
platforms = platforms.all;
};
}
+1 -1
View File
@@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://crates.io/crates/taizen";
license = licenses.mit;
description = "curses based mediawiki browser";
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}
@@ -0,0 +1,55 @@
{ stdenv, lib, help2man, python3, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "terminal-colors";
version = "3.0.1";
outputs = [ "out" "man" ];
src = fetchFromGitHub {
owner = "eikenb";
repo = pname;
rev = "v${version}";
hash = "sha256-hekt77/FhSTMEARVuck49/Q1dIuqkwbOYmgGD1IItyc=";
};
buildInputs = [ python3 ];
nativeBuildInputs = [ help2man ];
postPatch =
# This sed command modifies output of --version command in way that
# makes manpage generated by help2man(1) prettier.
''
sed -r -i "3s/([0-9.]+)/$pname - \1\\n/" ./$pname
''
# Upstream shebang of "terminal-colors" python script uses
# /usr/bin/env, which is not present in Nix sandbox, so we need to
# patch it before running help2man, otherwise it would fail with "no
# such file or directory".
+ ''
patchShebangs ./$pname
'';
buildPhase = ''
runHook preBuild
help2man -n 'display terminal colors' -N ./$pname > $pname.1
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -D -m755 ./$pname -t $out/bin
install -D -m644 ./$pname.1 -t $man/share/man/man1
runHook postInstall
'';
meta = with lib; {
description = "Script displaying terminal colors in various formats";
homepage = "https://github.com/eikenb/terminal-colors";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ kaction ];
};
}
+22
View File
@@ -0,0 +1,22 @@
{ fetchFromGitHub, lib, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "ttyper";
version = "0.2.5";
src = fetchFromGitHub {
owner = "max-niederman";
repo = pname;
rev = "v${version}";
sha256 = "1fsb77ky92fyv3ll6zrbxbd69gm85xnc6bivj7sc3sv5cxhgr7a5";
};
cargoSha256 = "1sqdql0kfr1vsww6hkrp7yjlzx0mnhfma51z699hkx9c492sf1wk";
meta = with lib; {
description = "Terminal-based typing test";
homepage = "https://github.com/max-niederman/ttyper";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}
+1 -1
View File
@@ -87,6 +87,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.xmind.net/";
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ michalrus ma27 ];
maintainers = with maintainers; [ michalrus ];
};
}
@@ -18,22 +18,22 @@
}
},
"beta": {
"version": "93.0.4577.58",
"sha256": "1i9ygy99lg9h0qyl46c02id9d1ig3brkvr8va0blpf7h8pg9251s",
"sha256bin64": "16cyn74sxz8lwdyb7x3z115czk9xvs67bb2bbnhrhnaszhhrzs4j",
"version": "94.0.4606.20",
"sha256": "0wp9fdw7jkrzhaz8dils7k1ssd6v7kkiz4y9l81s37xxi3xj1drg",
"sha256bin64": "0ahc09qv78vmx72kqhjj2lwcniqn9q73vkc1b9lyv184ai3269sq",
"deps": {
"gn": {
"version": "2021-07-08",
"version": "2021-08-11",
"url": "https://gn.googlesource.com/gn",
"rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
"sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
"rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263",
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
}
}
},
"dev": {
"version": "94.0.4606.20",
"sha256": "0wp9fdw7jkrzhaz8dils7k1ssd6v7kkiz4y9l81s37xxi3xj1drg",
"sha256bin64": "059rn0jj2cajrxx57gmr0ndkgixgfqazb73rxbprqj4857w4d5da",
"version": "95.0.4621.4",
"sha256": "06fgdyg3bychqhf31fikk7s4qp3rc7hmsvm6p2bj9ascd6kzjzx8",
"sha256bin64": "1bvkdrc7cznb9xrnld642qj3z7vbyin9xbq0pp6kqva4gck41cyn",
"deps": {
"gn": {
"version": "2021-08-11",
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kube-capacity";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "robscott";
repo = pname;
sha256 = "sha256-IwlcxlzNNYWNANszTM+s6/SA1C2LXrydSTtAvniNKXE=";
sha256 = "sha256-4UdNmuxJsPekA0y4mP302AYIFkG3ee3n99Redb/rPHw=";
};
vendorSha256 = "sha256-EgLWZs282IV1euCUCc5ucf267E2Z7GF9SgoImiGvuVM=";
vendorSha256 = "sha256-PQlOuBqn+b7fO9eHgtTAKxo3YdWmgbxx2JomklttCrM=";
meta = with lib; {
description =
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.31.5";
version = "0.31.7";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yovrqDGvw+GwzEiuveO2eLnP7mVVY5CQB0agzxIsHto=";
sha256 = "sha256-PCBKuTJ0IbYma584qIPrxGfwOIzHszWH+bW8iy0OUvo=";
};
vendorSha256 = "sha256-CVWg2SvRO//xye05G3svGeqgaTKdRcoERrR7Tp0JZUo=";
vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0=";
doCheck = false;
@@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.126";
version = "0.0.128";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "EraTDRKd6t0c9U68tSRdGkeB1hfqNS4KUewEXwkL8io=";
sha256 = "sha256-cw0YBMlapk4QLKiU8ErzzyDaPIXkosUSu7ycRV8VraM=";
};
};
}.${branch}
@@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.14.0"; # Please backport all updates to the stable channel.
version = "5.15.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0rb7ixha07v0l3bm9jbgnlf78l9hhjc9acyd1aji9l4fpq3azbq1";
sha256 = "0cbz2l31cg87n6qlbvwdjy92q9qgmmkrsvaj37cc34ajh7asd833";
};
nativeBuildInputs = [
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with lib;
let
version = "3.4.7";
version = "3.4.8";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "17d00kl0s010wg2dfhy7sdbr2qm54lsi317fmbcvjz4rxx8ywk3c";
sha256 = "09fpvfj4m7glisj6p4zb8wylkrjkqqw69xnwnz4ah410zs6zm9sq";
};
cmakeFlags = [
+2 -10
View File
@@ -26,21 +26,13 @@ in
stdenv.mkDerivation rec {
pname = "gnucash";
version = "4.5";
version = "4.6";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w=";
sha256 = "0csp8iddhc901vv09gl5lj970g6ili696vwj4vdpkiprp7gh26r5";
};
patches = [
# Fix build with GLib 2.68.
(fetchpatch {
url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch";
sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ=";
})
];
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ];
buildInputs = [
@@ -1,13 +1,13 @@
{
"version": "14.1.2",
"repo_hash": "1d28minrpgp8awcnx15bm7jv0k27i46wji3pc2d6wh1m0wk74b60",
"version": "14.2.1",
"repo_hash": "0ivymkqcwl2lrnv0lkcw2ch26iyz9ixklrkc2jq38pbwc0igf89z",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.1.2-ee",
"rev": "v14.2.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "14.1.2",
"GITLAB_PAGES_VERSION": "1.41.0",
"GITALY_SERVER_VERSION": "14.2.1",
"GITLAB_PAGES_VERSION": "1.42.0",
"GITLAB_SHELL_VERSION": "13.19.1",
"GITLAB_WORKHORSE_VERSION": "14.1.2"
"GITLAB_WORKHORSE_VERSION": "14.2.1"
}
}
@@ -22,12 +22,6 @@ let
gemset =
let x = import (gemdir + "/gemset.nix");
in x // {
# grpc expects the AR environment variable to contain `ar rpc`. See the
# discussion in nixpkgs #63056.
grpc = x.grpc // {
patches = [ ./fix-grpc-ar.patch ];
dontBuild = false;
};
# the openssl needs the openssl include files
openssl = x.openssl // {
buildInputs = [ openssl ];
@@ -1,10 +0,0 @@
--- a/src/ruby/ext/grpc/extconf.rb
+++ b/src/ruby/ext/grpc/extconf.rb
@@ -27,6 +27,7 @@ ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
if ENV['AR'].nil? || ENV['AR'].size == 0
ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs'
end
+ENV['AR'] = ENV['AR'] + ' rcs'
if ENV['CC'].nil? || ENV['CC'].size == 0
ENV['CC'] = RbConfig::CONFIG['CC']
end
@@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.3.2'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
gem 'grpc', '~> 1.30.2'
gem 'grpc', '~> 1.38.0'
gem 'sentry-raven', '~> 3.0', require: false
gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
@@ -29,5 +29,5 @@ group :development, :test do
gem 'factory_bot', require: false
gem 'pry', '~> 0.12.2', require: false
gem 'grpc-tools', '= 1.30.2'
gem 'grpc-tools', '= 1.38.0'
end
@@ -75,12 +75,12 @@ GEM
redis (> 3.0.0, < 5.0.0)
gitlab-markup (1.7.1)
google-protobuf (3.17.3)
googleapis-common-protos-types (1.0.5)
google-protobuf (~> 3.11)
grpc (1.30.2)
google-protobuf (~> 3.12)
googleapis-common-protos-types (1.1.0)
google-protobuf (~> 3.14)
grpc (1.38.0)
google-protobuf (~> 3.15)
googleapis-common-protos-types (~> 1.0)
grpc-tools (1.30.2)
grpc-tools (1.38.0)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
@@ -146,7 +146,7 @@ GEM
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (6.2.0)
rdoc (6.3.2)
redis (4.2.5)
regexp_parser (1.8.1)
reverse_markdown (1.4.0)
@@ -225,8 +225,8 @@ DEPENDENCIES
gitlab-labkit (~> 0.20.0)
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.17.0)
grpc (~> 1.30.2)
grpc-tools (= 1.30.2)
grpc (~> 1.38.0)
grpc-tools (= 1.38.0)
licensee (~> 9.14.1)
pry (~> 0.12.2)
rbtrace
@@ -9,29 +9,19 @@ let
inherit ruby;
copyGemFiles = true;
gemdir = ./.;
gemset =
let x = import (gemdir + "/gemset.nix");
in x // {
# grpc expects the AR environment variable to contain `ar rpc`. See the
# discussion in nixpkgs #63056.
grpc = x.grpc // {
patches = [ ../fix-grpc-ar.patch ];
dontBuild = false;
};
};
};
in buildGoModule rec {
version = "14.1.2";
version = "14.2.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-7OqTOJDQJ/ojHevj/ld8VLjm5ZRQgCGZKchPrAlOSO8=";
sha256 = "sha256-B3NtdS1UcT+nYIdoXs+tW2gnXZ0ew+NiIcCNi5z5fOc=";
};
vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0=";
vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE=";
passthru = {
inherit rubyEnv;
@@ -300,10 +300,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1aava1b75n056s24gn7ajrkmm6s3xa3swl62dl5q9apw4marghji";
sha256 = "1949w1lcd3iyiy4n6zgnrhdp78k9khbh2pbkrpkv263bbpmw8llg";
type = "gem";
};
version = "1.0.5";
version = "1.1.0";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@@ -311,20 +311,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12";
type = "gem";
};
version = "1.30.2";
version = "1.38.0";
};
grpc-tools = {
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k9zhsqhamp02ryzgfb4y2bbick151vlhrhj0kqbbz9lyhms0bd4";
sha256 = "0sfbf5s19nfgznlb7m2sfw9l0ppvypj46ijjvq5p35fc6b8by5aq";
type = "gem";
};
version = "1.30.2";
version = "1.38.0";
};
i18n = {
dependencies = ["concurrent-ruby"];
@@ -672,10 +672,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gh7sc3xd4rgl9z90181cq580r1xqn063mmv51wdrhhsrkkw2bi9";
sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y";
type = "gem";
};
version = "6.2.0";
version = "6.3.2";
};
redis = {
groups = ["default"];
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "14.1.2";
version = "14.2.1";
src = fetchFromGitLab {
owner = data.owner;
@@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-gTObI0pmRUX6Eh5FVdt+5LbckyBuFq1Ly4oPZztazHQ=";
vendorSha256 = "sha256-q0LuXmjoO6mjVZpMRVVGL862mA+MaCejTCx99Zi5VEI=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;
@@ -49,7 +49,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.4.0'
gem 'omniauth-authentiq', '~> 0.3.3'
gem 'gitlab-omniauth-openid-connect', '~> 0.4.0', require: 'omniauth_openid_connect'
gem 'gitlab-omniauth-openid-connect', '~> 0.8.0', require: 'omniauth_openid_connect'
gem 'omniauth-salesforce', '~> 1.0.5'
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.16.0'
@@ -223,7 +223,7 @@ gem 're2', '~> 1.2.0'
gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.4'
gem 'js_regex', '~> 3.7'
# User agent parsing
gem 'device_detector'
@@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.20.0'
gem 'gitlab-labkit', '~> 0.21.0'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0'
@@ -335,9 +335,11 @@ gem 'method_source', '~> 1.0', require: false
gem 'webrick', '~> 1.6.1', require: false
gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
gem 'warning', '~> 1.2.0'
group :development do
gem 'lefthook', '~> 0.7.0', require: false
gem 'solargraph', '~> 0.42', require: false
gem 'solargraph', '~> 0.43', require: false
gem 'letter_opener_web', '~> 1.4.0'
@@ -358,7 +360,7 @@ group :development, :test do
gem 'awesome_print', require: false
gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 6.1.0'
gem 'factory_bot_rails', '~> 6.2.0'
gem 'rspec-rails', '~> 5.0.1'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
@@ -394,7 +396,7 @@ group :development, :test do
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 2.2.2', require: false
gem 'gitlab-dangerfiles', '~> 2.3.0', require: false
end
group :development, :test, :coverage do
@@ -472,12 +474,12 @@ end
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 14.1.0.pre.rc3'
gem 'gitaly', '~> 14.2.0.pre.rc2'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
gem 'grpc', '~> 1.30.2'
gem 'grpc', '~> 1.38.0'
gem 'google-protobuf', '~> 3.17.1'
@@ -487,8 +489,8 @@ gem 'toml-rb', '~> 2.0'
gem 'flipper', '~> 0.21.0'
gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0'
gem 'unleash', '~> 0.1.5'
gem 'gitlab-experiment', '~> 0.6.1'
gem 'unleash', '~> 3.2.2'
gem 'gitlab-experiment', '~> 0.6.4'
# Structured logging
gem 'lograge', '~> 0.5'
@@ -521,7 +523,7 @@ gem 'valid_email', '~> 0.1'
# JSON
gem 'json', '~> 2.3.0'
gem 'json_schemer', '~> 0.2.12'
gem 'json_schemer', '~> 0.2.18'
gem 'oj', '~> 3.10.6'
gem 'multi_json', '~> 1.14.1'
gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
@@ -532,3 +534,5 @@ gem 'webauthn', '~> 2.3'
gem 'ipaddress', '~> 0.8.3'
gem 'parslet', '~> 1.8'
gem 'sd_notify'
@@ -2,7 +2,6 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
abstract_type (0.0.7)
acme-client (2.0.6)
faraday (>= 0.17, < 2.0.0)
actioncable (6.1.3.2)
@@ -69,9 +68,6 @@ GEM
zeitwerk (~> 2.3)
acts-as-taggable-on (7.0.0)
activerecord (>= 5.0, < 6.2)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
aes_key_wrap (1.1.0)
@@ -176,7 +172,8 @@ GEM
mime-types (>= 1.16)
ssrf_filter (~> 1.0)
cbor (0.5.9.6)
character_set (1.4.0)
character_set (1.4.1)
sorted_set (~> 1.0)
charlock_holmes (0.7.7)
chef-config (16.10.17)
addressable
@@ -198,10 +195,7 @@ GEM
colored2 (3.1.2)
commonmarker (0.21.0)
ruby-enum (~> 0.5)
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
connection_pool (2.2.2)
contracts (0.11.0)
cork (0.3.0)
@@ -307,8 +301,8 @@ GEM
dry-inflector (~> 0.1, >= 0.1.2)
dry-logic (~> 1.0, >= 1.0.2)
e2mmap (0.1.0)
ecma-re-validator (0.2.1)
regexp_parser (~> 1.2)
ecma-re-validator (0.3.0)
regexp_parser (~> 2.0)
ed25519 (1.2.4)
elasticsearch (6.8.2)
elasticsearch-api (= 6.8.2)
@@ -329,7 +323,6 @@ GEM
launchy (~> 2.1)
mail (~> 2.7)
encryptor (3.0.0)
equalizer (0.0.11)
erubi (1.9.0)
escape_utils (1.2.1)
et-orbi (1.2.1)
@@ -340,10 +333,10 @@ GEM
expression_parser (0.9.0)
extended-markdown-filter (0.6.0)
html-pipeline (~> 2.0)
factory_bot (6.1.0)
factory_bot (6.2.0)
activesupport (>= 5.0.0)
factory_bot_rails (6.1.0)
factory_bot (~> 6.1.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faraday (1.4.2)
faraday-em_http (~> 1.0)
@@ -453,7 +446,7 @@ GEM
rails (>= 3.2.0)
git (1.7.0)
rchardet (~> 1.8)
gitaly (14.1.0.pre.rc3)
gitaly (14.2.0.pre.rc2)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab (4.16.1)
@@ -461,10 +454,10 @@ GEM
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (2.2.2)
gitlab-dangerfiles (2.3.0)
danger (>= 8.3.1)
danger-gitlab (>= 8.0.0)
gitlab-experiment (0.6.1)
gitlab-experiment (0.6.4)
activesupport (>= 3.0)
request_store (>= 1.0)
scientist (~> 1.6, >= 1.6.0)
@@ -475,10 +468,10 @@ GEM
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.20.0)
gitlab-labkit (0.21.0)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
grpc (~> 1.19)
grpc (~> 1.38)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
pg_query (~> 2.1)
@@ -487,7 +480,7 @@ GEM
gitlab-mail_room (0.0.9)
gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1)
gitlab-omniauth-openid-connect (0.4.0)
gitlab-omniauth-openid-connect (0.8.0)
addressable (~> 2.7)
omniauth (~> 1.9)
openid_connect (~> 1.2)
@@ -524,8 +517,8 @@ GEM
signet (~> 0.12)
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
google-protobuf (3.17.1)
googleapis-common-protos-types (1.0.6)
google-protobuf (3.17.3)
googleapis-common-protos-types (1.1.0)
google-protobuf (~> 3.14)
googleauth (0.14.0)
faraday (>= 0.17.3, < 2.0)
@@ -573,8 +566,8 @@ GEM
graphql (~> 1.6)
html-pipeline (~> 2.8)
sass (~> 3.4)
grpc (1.30.2)
google-protobuf (~> 3.12)
grpc (1.38.0)
google-protobuf (~> 3.15)
googleapis-common-protos-types (~> 1.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
@@ -605,7 +598,7 @@ GEM
temple (>= 0.8.2)
thor
tilt
hana (1.3.6)
hana (1.3.7)
hangouts-chat (0.0.5)
hashdiff (1.0.1)
hashie (4.1.0)
@@ -640,7 +633,6 @@ GEM
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
icalendar (2.4.1)
ice_nine (0.11.2)
invisible_captcha (1.1.0)
rails (>= 4.2)
ipaddress (0.8.3)
@@ -654,19 +646,19 @@ GEM
multipart-post
oauth (~> 0.5, >= 0.5.0)
jmespath (1.4.0)
js_regex (3.4.0)
js_regex (3.7.0)
character_set (~> 1.4)
regexp_parser (~> 1.5)
regexp_property_values (~> 0.3)
regexp_parser (~> 2.1)
regexp_property_values (~> 1.0)
json (2.3.0)
json-jwt (1.13.0)
activesupport (>= 4.2)
aes_key_wrap
bindata
json_schemer (0.2.12)
ecma-re-validator (~> 0.2)
json_schemer (0.2.18)
ecma-re-validator (~> 0.3)
hana (~> 1.3)
regexp_parser (~> 1.5)
regexp_parser (~> 2.0)
uri_template (~> 0.7)
jsonpath (1.1.0)
multi_json
@@ -719,7 +711,7 @@ GEM
reverse_markdown (~> 1.0)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
listen (3.2.1)
listen (3.6.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
locale (2.1.3)
@@ -729,7 +721,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.9.1)
loofah (2.11.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lru_redux (1.1.0)
@@ -741,8 +733,6 @@ GEM
actionpack (>= 2.3)
activerecord (>= 2.3)
memoist (0.16.2)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
memory_profiler (0.9.14)
method_source (1.0.0)
mime-types (3.3.1)
@@ -751,7 +741,7 @@ GEM
mini_histogram (0.3.1)
mini_magick (4.10.1)
mini_mime (1.0.2)
mini_portile2 (2.5.1)
mini_portile2 (2.5.3)
minitest (5.11.3)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
@@ -789,7 +779,7 @@ GEM
netrc (0.11.0)
nio4r (2.5.4)
no_proxy_fix (0.1.2)
nokogiri (1.11.5)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.2)
@@ -928,7 +918,6 @@ GEM
coderay
parser
unparser
procto (0.0.3)
prometheus-client-mmap (0.12.0)
pry (0.13.1)
coderay (~> 1.1)
@@ -1005,7 +994,7 @@ GEM
rake (>= 0.8.7)
thor (~> 1.0)
rainbow (3.0.0)
rake (13.0.3)
rake (13.0.6)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
@@ -1015,6 +1004,7 @@ GEM
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rbtree (0.4.4)
rchardet (1.8.0)
rdoc (6.3.2)
re2 (1.2.0)
@@ -1040,8 +1030,8 @@ GEM
redis-store (>= 1.2, < 2)
redis-store (1.8.1)
redis (>= 4, < 5)
regexp_parser (1.8.2)
regexp_property_values (0.3.5)
regexp_parser (2.1.1)
regexp_property_values (1.0.0)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@@ -1079,7 +1069,7 @@ GEM
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-parameterized (0.4.2)
rspec-parameterized (0.5.0)
binding_ninja (>= 0.2.3)
parser
proc_to_ast
@@ -1170,6 +1160,7 @@ GEM
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
scientist (1.6.0)
sd_notify (0.1.1)
securecompare (1.0.0)
seed-fu (2.3.7)
activerecord (>= 3.1)
@@ -1179,6 +1170,7 @@ GEM
rubyzip (>= 1.2.2)
sentry-raven (3.1.2)
faraday (>= 1.0)
set (1.0.1)
settingslogic (2.0.9)
sexp_processor (4.15.1)
shellany (0.0.1)
@@ -1203,12 +1195,12 @@ GEM
simplecov-html (~> 0.11)
simplecov-cobertura (1.3.1)
simplecov (~> 0.8)
simplecov-html (0.12.2)
simplecov-html (0.12.3)
sixarm_ruby_unaccent (1.2.0)
slack-messenger (2.3.4)
snowplow-tracker (0.6.1)
contracts (~> 0.7, <= 0.11)
solargraph (0.42.3)
solargraph (0.43.0)
backport (~> 1.2)
benchmark
bundler (>= 1.17.2)
@@ -1223,6 +1215,9 @@ GEM
thor (~> 1.0)
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
sorted_set (1.0.3)
rbtree
set (~> 1.0)
spamcheck (0.1.0)
grpc (~> 1.0)
spring (2.1.1)
@@ -1272,7 +1267,6 @@ GEM
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.1.0)
thread_safe (0.3.6)
thrift (0.14.0)
tilt (2.0.10)
timecop (0.9.1)
@@ -1323,16 +1317,11 @@ GEM
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uniform_notifier (1.13.0)
unleash (0.1.5)
unleash (3.2.2)
murmurhash3 (~> 0.1.6)
unparser (0.4.7)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
concord (~> 0.1.5)
unparser (0.6.0)
diff-lcs (~> 1.3)
equalizer (~> 0.0.9)
parser (>= 2.6.5)
procto (~> 0.0.2)
parser (>= 3.0.0)
uri_template (0.7.0)
valid_email (0.1.3)
activemodel
@@ -1350,6 +1339,7 @@ GEM
vmstat (2.3.0)
warden (1.2.8)
rack (>= 2.0.6)
warning (1.2.0)
webauthn (2.3.0)
android_key_attestation (~> 0.3.0)
awrence (~> 1.1)
@@ -1453,7 +1443,7 @@ DEPENDENCIES
email_spec (~> 2.2.0)
erubi (~> 1.9.0)
escape_utils (~> 1.1)
factory_bot_rails (~> 6.1.0)
factory_bot_rails (~> 6.2.0)
faraday (~> 1.0)
faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank
@@ -1475,18 +1465,18 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 14.1.0.pre.rc3)
gitaly (~> 14.2.0.pre.rc2)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 2.2.2)
gitlab-experiment (~> 0.6.1)
gitlab-dangerfiles (~> 2.3.0)
gitlab-experiment (~> 0.6.4)
gitlab-fog-azure-rm (~> 1.1.1)
gitlab-labkit (~> 0.20.0)
gitlab-labkit (~> 0.21.0)
gitlab-license (~> 2.0)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.4.0)
gitlab-omniauth-openid-connect (~> 0.8.0)
gitlab-sidekiq-fetcher (= 0.5.6)
gitlab-styles (~> 6.2.0)
gitlab_chronic_duration (~> 0.10.6.2)
@@ -1503,7 +1493,7 @@ DEPENDENCIES
graphlient (~> 0.4.0)
graphql (~> 1.11.8)
graphql-docs (~> 1.6.0)
grpc (~> 1.30.2)
grpc (~> 1.38.0)
gssapi
guard-rspec
haml_lint (~> 0.36.0)
@@ -1519,9 +1509,9 @@ DEPENDENCIES
invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3)
jira-ruby (~> 2.1.4)
js_regex (~> 3.4)
js_regex (~> 3.7)
json (~> 2.3.0)
json_schemer (~> 0.2.12)
json_schemer (~> 0.2.18)
jwt (~> 2.1.0)
kaminari (~> 1.0)
kas-grpc (~> 0.0.2)
@@ -1622,6 +1612,7 @@ DEPENDENCIES
rugged (~> 1.1)
sanitize (~> 5.2.1)
sassc-rails (~> 2.1.0)
sd_notify
seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.142)
sentry-raven (~> 3.1)
@@ -1634,7 +1625,7 @@ DEPENDENCIES
simplecov-cobertura (~> 1.3.1)
slack-messenger (~> 2.3.4)
snowplow-tracker (~> 0.6.1)
solargraph (~> 0.42)
solargraph (~> 0.43)
spamcheck (~> 0.1.0)
spring (~> 2.1.0)
spring-commands-rspec (~> 1.0.4)
@@ -1653,11 +1644,12 @@ DEPENDENCIES
truncato (~> 0.7.11)
u2f (~> 0.2.1)
unf (~> 0.1.4)
unleash (~> 0.1.5)
unleash (~> 3.2.2)
valid_email (~> 0.1)
validates_hostname (~> 1.0.11)
version_sorter (~> 2.2.4)
vmstat (~> 2.3.0)
warning (~> 1.2.0)
webauthn (~> 2.3)
webmock (~> 3.9.1)
webrick (~> 1.6.1)
@@ -1,14 +1,4 @@
{
abstract_type = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14";
type = "gem";
};
version = "0.0.7";
};
acme-client = {
dependencies = ["faraday"];
groups = ["default"];
@@ -163,17 +153,6 @@
};
version = "7.0.0";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak";
type = "gem";
};
version = "0.2.0";
};
addressable = {
dependencies = ["public_suffix"];
groups = ["danger" "default" "development" "test"];
@@ -694,14 +673,15 @@
version = "0.5.9.6";
};
character_set = {
dependencies = ["sorted_set"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0affq9n77vwy897ri2zhmfinfagf37hcwwimrccy1bcxan9mj3h3";
sha256 = "0ql0kxnpbblggyn8hx511pghpqf8xv3ng2kbybwwdi11bg1il6zp";
type = "gem";
};
version = "1.4.0";
version = "1.4.1";
};
charlock_holmes = {
groups = ["default"];
@@ -820,26 +800,15 @@
};
version = "0.21.0";
};
concord = {
dependencies = ["adamantium" "equalizer"];
groups = ["default" "development" "test"];
platforms = [];
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 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
type = "gem";
};
version = "1.1.8";
version = "1.1.9";
};
connection_pool = {
groups = ["default"];
@@ -1294,10 +1263,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hjnd6phkhwmd846hqkzbiiyf7n6v9s85agizkxrkha1z0g3q5fc";
sha256 = "1mz0nsl2093jd94nygw8qs13rwfwl1ax76xz3ypinr5hqbc5pab6";
type = "gem";
};
version = "0.2.1";
version = "0.3.0";
};
ed25519 = {
groups = ["ed25519"];
@@ -1394,16 +1363,6 @@
};
version = "3.0.0";
};
equalizer = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
type = "gem";
};
version = "0.0.11";
};
erubi = {
groups = ["default" "development" "test"];
platforms = [];
@@ -1492,10 +1451,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11ij9s4hasy963qjqbrrf0m8lm9m9pxkh2vf4wrnafa6gw6r9qk8";
sha256 = "04vxmjr200akcil9fqxc9ghbb9q0lyrh2q03xxncycd5vln910fi";
type = "gem";
};
version = "6.1.0";
version = "6.2.0";
};
factory_bot_rails = {
dependencies = ["factory_bot" "railties"];
@@ -1503,10 +1462,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hfxkq6rarg0b8xfzqg200xyj176sn1xplqqqcrz5drhkqp30m14";
sha256 = "18fhcihkc074gk62iwqgbdgc3ymim4fm0b4p3ipffy5hcsb9d2r7";
type = "gem";
};
version = "6.1.0";
version = "6.2.0";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"];
@@ -1952,10 +1911,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kf335cnps9ix3jfnfq99zlp7wrf6p9lip7cxicxylvn682i7l4y";
sha256 = "0y4zsl1s7ysb1z6piczfkscbjnx7hchda3jsdam42dmi40z654dp";
type = "gem";
};
version = "14.1.0.pre.rc3";
version = "14.2.0.pre.rc2";
};
github-markup = {
groups = ["default"];
@@ -1995,10 +1954,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x5qlncyc090vyvgpj5f186109gfyv4jcbyibbyq3mcd38brqgc2";
sha256 = "07ckvf7vk0494s70ql7zp3ckn8q70mhwa0143hj6bjh0bpgmgsnw";
type = "gem";
};
version = "2.2.2";
version = "2.3.0";
};
gitlab-experiment = {
dependencies = ["activesupport" "request_store" "scientist"];
@@ -2006,10 +1965,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d1w5vd3001469bk5cqac5d9l44f6sbqbzw5z4xiflyi7fdad9jf";
sha256 = "07b7fb8vkpwjf668mircz6lavr8yp5xc7f7yp1v1h7izhzhn7m8g";
type = "gem";
};
version = "0.6.1";
version = "0.6.4";
};
gitlab-fog-azure-rm = {
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
@@ -2028,10 +1987,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1krn6vi33i5vqbz3gmwzj9f9ifda41a3as3chpl899mrgni61q6r";
sha256 = "0dzdxrn2ra21nyfnabj44fbwbccjkp3i7cjpym99pzbsx8dkna8z";
type = "gem";
};
version = "0.20.0";
version = "0.21.0";
};
gitlab-license = {
groups = ["default"];
@@ -2079,10 +2038,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16vbdyp2ml2i59xnpk0w5grh441kxcdpr639yzv69brjnrf3h9di";
sha256 = "0bzblypm1d5bxn8a15l90vx4ad099i5nhnislr7fhs2axy3ssfr1";
type = "gem";
};
version = "0.4.0";
version = "0.8.0";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
@@ -2177,10 +2136,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00jm6b5gpzj99cngha3g70s0xnr0c58si7kx3g7jiaj9ipp26qj5";
sha256 = "0vmll4nnkha3vsqj1g76pwni6x7mp2i81pka4wdwq8qfhn210108";
type = "gem";
};
version = "3.17.1";
version = "3.17.3";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@@ -2188,10 +2147,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0074jk8fdl5rh7hfgx00n17sg493xrylkjkslx2d7cj5mk6hwn7d";
sha256 = "1949w1lcd3iyiy4n6zgnrhdp78k9khbh2pbkrpkv263bbpmw8llg";
type = "gem";
};
version = "1.0.6";
version = "1.1.0";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -2319,10 +2278,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12";
type = "gem";
};
version = "1.30.2";
version = "1.38.0";
};
gssapi = {
dependencies = ["ffi"];
@@ -2405,10 +2364,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ij5clmkfl5ij9wdzr62b0w7j2qg7pb65mhvxa6mf1kv1xp6l585";
sha256 = "03cvrv2wl25j9n4n509hjvqnmwa60k92j741b64a1zjisr1dn9al";
type = "gem";
};
version = "1.3.6";
version = "1.3.7";
};
hangouts-chat = {
groups = ["default"];
@@ -2610,16 +2569,6 @@
};
version = "2.4.1";
};
ice_nine = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
type = "gem";
};
version = "0.11.2";
};
invisible_captcha = {
dependencies = ["rails"];
groups = ["default"];
@@ -2689,10 +2638,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zia0pxa2lrybwv51xzhj26rf3gx8zwg1cghbdk640rbsyr8sf9a";
sha256 = "0xarq1fqjaz6v139zzy4nwjg8c253fkvifn345gilva1qilaqgxi";
type = "gem";
};
version = "3.4.0";
version = "3.7.0";
};
json = {
groups = ["default"];
@@ -2721,10 +2670,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "194898b70ylkjqg7vhy4lps4a5g31n7xxb3vfacwfs40azkn83zm";
sha256 = "1rkb7gz819g82n3xshb5g8kgv1nvgwg1lm2fk7715pggzcgc4qik";
type = "gem";
};
version = "0.2.12";
version = "0.2.18";
};
jsonpath = {
dependencies = ["multi_json"];
@@ -2926,10 +2875,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh";
type = "gem";
};
version = "3.2.1";
version = "3.6.0";
};
locale = {
groups = ["default" "development"];
@@ -2968,10 +2917,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
sha256 = "0pwik3x5fa92g6hbv4imz3n46nlkzgj69pkgql22ppmcr36knk6m";
type = "gem";
};
version = "2.9.1";
version = "2.11.0";
};
lru_redux = {
groups = ["default"];
@@ -3035,17 +2984,6 @@
};
version = "0.16.2";
};
memoizable = {
dependencies = ["thread_safe"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
type = "gem";
};
version = "0.4.2";
};
memory_profiler = {
groups = ["default"];
platforms = [];
@@ -3126,10 +3064,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";
type = "gem";
};
version = "2.5.1";
version = "2.5.3";
};
minitest = {
groups = ["development" "test"];
@@ -3385,10 +3323,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
type = "gem";
};
version = "1.11.5";
version = "1.11.7";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -3936,16 +3874,6 @@
};
version = "0.1.0";
};
procto = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c";
type = "gem";
};
version = "0.0.3";
};
prometheus-client-mmap = {
groups = ["metrics"];
platforms = [];
@@ -4244,10 +4172,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem";
};
version = "13.0.3";
version = "13.0.6";
};
rb-fsevent = {
groups = ["default" "development" "test"];
@@ -4296,6 +4224,16 @@
};
version = "0.4.14";
};
rbtree = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p0x2sxm0ar4ywsxp94yh3glawf83bdikdkccpc8zzln5987l9y1";
type = "gem";
};
version = "0.4.4";
};
rchardet = {
groups = ["default" "development"];
platforms = [];
@@ -4438,20 +4376,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm";
sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr";
type = "gem";
};
version = "1.8.2";
version = "2.1.1";
};
regexp_property_values = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iwapp91sbvafqp12cq834rgy1ydrmrsh5w1a0wfsk4scdxcdwlb";
sha256 = "03q8dn4fg51mfk5d4sfcr0f9hqbs42ghafi76k9nc7ms1gf9j90n";
type = "gem";
};
version = "0.3.5";
version = "1.0.0";
};
representable = {
dependencies = ["declarative" "declarative-option" "uber"];
@@ -4626,14 +4564,14 @@
};
rspec-parameterized = {
dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
groups = ["development" "test"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31";
sha256 = "0m142sp884z3k3xd42ngf0n8a83hvcihcj1n66qyxlgdnl3sqqzi";
type = "gem";
};
version = "0.4.2";
version = "0.5.0";
};
rspec-rails = {
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
@@ -4987,6 +4925,16 @@
};
version = "1.6.0";
};
sd_notify = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb";
type = "gem";
};
version = "0.1.1";
};
securecompare = {
groups = ["default"];
platforms = [];
@@ -5030,6 +4978,16 @@
};
version = "3.1.2";
};
set = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p8raic4vlif3r4crjm3x32hmkpikjd456c126hrv3kkyj6zwsfi";
type = "gem";
};
version = "1.0.1";
};
settingslogic = {
groups = ["default"];
platforms = [];
@@ -5137,14 +5095,14 @@
version = "1.3.1";
};
simplecov-html = {
groups = ["default" "development" "test"];
groups = ["coverage" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v7b4mf7njw8kv4ghl4q7mwz3q0flbld7v8blp4m4m3n3aq11bn9";
sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb";
type = "gem";
};
version = "0.12.2";
version = "0.12.3";
};
sixarm_ruby_unaccent = {
groups = ["default"];
@@ -5183,10 +5141,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xqmvwh6k638h6r13wsx1l0n0jvz07qys1lr7z8aaynscs0k6hyi";
sha256 = "1i2prnczlg871l3kyqy08z8axsilgv3wm4zw061wjyzqglx7xghg";
type = "gem";
};
version = "0.42.3";
version = "0.43.0";
};
sorted_set = {
dependencies = ["rbtree" "set"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0brpwv68d7m9qbf5js4bg8bmg4v7h4ghz312jv9cnnccdvp8nasg";
type = "gem";
};
version = "1.0.3";
};
spamcheck = {
dependencies = ["grpc"];
@@ -5451,16 +5420,6 @@
};
version = "1.1.0";
};
thread_safe = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
type = "gem";
};
version = "0.3.6";
};
thrift = {
groups = ["default"];
platforms = [];
@@ -5727,21 +5686,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xs2ml9cwskddsxick3a9wnasy7q6wmc0dbydfcaspfl2cjmp1rk";
sha256 = "0fxr4q8bs5pbf3y57f3bckg3ls9k76wzzkhvl1kdw879im4mcvhg";
type = "gem";
};
version = "0.1.5";
version = "3.2.2";
};
unparser = {
dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
dependencies = ["diff-lcs" "parser"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qg1apxlnf4kxfj9jpm6hhv73jsncbs4zpsgyan32p5r331q1gmx";
sha256 = "0246c6j1lbi6jgga3n2br1nyvnwzh1bz0r9yca5d4cihb100byja";
type = "gem";
};
version = "0.4.7";
version = "0.6.0";
};
uri_template = {
groups = ["default"];
@@ -5828,6 +5787,16 @@
};
version = "1.2.8";
};
warning = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qhniramhgrcqhb905rkc82k29kgd6535jqf0aii5w3v6m2kn8qd";
type = "gem";
};
version = "1.2.0";
};
webauthn = {
dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"];
groups = ["default"];
@@ -135,6 +135,7 @@ 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)
@@ -818,11 +818,11 @@
};
}
{
name = "_gitlab_svgs___svgs_1.202.0.tgz";
name = "_gitlab_svgs___svgs_1.211.0.tgz";
path = fetchurl {
name = "_gitlab_svgs___svgs_1.202.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.202.0.tgz";
sha1 = "dbfad291fc5f597f0d31ca6a694fa8e78af57847";
name = "_gitlab_svgs___svgs_1.211.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.211.0.tgz";
sha1 = "0351fa4cc008c4830f366aede535df0a8e63dda6";
};
}
{
@@ -834,11 +834,11 @@
};
}
{
name = "_gitlab_ui___ui_31.5.0.tgz";
name = "_gitlab_ui___ui_32.2.1.tgz";
path = fetchurl {
name = "_gitlab_ui___ui_31.5.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-31.5.0.tgz";
sha1 = "45b7866b790e7d5a1b67b39000c047991036b437";
name = "_gitlab_ui___ui_32.2.1.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.2.1.tgz";
sha1 = "e019124af981e8ceffd39f30cf08d315c53d4ac8";
};
}
{
@@ -1122,11 +1122,11 @@
};
}
{
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.58.tgz";
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.59.tgz";
path = fetchurl {
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.58.tgz";
url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.58.tgz";
sha1 = "7adc78c0a420e7527c68782e2f0c9c62652df02d";
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.59.tgz";
url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.59.tgz";
sha1 = "ac64a9f90ff48363334407d12622542d0faa7720";
};
}
{
@@ -1345,6 +1345,22 @@
sha1 = "cccce9713824e05ebde895f84f747b8bbed45f7d";
};
}
{
name = "_tiptap_extension_subscript___extension_subscript_2.0.0_beta.4.tgz";
path = fetchurl {
name = "_tiptap_extension_subscript___extension_subscript_2.0.0_beta.4.tgz";
url = "https://registry.yarnpkg.com/@tiptap/extension-subscript/-/extension-subscript-2.0.0-beta.4.tgz";
sha1 = "07907df58695eb02bf6904d2c3635111003b30fd";
};
}
{
name = "_tiptap_extension_superscript___extension_superscript_2.0.0_beta.4.tgz";
path = fetchurl {
name = "_tiptap_extension_superscript___extension_superscript_2.0.0_beta.4.tgz";
url = "https://registry.yarnpkg.com/@tiptap/extension-superscript/-/extension-superscript-2.0.0-beta.4.tgz";
sha1 = "16906d71dd8f9892101cf792f42005f8cd404516";
};
}
{
name = "_tiptap_extension_table_cell___extension_table_cell_2.0.0_beta.13.tgz";
path = fetchurl {
@@ -1377,6 +1393,22 @@
sha1 = "57accf19c07e96bd0db868eb791da20bd423af36";
};
}
{
name = "_tiptap_extension_task_item___extension_task_item_2.0.0_beta.17.tgz";
path = fetchurl {
name = "_tiptap_extension_task_item___extension_task_item_2.0.0_beta.17.tgz";
url = "https://registry.yarnpkg.com/@tiptap/extension-task-item/-/extension-task-item-2.0.0-beta.17.tgz";
sha1 = "e4e010c321b8f9aa5f49847c48e4e3a0695a47a9";
};
}
{
name = "_tiptap_extension_task_list___extension_task_list_2.0.0_beta.17.tgz";
path = fetchurl {
name = "_tiptap_extension_task_list___extension_task_list_2.0.0_beta.17.tgz";
url = "https://registry.yarnpkg.com/@tiptap/extension-task-list/-/extension-task-list-2.0.0-beta.17.tgz";
sha1 = "c0f40325abf1b6a23868e72ab32f9724a8b42a7b";
};
}
{
name = "_tiptap_extension_text___extension_text_2.0.0_beta.12.tgz";
path = fetchurl {
@@ -3474,11 +3506,11 @@
};
}
{
name = "commander___commander_2.20.0.tgz";
name = "commander___commander_2.20.3.tgz";
path = fetchurl {
name = "commander___commander_2.20.0.tgz";
url = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz";
sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422";
name = "commander___commander_2.20.3.tgz";
url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz";
sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33";
};
}
{
@@ -3754,11 +3786,11 @@
};
}
{
name = "core_js___core_js_3.13.0.tgz";
name = "core_js___core_js_3.16.2.tgz";
path = fetchurl {
name = "core_js___core_js_3.13.0.tgz";
url = "https://registry.yarnpkg.com/core-js/-/core-js-3.13.0.tgz";
sha1 = "58ca436bf01d6903aee3d364089868d0d89fe58d";
name = "core_js___core_js_3.16.2.tgz";
url = "https://registry.yarnpkg.com/core-js/-/core-js-3.16.2.tgz";
sha1 = "3f485822889c7fc48ef463e35be5cc2a4a01a1f4";
};
}
{
@@ -4762,11 +4794,11 @@
};
}
{
name = "dompurify___dompurify_2.3.0.tgz";
name = "dompurify___dompurify_2.3.1.tgz";
path = fetchurl {
name = "dompurify___dompurify_2.3.0.tgz";
url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz";
sha1 = "07bb39515e491588e5756b1d3e8375b5964814e2";
name = "dompurify___dompurify_2.3.1.tgz";
url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz";
sha1 = "a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a";
};
}
{
@@ -9113,14 +9145,6 @@
sha1 = "95be3f48f4220999b909266a9997727f0deab947";
};
}
{
name = "monaco_editor___monaco_editor_0.24.0.tgz";
path = fetchurl {
name = "monaco_editor___monaco_editor_0.24.0.tgz";
url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.24.0.tgz";
sha1 = "990b55096bcc95d08d8d28e55264c6eb17707269";
};
}
{
name = "monaco_editor___monaco_editor_0.25.2.tgz";
path = fetchurl {
@@ -11097,14 +11121,6 @@
sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde";
};
}
{
name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz";
path = fetchurl {
name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz";
url = "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz";
sha1 = "0e9020dd3d21024458d4ebd27e23e40269810464";
};
}
{
name = "resolve_cwd___resolve_cwd_2.0.0.tgz";
path = fetchurl {
@@ -13954,11 +13970,11 @@
};
}
{
name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz";
name = "yarn_deduplicate___yarn_deduplicate_3.1.0.tgz";
path = fetchurl {
name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz";
url = "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.1.tgz";
sha1 = "19b4a87654b66f55bf3a4bd6b153b4e4ab1b6e6d";
name = "yarn_deduplicate___yarn_deduplicate_3.1.0.tgz";
url = "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-3.1.0.tgz";
sha1 = "3018d93e95f855f236a215b591fe8bc4bcabba3e";
};
}
{
+1 -1
View File
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://fixounet.free.fr/avidemux/";
description = "Free video editor designed for simple video editing tasks";
maintainers = with maintainers; [ abbradar ma27 ];
maintainers = with maintainers; [ abbradar ];
# "CPU not supported" errors on AArch64
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl2;
+1 -1
View File
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/KeyboardFire/xscast";
license = licenses.mit;
description = "Screencasts of windows with list of keystrokes overlayed";
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "simple-scan";
version = "40.0";
version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-E4EbsqhhnmOkP8Lva3E1ny1cQITG1cizqtYXJLIHUa8=";
sha256 = "sha256-6+45qx/kygU8TtK9OjynZ0L/EJQ23QZF00FWIhMroLQ=";
};
nativeBuildInputs = [
@@ -21,8 +21,8 @@ let
release_version = "14.0.0";
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = "7d9d926a1861e2f6876943d47f297e2a08a57392"; # When using a Git commit
rev-version = "unstable-2021-08-03"; # When using a Git commit
rev = "ee65938357d5fffe9e586fa155b37268b5a358ac"; # When using a Git commit
rev-version = "unstable-2021-08-13"; # When using a Git commit
version = if rev != "" then rev-version else "${release_version}${dash-candidate}";
targetConfig = stdenv.targetPlatform.config;
@@ -30,7 +30,7 @@ let
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
sha256 = "0v9jk49raazy5vhccagnmf6c3cxjv56rwg3670k9x9snihx2782r";
sha256 = "10ahc108wbg2rsp50j3mc8h018a453ykg1rivjkhizng80pyllm1";
};
llvm_meta = {
@@ -18,19 +18,20 @@ let
in stdenv.mkDerivation rec {
pname = "purescript";
version = "0.14.3";
version = "0.14.4";
# These hashes can be updated automatically by running the ./update.sh script.
src =
if stdenv.isDarwin
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj";
sha256 = "0m6zwb5f890d025zpn006qr8cky6zhjycap5az9zh6h47jfbrcf9";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0";
sha256 = "0hgsh6l52z873b2zk3llvqik18ifika48lmr71qyhlqf250ng9m0";
};
@@ -51,8 +52,11 @@ in stdenv.mkDerivation rec {
$PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash
'';
passthru.tests = {
minimal-module = pkgs.callPackage ./test-minimal-module {};
passthru = {
updateScript = ./update.sh;
tests = {
minimal-module = pkgs.callPackage ./test-minimal-module {};
};
};
meta = with lib; {
+43
View File
@@ -0,0 +1,43 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused jq -I nixpkgs=.
#
# This script will update the purescript derivation to the latest version.
set -eo pipefail
# This is the directory of this update.sh script.
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
purescript_derivation_file="${script_dir}/default.nix"
# This is the current revision of PureScript in Nixpkgs.
old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$purescript_derivation_file")"
# This is the latest release version of PureScript on GitHub.
new_version=$(curl --silent "https://api.github.com/repos/purescript/purescript/releases" | jq '.[0].tag_name' --raw-output | sed -e 's/v//')
echo "Updating purescript from old version v${old_version} to new version v${new_version}."
echo
echo "Fetching both old and new release tarballs for Darwin and Linux in order to confirm hashes."
echo
old_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/linux64.tar.gz")"
echo "v${old_version} linux tarball hash (current version): $old_linux_version_hash"
new_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux64.tar.gz")"
echo "v${new_version} linux tarball hash: $new_linux_version_hash"
old_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/macos.tar.gz")"
echo "v${old_version} darwin tarball hash (current version): $old_darwin_version_hash"
new_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/macos.tar.gz")"
echo "v${new_version} darwin tarball hash: $new_darwin_version_hash"
echo
echo "Replacing version and hashes in ${purescript_derivation_file}."
sed -i -e "s/${old_linux_version_hash}/${new_linux_version_hash}/" "$purescript_derivation_file"
sed -i -e "s/${old_darwin_version_hash}/${new_darwin_version_hash}/" "$purescript_derivation_file"
sed -i -e "s/${old_version}/${new_version}/" "$purescript_derivation_file"
echo
echo "Finished. Make sure you run the following commands to confirm PureScript builds correctly:"
echo ' - `nix build -L -f ./. purescript`'
echo ' - `nix build -L -f ./. purescript.passthru.tests.minimal-module`'
echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`'
+3 -3
View File
@@ -7,13 +7,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "gdal";
version = "3.2.2";
version = "3.3.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "a33784291d19015217ea2604988e53d448e14a07";
sha256 = "sha256-ynCju3chDfYtyrGmUE0n3kkaH2Mpm+/DDHHxCahjhSQ=";
rev = "v${version}";
sha256 = "0832w40a92cl8ydkv0pk7nl1ivhfhbhqbhmpqmdjpi0126jlm2y0";
};
sourceRoot = "source/gdal";
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
description = "A date and time library based on the C++11/14/17 <chrono> header";
homepage = "https://github.com/HowardHinnant/date";
platforms = platforms.linux;
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
version = "21.2.1";
version = "21.2.2";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
sha256 = "1icnxq4sqhi11c82kg0hnavk3gvbwgw2fshc7a7nb6w1wdiibj5n";
sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v";
};
nativeBuildInputs = [ cmake ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/aclements/libelfin/";
license = licenses.mit;
description = "C++11 ELF/DWARF parser";
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls,
libidn2, libunistring, nghttp2 }:
{ lib, stdenv, fetchurl, libtool, perl, pkg-config, python3, zlib, gnutls
, libidn2, libunistring }:
stdenv.mkDerivation rec {
pname = "libgnurl";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi";
};
nativeBuildInputs = [ libtool groff perl pkg-config python2 ];
nativeBuildInputs = [ libtool perl pkg-config python3 ];
buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
buildInputs = [ gnutls zlib libidn2 libunistring ];
configureFlags = [
"--disable-ntlm-wb"
@@ -6,11 +6,11 @@
lib.fix (self:
stdenv.mkDerivation rec {
pname = "xmlsec";
version = "1.2.31";
version = "1.2.32";
src = fetchurl {
url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
sha256 = "mxC8Uswx5PdhYuOXXlDbJrcatJxXHYELMRymJr5aCyY=";
sha256 = "sha256-44NwKFMjYATlsI5CS4r+m1P+nzGqp6U4LznZUz63wEM=";
};
patches = [
@@ -0,0 +1,36 @@
{ lib
, buildDunePackage
, fetchurl
, ocaml
, alcotest
, eqaf
, fmt
}:
buildDunePackage rec {
pname = "callipyge";
version = "0.2";
src = fetchurl {
url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0=";
};
useDune2 = true;
minimumOCamlVersion = "4.03";
propagatedBuildInputs = [ fmt eqaf ];
# alcotest isn't available for OCaml < 4.05 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.05";
checkInputs = [ alcotest ];
meta = {
homepage = "https://github.com/oklm-wsh/Callipyge";
description = "Curve25519 in OCaml";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fufexan ];
};
}
@@ -0,0 +1,41 @@
{ lib
, buildDunePackage
, fetchurl
, ocaml
, alcotest
, cstruct
, mirage-crypto
}:
buildDunePackage rec {
pname = "chacha";
version = "1.0.0";
src = fetchurl {
url = "https://github.com/abeaumont/ocaml-chacha/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "sha256-t8dOMQQDpje0QbuOhjSIa3xnXuXcxMVTLENa/rwdgA4=";
};
useDune2 = true;
minimumOCamlVersion = "4.02";
propagatedBuildInputs = [ cstruct mirage-crypto ];
# alcotest isn't available for OCaml < 4.05 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.05";
checkInputs = [ alcotest ];
meta = {
homepage = "https://github.com/abeaumont/ocaml-chacha";
description = "ChaCha20, ChaCha12 and ChaCha8 encryption functions, in OCaml";
longDescription = ''
An OCaml implementation of ChaCha functions, both ChaCha20 and the reduced
ChaCha8 and ChaCha12 functions. The hot loop is implemented in C for efficiency
reasons.
'';
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ fufexan ];
};
}
@@ -0,0 +1,60 @@
{ lib
, buildDunePackage
, fetchurl
, callipyge
, chacha
, digestif
, hex
, lwt
, lwt_ppx
, nocrypto
, ounit
, ppxlib
, ppx_let
, ppx_deriving
, ppx_deriving_yojson
}:
buildDunePackage rec {
pname = "noise";
version = "0.2.0";
src = fetchurl {
url = "https://github.com/emillon/ocaml-noise/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "sha256-fe3pT7fsuF2hCvXpInsRg6OvARs/eAh1Un454s1osDs=";
};
useDune2 = true;
minimumOCamlVersion = "4.04";
nativeBuildInputs = [
ppxlib
ppx_deriving
ppx_let
];
propagatedBuildInputs = [
callipyge
chacha
digestif
hex
nocrypto
];
doCheck = true;
checkInputs = [
lwt
lwt_ppx
ounit
ppx_deriving_yojson
];
meta = {
homepage = "https://github.com/emillon/ocaml-noise";
description = "OCaml implementation of the Noise Protocol Framework";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ fufexan ];
};
}
@@ -1,4 +1,4 @@
{ buildDunePackage, jsonrpc, lsp, makeWrapper, dot-merlin-reader }:
{ buildDunePackage, jsonrpc, lsp, re, makeWrapper, dot-merlin-reader }:
buildDunePackage {
pname = "ocaml-lsp-server";
@@ -7,7 +7,7 @@ buildDunePackage {
inherit (lsp) preBuild;
buildInputs = lsp.buildInputs ++ [ lsp ];
buildInputs = lsp.buildInputs ++ [ lsp re ];
nativeBuildInputs = [ makeWrapper ];
@@ -12,8 +12,8 @@
let params =
if lib.versionAtLeast ocaml.version "4.12"
then {
version = "1.5.0";
sha256 = "0g82m3jrp4s0m3fn9xmm8khrb3acccq8ns9p62bqa09pjd4vgdk2";
version = "1.7.0";
sha256 = "1va2zj41znsr94bdw485vak96zrcvqwcrqf1sy8zipb6hdhbchya";
} else {
version = "1.4.1";
sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f";
@@ -1,4 +1,5 @@
{ buildDunePackage
, lib
, cppo
, stdlib-shims
, ppx_yojson_conv_lib
@@ -8,6 +9,7 @@
, octavius
, dune-build-info
, uutf
, pp
, csexp
, cmdliner
}:
@@ -23,7 +25,7 @@ buildDunePackage {
# ocaml-lsp without messing with your opam switch, but nix should prevent
# this type of problems without resorting to vendoring.
preBuild = ''
rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner}
'';
buildInputs = [
@@ -34,7 +36,7 @@ buildDunePackage {
dune-build-info
omd
cmdliner
];
] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp;
propagatedBuildInputs = [
csexp
@@ -0,0 +1,31 @@
{ lib
, fetchFromGitHub
, buildDunePackage
, dune-build-info
, bos
}:
let
author = "avsm";
pname = "ocaml-print-intf";
version = "1.2.0";
in
buildDunePackage rec {
inherit pname version;
useDune2 = true;
src = fetchFromGitHub {
owner = author;
repo = pname;
rev = "v${version}";
sha256 = "0hw4gl7irarcywibdjqxmrga8f7yj52wgy7sc7n0wyy74jzxb8np";
};
buildInputs = [ dune-build-info bos ];
meta = with lib; {
description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form ";
homepage = "https://github.com/${author}/${pname}";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.nerdypepper ];
};
}
@@ -0,0 +1,28 @@
{ buildDunePackage
, fetchzip
, ppx_expect
, lib
}:
buildDunePackage rec {
pname = "pp";
version = "1.1.2";
src = fetchzip {
url = "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz";
sha256 = "1l1im054pxrkj7zk8m6yj4qfdpxkajpjfvy818ggf0j4nxkaihc5";
};
useDune2 = true;
minimalOCamlVersion = "4.08";
checkInputs = [ ppx_expect ];
doCheck = true;
meta = with lib; {
description = "A an alternative pretty printing library to the Format module of the OCaml standard library";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ symphorien ];
};
}
@@ -0,0 +1,43 @@
{ lib
, buildDunePackage
, fetchFromGitHub
, ocaml
, ounit
, zarith
}:
buildDunePackage rec {
pname = "rfc7748";
version = "1.0";
src = fetchFromGitHub {
owner = "burgerdev";
repo = "ocaml-rfc7748";
rev = "v${version}";
sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4=";
};
useDune2 = true;
minimumOCamlVersion = "4.05";
propagatedBuildInputs = [ zarith ];
# the tests fail for 4.05
doCheck = lib.versionAtLeast ocaml.version "4.06";
checkInputs = [ ounit ];
meta = {
homepage = "https://github.com/burgerdev/ocaml-rfc7748";
description = "Elliptic Curve Diffie-Hellman on Edwards Curves (X25519, X448)";
longDescription = ''
This library implements the ECDH functions 'X25519' and 'X448' as specified
in RFC 7748, 'Elliptic curves for security'. In the spirit of the original
publications, the public API is kept as simple as possible to make it easy
to use and hard to misuse.
'';
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ fufexan ];
};
}
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "agate-sql";
version = "0.5.6";
version = "0.5.7";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "056dc9e587fbdfdf3f1c9950f4793a5ee87622c19deba31aa0a6d6681816dcde";
sha256 = "7622c1f243b5a9a5efddfe28c36eeeb30081e43e3eb72e8f3da22c2edaecf4d8";
};
propagatedBuildInputs = [ agate sqlalchemy ];
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "aioextensions";
version = "20.11.1621472";
version = "21.7.2261349";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "abfb2a27590f20b04808192e6c9c5f93298656c013546850c4505b5070a8cc82";
sha256 = "2eacc52692495f331437e8c8e9782ca71f4617ec84f174ca17acdd77631efc47";
};
propagatedBuildInputs = [ uvloop ];
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "aioprocessing";
version = "1.1.0";
version = "2.0.0";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
sha256 = "4603c86ff3fea673d4c643ad3adc519988cd778771b75079bc3be9e5ed4c5b66";
sha256 = "469dfb746e8c4e0c727ba135cfabf9e034c554f6a73c27f908bfe3625dd74b9e";
};
# Tests aren't included in pypi package
@@ -0,0 +1,27 @@
{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook }:
buildPythonPackage rec {
pname = "anybadge";
version = "1.7.0";
src = fetchFromGitHub {
owner = "jongracecox";
repo = pname;
rev = "v${version}";
sha256 = "1d02fnig04zlrhfqqcf4505vy4p51whl2ifilnx3mkhis9lcwrmr";
};
# setup.py reads its version from the TRAVIS_TAG environment variable
TRAVIS_TAG = "v${version}";
pythonImportsCheck = [ "anybadge" ];
checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "A Python project for generating badges for your projects, with a focus on simplicity and flexibility";
license = licenses.mit;
homepage = "https://github.com/jongracecox/anybadge";
maintainers = [ maintainers.fabiangd ];
};
}
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "azure-batch";
version = "10.0.0";
version = "11.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0";
sha256 = "ce5fdb0ec962eddfe85cd82205e9177cb0bbdb445265746e38b3bbbf1f16dc73";
};
propagatedBuildInputs = [
@@ -25,6 +25,8 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.batch" ];
meta = with lib; {
description = "This is the Microsoft Azure Batch Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-eventgrid";
version = "4.3.0";
version = "4.5.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "bf50c8a4dc022ff9b1810800cb431b2c68b748eed160dd71fb8eb9bd860c7ecc";
sha256 = "41ce94305fd3c4e2534f7663fb1be79819fc7d59f2b20544593ea6c914839351";
};
propagatedBuildInputs = [
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "2.0.0";
version = "2.1.0";
pname = "azure-mgmt-apimanagement";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "54fade87af54904c8ac9785efccebc537c58a3c1f8726e929e473698f06ebbfc";
sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94";
extension = "zip";
};
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "22.0.0";
version = "22.1.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "7d582f3a4331f681f6bc358b796d9c33d7c0d55aa95c2874fc8dbe692e6bfa6d";
sha256 = "2aad414843aee0f54427f887f7536cc5155d6852728d44dfeef633ac52135fdc";
};
propagatedBuildInputs = [
@@ -25,6 +25,8 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.compute" ];
meta = with lib; {
description = "This is the Microsoft Azure Compute Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datamigration";
version = "9.0.0";
version = "10.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "70373dbeb35a7768a47341bb3b570c559197bc1ba36fc8f8bf15139e4c8bad70";
sha256 = "5cee70f97fe3a093c3cb70c2a190c2df936b772e94a09ef7e3deb1ed177c9f32";
};
propagatedBuildInputs = [
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-iothub";
version = "2.0.0";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b";
sha256 = "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f";
};
propagatedBuildInputs = [
@@ -1,8 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
, isPy3k
, msrest
, msrestazure
, azure-common
@@ -12,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-loganalytics";
version = "10.0.0";
version = "11.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "29330984d0f084dff26cea239d7b733c1a26844da85d33bf3bb53b515ce0bc23";
sha256 = "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d";
};
propagatedBuildInputs = [
@@ -33,6 +31,8 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.loganalytics" ];
meta = with lib; {
description = "This is the Microsoft Azure Log Analytics Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-media";
version = "7.0.0";
version = "8.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "b45e82a594ed91cd5aa7a5cd5d01f038b7ac3cf12233e7ba2beaaa3477900e8e";
sha256 = "c08e687c0afa061a3e05acaf29ce81e737480d592b07e0de5f77e9a7f9f00c00";
};
propagatedBuildInputs = [
@@ -31,6 +31,8 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.media" ];
meta = with lib; {
description = "This is the Microsoft Azure Media Services Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-recoveryservicesbackup";
version = "1.0.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "fd915aa6a76ef9e0e963615d4c909400c8d5646e26273ae25fa1418ce61e28d2";
sha256 = "d3e60daefbc20a7fa381c7ad1498f4bf4bb5a1414c1c64188cc9d5c98c4e12ac";
};
propagatedBuildInputs = [
@@ -29,6 +29,8 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.recoveryservicesbackup" ];
meta = with lib; {
description = "This is the Microsoft Azure Recovery Services Backup Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
@@ -8,14 +8,14 @@
buildPythonPackage rec {
version = "18.0.0";
version = "19.0.0";
pname = "azure-mgmt-resource";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c";
sha256 = "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100";
};
propagatedBuildInputs = [
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-sql";
version = "3.0.0";
version = "3.0.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "e2fe427ed8f6e368de7176696b38910a16b307dd9c2e1d2144d643a1c0f38e21";
sha256 = "129042cc011225e27aee6ef2697d585fa5722e5d1aeb0038af6ad2451a285457";
};
propagatedBuildInputs = [
@@ -31,6 +31,8 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.sql" ];
meta = with lib; {
description = "This is the Microsoft Azure SQL Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "azure-synapse-accesscontrol";
version = "0.6.0";
version = "0.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "2f8f71561ca30ff3b04b172f5a64b231baeb02f4bce4bd6763df93a178c8b5d7";
sha256 = "565aa26336d560c028775e8ae50d0691aa7089e96170e78342371b773da3137c";
extension = "zip";
};
@@ -20,6 +20,9 @@ buildPythonPackage rec {
msrest
];
# zero tests run
doCheck = false;
pythonImportsCheck = [ "azure.synapse.accesscontrol" ];
meta = with lib; {
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "azure-synapse-spark";
version = "0.5.0";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "2b037024dc7c034f47aac551cc918f78590a1e1ae30cd2370c8a14da15994970";
sha256 = "ac7564a61ba314e0a9406c0f73c3cede04091a131a0c58971bcba0c158b7455d";
extension = "zip";
};
@@ -2,18 +2,24 @@
buildPythonPackage rec {
pname = "babelfish";
version = "0.5.5";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104";
sha256 = "2dadfadd1b205ca5fa5dc9fa637f5b7933160a0418684c7c46a7a664033208a2";
};
propagatedBuildInputs = [ setuptools ];
# no tests executed
doCheck = false;
pythonImportsCheck = [ "babelfish" ];
meta = with lib; {
homepage = "https://pypi.python.org/pypi/babelfish";
description = "A module to work with countries and languages";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "bleach";
version = "4.0.0";
version = "4.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-/6kiHGrCk5nMUPzDNHM2bt0M+NXiy7u2MpbcMn+2fMg=";
sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";
};
propagatedBuildInputs = [
@@ -1,21 +1,19 @@
{ lib, fetchPypi, buildPythonPackage
, click, pytest
, click, pytestCheckHook
}:
buildPythonPackage rec {
pname = "click-help-colors";
version = "0.9";
version = "0.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "eb037a2dd95a9e20b3897c2b3ca57e7f6797f76a8d93f7eeedda7fcdcbc9b635";
sha256 = "78cbcf30cfa81c5fc2a52f49220121e1a8190cd19197d9245997605d3405824d";
};
propagatedBuildInputs = [ click ];
# tries to use /homeless-shelter to mimic container usage, etc
#doCheck = false;
checkInputs = [ pytest ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "click_help_colors" ];
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, sqlalchemy
, aiocontextvars
, isPy27
@@ -14,28 +13,16 @@
buildPythonPackage rec {
pname = "databases";
version = "0.4.3";
version = "0.5.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
sha256 = "0aq88k7d9036cy6qvlfv9p2dxd6p6fic3j0az43gn6k1ardhdsgf";
sha256 = "sha256-HNSPLmZTXZL1e5E9VJiXnQuO2WiXLYOveNTlFqdlTG8=";
};
patches = [
# sqlalchemy 1.4 compat, https://github.com/encode/databases/pull/299
(fetchpatch {
url = "https://github.com/encode/databases/commit/9d6e0c024833bd41421f0798a94ef2bbf27a31d5.patch";
sha256 = "0wz9dz6g88ifvvwlhy249cjvqpx72x99wklzcl7b23srpcvb5gv1";
})
(fetchpatch {
url = "https://github.com/encode/databases/commit/40c41c2b7b3fedae484ad94d81b27ce88a09c5ed.patch";
sha256 = "0z458l3vkg4faxbnf31lszfby5d10fa9kgxxy4xxcm0py6d8a2pi";
})
];
propagatedBuildInputs = [
aiocontextvars
sqlalchemy
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
version = "8.1.10";
version = "8.1.11";
src = fetchPypi {
inherit pname version;
sha256 = "831ba3d50552c4b7821670ad01b73406aef5092498b29d3ddb24a5063bbcf0b5";
sha256 = "cd9d1b27edd9345a2a32b365a511f8457c5c1a8f107546fe1ef9063dd15aac00";
};
sourceRoot = ".";
@@ -1,13 +1,17 @@
{ lib, buildPythonPackage, fetchPypi
, chardet, six}:
{ lib
, buildPythonPackage
, fetchPypi
, chardet
, six
}:
buildPythonPackage rec {
pname = "python-debian";
version = "0.1.39";
version = "0.1.40";
src = fetchPypi {
inherit pname version;
sha256 = "6cca96239b5981f5203216d2113fea522477628607ed0a8427e15094a792541c";
sha256 = "385dfb965eca75164d256486c7cf9bae772d24144249fd18b9d15d3cffb70eea";
};
propagatedBuildInputs = [ chardet six ];
@@ -15,8 +19,11 @@ buildPythonPackage rec {
# No tests in archive
doCheck = false;
meta = {
pythonImportsCheck = [ "debian" ];
meta = with lib; {
description = "Debian package related modules";
license = lib.licenses.gpl2;
license = licenses.gpl2;
maintainers = with maintainers; [ ];
};
}
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "dockerspawner";
version = "0.11.1";
version = "12.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "83fd8ee012bb32432cb57bd408ff65534749aed8696648e6ac029a87fc474928";
sha256 = "3894ed8a9157f8ac8f42e0130f43932490ac5d1e89e6f295b1252f08c00ba36b";
};
propagatedBuildInputs = [
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "flexmock";
version = "0.10.4";
version = "0.10.5";
src = fetchPypi {
inherit pname version;
sha256 = "0b6qw3grhgx58kxlkj7mdma7xdvlj02zabvcf7w2qifnfjwwwcsh";
sha256 = "003422fdbcf5d6570e60a0eafeb54c0af624c6cddab5fc3bfe026e52dd0f9c5a";
};
checkInputs = [ pytest ];
@@ -18,6 +18,6 @@ buildPythonPackage rec {
homepage = "https://pypi.org/project/fs-s3fs/";
license = licenses.mit;
description = "Amazon S3 filesystem for PyFilesystem2";
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "hmmlearn";
version = "0.2.5";
version = "0.2.6";
src = fetchurl {
url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01";
sha256 = "2a289cf28b31be59fa8ba5d3253d4a2a992401d45a8cdc221ae484fbf390c0d7";
};
buildInputs = [ setuptools-scm cython ];
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "itemadapter";
version = "0.3.0";
version = "0.4.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "ab2651ba20f5f6d0e15f041deba4c13ffc59270def2bd01518d13e94c4cd27d1";
sha256 = "f05df8da52619da4b8c7f155d8a15af19083c0c7ad941d8c1de799560ad994ca";
};
doCheck = false; # infinite recursion with Scrapy
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "junos-eznc";
version = "2.6.1";
version = "2.6.2";
src = fetchPypi {
inherit pname version;
sha256 = "2f5de7dedaac8dd71bfea23c6a7d883e29947c91de1ba299a9242e0a4406ee46";
sha256 = "878c479c933346cc8cc60b6d145973568ac23e7c453e193cf55625e7921a9b62";
};
postPatch = ''
@@ -40,6 +40,8 @@ buildPythonPackage rec {
nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit
'';
pythonImportsCheck = [ "jnpr.junos" ];
meta = with lib; {
homepage = "http://www.github.com/Juniper/py-junos-eznc";
description = "Junos 'EZ' automation for non-programmers";
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "jupyterlab";
version = "3.0.16";
version = "3.1.6";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "7ad4fbe1f6d38255869410fd151a8b15692a663ca97c0a8146b3f5c40e275c23";
sha256 = "6d2ada6a333861f33a1b555d3cb7b07aa9d1ab80f07997b3d0c43878a98c1174";
};
nativeBuildInputs = [ jupyter-packaging ];
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "jupyterlab_server";
version = "2.6.0";
version = "2.7.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "f300adf6bb0a952bebe9c807a3b2a345d62da39b476b4f69ea0dc6b5f3f6b97d";
sha256 = "31457ef564febc42043bc539356c804f6f9144f602e2852150bf0820ed6d7e18";
};
postPatch = ''
@@ -2,24 +2,25 @@
, buildPythonPackage
, fetchPypi
, isPy27
, pkgs
, git
}:
buildPythonPackage rec {
pname = "limnoria";
version = "2021.06.15";
version = "2021.07.21";
disabled = isPy27; # abandoned upstream
src = fetchPypi {
inherit pname version;
sha256 = "47290281f3f945261a7f8d8c6f207dcb1d277b241f58827d5a76ab8cd453a1d0";
sha256 = "80ca1db9648e7678f81b373dab04d06025ec6532e68a9be773ddbd159de54e4c";
};
patchPhase = ''
postPatch = ''
sed -i 's/version=version/version="${version}"/' setup.py
'';
buildInputs = [ pkgs.git ];
buildInputs = [ git ];
# cannot be imported
doCheck = false;
meta = with lib; {
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.10.4";
version = "0.10.5";
src = fetchPypi {
inherit pname version;
sha256 = "ffbc4e29eb56089539b408f8e4c12a5d5a5d11d7fe7d40f8c6279784c618b869";
sha256 = "b7d52d72a9739963b6d39d5e58ef367c00490a90cf7795f23c8b2e2c140c8882";
};
propagatedBuildInputs = [
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msal";
version = "1.13.0";
version = "1.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "1ab72dbb623fb8663e8fdefc052b1f9d4ae0951ea872f5f488dad58f3618c89d";
sha256 = "0d389ef5db19ca8a30ae88fe05ba633a4623d3202d90f8dfcc81973dc28ee834";
};
propagatedBuildInputs = [
@@ -15,6 +15,6 @@ buildPythonPackage rec {
homepage = "https://pypi.org/project/nose-cov/";
license = licenses.mit;
description = "This plugin produces coverage reports. It also supports coverage of subprocesses.";
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "Parameterized testing with any Python test framework";
homepage = "https://github.com/wolever/parameterized";
license = licenses.bsd2;
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}
@@ -24,6 +24,6 @@ buildPythonPackage rec {
description = "Fast Base64 encoding/decoding";
homepage = "https://github.com/mayeut/pybase64";
license = licenses.bsd2;
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "ring-doorbell";
version = "0.7.0";
version = "0.7.1";
disabled = !isPy3k;
src = fetchPypi {
pname = "ring_doorbell";
inherit version;
sha256 = "1qnx9q9rzxhh0pygl3f9bg21b5zv7csv9h1w4zngdvsphbs0yiwg";
sha256 = "sha256-xE3TqXdhiUf9Tzmzc48D65Y5t1ekauacsTwwSG1urz4=";
};
propagatedBuildInputs = [
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "scikit-hep-testdata";
version = "0.4.6";
version = "0.4.7";
format = "pyproject";
# fetch from github as we want the data files
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "scikit-hep";
repo = pname;
rev = "v${version}";
sha256 = "16y84nrs8zn0vnarrniqjwq1sp6yrs0mx7ma0rdvzjafasiak9vm";
sha256 = "0bydqgl7pxmj7nb952p08q64d15d8hbvfdnzkbx9wr71mw7cf3vm";
};
nativeBuildInputs = [
@@ -17,6 +17,6 @@ buildPythonPackage rec {
description = "The official Todoist Python API library";
homepage = "https://todoist-python.readthedocs.io/en/latest/";
license = licenses.mit;
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}
@@ -49,19 +49,19 @@ let
};
in buildPythonPackage rec {
pname = "tokenizers";
version = "0.10.3";
version = "unstable-2021-08-13";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
hash = "sha256-X7aUiJJjB2ZDlE8LbK7Pn/15SLTZbP8kb4l9ED7/xvU=";
rev = "e7dd6436dd4a4ffd9e8a4f110ca68e6a38677cb6";
sha256 = "1p7w9a43a9h6ys5nsa4g89l65dj11037p7a1lqkj4x1yc9kv2y1r";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src sourceRoot;
name = "${pname}-${version}";
hash = "sha256-gRqxlL6q87sGC0birDhCmGF+CVbfxwOxW6Tl6+5mGoo=";
sha256 = "1yb4jsx6mp9jgd1g3mli6vr6mri2afnwqlmxq1rpvn34z6b3iw9q";
};
sourceRoot = "source/bindings/python";
@@ -97,6 +97,10 @@ in buildPythonPackage rec {
ln -s ${openaiMerges} openai-gpt-merges.txt )
'';
postPatch = ''
echo 'import multiprocessing; multiprocessing.set_start_method("fork")' >> tests/__init__.py
'';
preCheck = ''
HOME=$TMPDIR
'';
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "wurlitzer";
version = "2.1.1";
version = "3.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "5a3ea5a13a8aac2d808864087fec87a0518bf7d9776173ab06a6bb4ade9f4d27";
sha256 = "36051ac530ddb461a86b6227c4b09d95f30a1d1043de2b4a592e97ae8a84fcdf";
};
propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ];

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