Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
c4bf3689ee
|
|
@ -687,6 +687,12 @@
|
|||
github = "an-empty-string";
|
||||
githubId = 681716;
|
||||
};
|
||||
AnatolyPopov = {
|
||||
email = "aipopov@live.ru";
|
||||
github = "AnatolyPopov";
|
||||
githubId = 2312534;
|
||||
name = "Anatolii Popov";
|
||||
};
|
||||
andehen = {
|
||||
email = "git@andehen.net";
|
||||
github = "andehen";
|
||||
|
|
|
|||
|
|
@ -342,6 +342,7 @@ in {
|
|||
"/etc/fstab".source = fstab;
|
||||
|
||||
"/lib/modules".source = "${modulesClosure}/lib/modules";
|
||||
"/lib/firmware".source = "${modulesClosure}/lib/firmware";
|
||||
|
||||
"/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,31 @@
|
|||
# This test runs gitlab and checks if it works
|
||||
# This test runs gitlab and performs the following tests:
|
||||
# - Creating users
|
||||
# - Pushing commits
|
||||
# - over the API
|
||||
# - over SSH
|
||||
# - Creating Merge Requests and merging them
|
||||
# - Opening and closing issues.
|
||||
# - Downloading repository archives as tar.gz and tar.bz2
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
|
||||
initialRootPassword = "notproduction";
|
||||
in
|
||||
import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
|
||||
rootProjectId = "2";
|
||||
|
||||
aliceUsername = "alice";
|
||||
aliceUserId = "2";
|
||||
alicePassword = "alicepassword";
|
||||
aliceProjectId = "2";
|
||||
aliceProjectName = "test-alice";
|
||||
|
||||
bobUsername = "bob";
|
||||
bobUserId = "3";
|
||||
bobPassword = "bobpassword";
|
||||
bobProjectId = "3";
|
||||
in {
|
||||
name = "gitlab";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ globin yayayayaka ];
|
||||
|
|
@ -31,6 +53,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
|
|||
};
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
||||
services.dovecot2 = {
|
||||
enable = true;
|
||||
enableImap = true;
|
||||
|
|
@ -77,8 +101,43 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
|
|||
password = initialRootPassword;
|
||||
});
|
||||
|
||||
createProject = pkgs.writeText "create-project.json" (builtins.toJSON {
|
||||
name = "test";
|
||||
createUserAlice = pkgs.writeText "create-user-alice.json" (builtins.toJSON rec {
|
||||
username = aliceUsername;
|
||||
name = username;
|
||||
email = "alice@localhost";
|
||||
password = alicePassword;
|
||||
skip_confirmation = true;
|
||||
});
|
||||
|
||||
createUserBob = pkgs.writeText "create-user-bob.json" (builtins.toJSON rec {
|
||||
username = bobUsername;
|
||||
name = username;
|
||||
email = "bob@localhost";
|
||||
password = bobPassword;
|
||||
skip_confirmation = true;
|
||||
});
|
||||
|
||||
aliceAuth = pkgs.writeText "alice-auth.json" (builtins.toJSON {
|
||||
grant_type = "password";
|
||||
username = aliceUsername;
|
||||
password = alicePassword;
|
||||
});
|
||||
|
||||
bobAuth = pkgs.writeText "bob-auth.json" (builtins.toJSON {
|
||||
grant_type = "password";
|
||||
username = bobUsername;
|
||||
password = bobPassword;
|
||||
});
|
||||
|
||||
aliceAddSSHKey = pkgs.writeText "alice-add-ssh-key.json" (builtins.toJSON {
|
||||
id = aliceUserId;
|
||||
title = "snakeoil@nixos";
|
||||
key = snakeOilPublicKey;
|
||||
});
|
||||
|
||||
createProjectAlice = pkgs.writeText "create-project-alice.json" (builtins.toJSON {
|
||||
name = aliceProjectName;
|
||||
visibility = "public";
|
||||
});
|
||||
|
||||
putFile = pkgs.writeText "put-file.json" (builtins.toJSON {
|
||||
|
|
@ -89,6 +148,23 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
|
|||
commit_message = "create a new file";
|
||||
});
|
||||
|
||||
mergeRequest = pkgs.writeText "merge-request.json" (builtins.toJSON {
|
||||
id = bobProjectId;
|
||||
target_project_id = aliceProjectId;
|
||||
source_branch = "master";
|
||||
target_branch = "master";
|
||||
title = "Add some other file";
|
||||
});
|
||||
|
||||
newIssue = pkgs.writeText "new-issue.json" (builtins.toJSON {
|
||||
title = "useful issue title";
|
||||
});
|
||||
|
||||
closeIssue = pkgs.writeText "close-issue.json" (builtins.toJSON {
|
||||
issue_iid = 1;
|
||||
state_event = "close";
|
||||
});
|
||||
|
||||
# Wait for all GitLab services to be fully started.
|
||||
waitForServices = ''
|
||||
gitlab.wait_for_unit("gitaly.service")
|
||||
|
|
@ -105,6 +181,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
|
|||
# The actual test of GitLab. Only push data to GitLab if
|
||||
# `doSetup` is is true.
|
||||
test = doSetup: ''
|
||||
GIT_SSH_COMMAND = "ssh -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=/dev/null"
|
||||
|
||||
gitlab.succeed(
|
||||
"curl -isSf http://gitlab | grep -i location | grep http://gitlab/users/sign_in"
|
||||
)
|
||||
|
|
@ -115,27 +193,222 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
|
|||
"echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers"
|
||||
)
|
||||
'' + optionalString doSetup ''
|
||||
gitlab.succeed(
|
||||
"""[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects)" = "201" ]"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"""[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/2/repository/files/some-file.txt)" = "201" ]"""
|
||||
)
|
||||
with subtest("Create user Alice"):
|
||||
gitlab.succeed(
|
||||
"""[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createUserAlice} http://gitlab/api/v4/users)" = "201" ]"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${aliceAuth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers-alice"
|
||||
)
|
||||
|
||||
with subtest("Create user Bob"):
|
||||
gitlab.succeed(
|
||||
""" [ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createUserBob} http://gitlab/api/v4/users)" = "201" ]"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${bobAuth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers-bob"
|
||||
)
|
||||
|
||||
with subtest("Setup Git and SSH for Alice"):
|
||||
gitlab.succeed("git config --global user.name Alice")
|
||||
gitlab.succeed("git config --global user.email alice@nixos.invalid")
|
||||
gitlab.succeed("mkdir -m 700 /root/.ssh")
|
||||
gitlab.succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa")
|
||||
gitlab.succeed("chmod 600 /root/.ssh/id_ecdsa")
|
||||
gitlab.succeed(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-X POST \
|
||||
-H 'Content-Type: application/json' \
|
||||
-H @/tmp/headers-alice -d @${aliceAddSSHKey} \
|
||||
http://gitlab/api/v4/user/keys)" = "201" ]
|
||||
"""
|
||||
)
|
||||
|
||||
with subtest("Create a new repository"):
|
||||
# Alice creates a new repository
|
||||
gitlab.succeed(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-X POST \
|
||||
-H 'Content-Type: application/json' \
|
||||
-H @/tmp/headers-alice \
|
||||
-d @${createProjectAlice} \
|
||||
http://gitlab/api/v4/projects)" = "201" ]
|
||||
"""
|
||||
)
|
||||
|
||||
# Alice commits an initial commit
|
||||
gitlab.succeed(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-X POST \
|
||||
-H 'Content-Type: application/json' \
|
||||
-H @/tmp/headers-alice \
|
||||
-d @${putFile} \
|
||||
http://gitlab/api/v4/projects/${aliceProjectId}/repository/files/some-file.txt)" = "201" ]"""
|
||||
)
|
||||
|
||||
with subtest("git clone over HTTP"):
|
||||
gitlab.succeed(
|
||||
"""git clone http://gitlab/alice/${aliceProjectName}.git clone-via-http""",
|
||||
timeout=15
|
||||
)
|
||||
|
||||
with subtest("Push a commit via SSH"):
|
||||
gitlab.succeed(
|
||||
f"""GIT_SSH_COMMAND="{GIT_SSH_COMMAND}" git clone gitlab@gitlab:alice/${aliceProjectName}.git""",
|
||||
timeout=15
|
||||
)
|
||||
gitlab.succeed(
|
||||
"""echo "a commit sent over ssh" > ${aliceProjectName}/ssh.txt"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"""
|
||||
cd ${aliceProjectName} || exit 1
|
||||
git add .
|
||||
"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"""
|
||||
cd ${aliceProjectName} || exit 1
|
||||
git commit -m "Add a commit to be sent over ssh"
|
||||
"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
f"""
|
||||
cd ${aliceProjectName} || exit 1
|
||||
GIT_SSH_COMMAND="{GIT_SSH_COMMAND}" git push --set-upstream origin master
|
||||
""",
|
||||
timeout=15
|
||||
)
|
||||
|
||||
with subtest("Fork a project"):
|
||||
# Bob forks Alice's project
|
||||
gitlab.succeed(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-X POST \
|
||||
-H 'Content-Type: application/json' \
|
||||
-H @/tmp/headers-bob \
|
||||
http://gitlab/api/v4/projects/${aliceProjectId}/fork)" = "201" ]
|
||||
"""
|
||||
)
|
||||
|
||||
# Bob creates a commit
|
||||
gitlab.wait_until_succeeds(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-X POST \
|
||||
-H 'Content-Type: application/json' \
|
||||
-H @/tmp/headers-bob \
|
||||
-d @${putFile} \
|
||||
http://gitlab/api/v4/projects/${bobProjectId}/repository/files/some-other-file.txt)" = "201" ]
|
||||
"""
|
||||
)
|
||||
|
||||
with subtest("Create a Merge Request"):
|
||||
# Bob opens a merge request against Alice's repository
|
||||
gitlab.wait_until_succeeds(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-X POST \
|
||||
-H 'Content-Type: application/json' \
|
||||
-H @/tmp/headers-bob \
|
||||
-d @${mergeRequest} \
|
||||
http://gitlab/api/v4/projects/${bobProjectId}/merge_requests)" = "201" ]
|
||||
"""
|
||||
)
|
||||
|
||||
# Alice merges the MR
|
||||
gitlab.wait_until_succeeds(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-X PUT \
|
||||
-H 'Content-Type: application/json' \
|
||||
-H @/tmp/headers-alice \
|
||||
-d @${mergeRequest} \
|
||||
http://gitlab/api/v4/projects/${aliceProjectId}/merge_requests/1/merge)" = "200" ]
|
||||
"""
|
||||
)
|
||||
|
||||
with subtest("Create an Issue"):
|
||||
# Bob opens an issue on Alice's repository
|
||||
gitlab.succeed(
|
||||
"""[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-X POST \
|
||||
-H 'Content-Type: application/json' \
|
||||
-H @/tmp/headers-bob \
|
||||
-d @${newIssue} \
|
||||
http://gitlab/api/v4/projects/${aliceProjectId}/issues)" = "201" ]
|
||||
"""
|
||||
)
|
||||
|
||||
# Alice closes the issue
|
||||
gitlab.wait_until_succeeds(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-X PUT \
|
||||
-H 'Content-Type: application/json' \
|
||||
-H @/tmp/headers-alice -d @${closeIssue} http://gitlab/api/v4/projects/${aliceProjectId}/issues/1)" = "200" ]
|
||||
"""
|
||||
)
|
||||
'' + ''
|
||||
gitlab.succeed(
|
||||
"""[ "$(curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.gz)" = "200" ]"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"""curl -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.gz > /tmp/archive.tar.gz"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"""[ "$(curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.bz2)" = "200" ]"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"""curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.bz2 > /tmp/archive.tar.bz2"""
|
||||
)
|
||||
gitlab.succeed("test -s /tmp/archive.tar.gz")
|
||||
gitlab.succeed("test -s /tmp/archive.tar.bz2")
|
||||
with subtest("Download archive.tar.gz"):
|
||||
gitlab.succeed(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-H @/tmp/headers-alice \
|
||||
http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.gz)" = "200" ]
|
||||
"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"""
|
||||
curl \
|
||||
-H @/tmp/headers-alice \
|
||||
http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.gz > /tmp/archive.tar.gz
|
||||
"""
|
||||
)
|
||||
gitlab.succeed("test -s /tmp/archive.tar.gz")
|
||||
|
||||
with subtest("Download archive.tar.bz2"):
|
||||
gitlab.succeed(
|
||||
"""
|
||||
[ "$(curl \
|
||||
-o /dev/null \
|
||||
-w '%{http_code}' \
|
||||
-H @/tmp/headers-alice \
|
||||
http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.bz2)" = "200" ]
|
||||
"""
|
||||
)
|
||||
gitlab.succeed(
|
||||
"""
|
||||
curl \
|
||||
-H @/tmp/headers-alice \
|
||||
http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.bz2 > /tmp/archive.tar.bz2
|
||||
"""
|
||||
)
|
||||
gitlab.succeed("test -s /tmp/archive.tar.bz2")
|
||||
'';
|
||||
|
||||
in ''
|
||||
|
|
|
|||
|
|
@ -6,16 +6,47 @@ let
|
|||
#
|
||||
# I've chosen to import Alpine Linux, because its image is turbo-tiny and,
|
||||
# generally, sufficient for our tests.
|
||||
alpine-meta = pkgs.fetchurl {
|
||||
alpine-meta-x86 = pkgs.fetchurl {
|
||||
url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";
|
||||
hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";
|
||||
};
|
||||
alpine-meta-for = arch: pkgs.stdenv.mkDerivation {
|
||||
name = "alpine-meta-${arch}";
|
||||
version = "3.12";
|
||||
unpackPhase = "true";
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
alpine-rootfs = pkgs.fetchurl {
|
||||
url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";
|
||||
hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";
|
||||
tar xvf ${alpine-meta-x86}
|
||||
sed -i 's/architecture: .*/architecture: ${arch}/' metadata.yaml
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
tar czRf $out *
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
alpine-meta = {
|
||||
x86_64-linux = alpine-meta-x86;
|
||||
aarch64-linux = alpine-meta-for "aarch64";
|
||||
}.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");
|
||||
|
||||
alpine-rootfs = {
|
||||
x86_64-linux = pkgs.fetchurl {
|
||||
url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";
|
||||
hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";
|
||||
};
|
||||
aarch64-linux = pkgs.fetchurl {
|
||||
url = "https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/aarch64/alpine-minirootfs-3.15.4-aarch64.tar.gz";
|
||||
hash = "sha256-9kBz8Jwmo8XepJhTMt5zilCaHHpflnUH7y9+0To39Us=";
|
||||
};
|
||||
}.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");
|
||||
|
||||
lxd-config = pkgs.writeText "config.yaml" ''
|
||||
storage_pools:
|
||||
- name: default
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, pkg-config, intltool
|
||||
, glib, dbus, gtk3, libappindicator-gtk3, gst_all_1
|
||||
, librsvg, wrapGAppsHook
|
||||
, pulseaudioSupport ? true, libpulseaudio ? null }:
|
||||
, pulseaudioSupport ? true, libpulseaudio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audio-recorder";
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gSpeech";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mothsart";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc";
|
||||
sha256 = "0z11yxvgi8m2xjmmf56zla91jpmf0a4imwi9qqz6bp51pw4sk8gp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ let
|
|||
with JUnit, TestNG, popular SCMs, Ant & Maven. Also known
|
||||
as IntelliJ.
|
||||
'';
|
||||
maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot ];
|
||||
maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot AnatolyPopov ];
|
||||
platforms = ideaPlatforms;
|
||||
};
|
||||
});
|
||||
|
|
@ -263,7 +263,7 @@ in
|
|||
sha256 = products.clion.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
update-channel = products.clion.update-channel;
|
||||
};
|
||||
|
||||
datagrip = buildDataGrip rec {
|
||||
|
|
@ -276,7 +276,7 @@ in
|
|||
sha256 = products.datagrip.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-datagrip";
|
||||
update-channel = "DataGrip RELEASE";
|
||||
update-channel = products.datagrip.update-channel;
|
||||
};
|
||||
|
||||
goland = buildGoland rec {
|
||||
|
|
@ -289,7 +289,7 @@ in
|
|||
sha256 = products.goland.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-goland";
|
||||
update-channel = "GoLand RELEASE";
|
||||
update-channel = products.goland.update-channel;
|
||||
};
|
||||
|
||||
idea-community = buildIdea rec {
|
||||
|
|
@ -303,7 +303,7 @@ in
|
|||
sha256 = products.idea-community.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-idea-ce";
|
||||
update-channel = "IntelliJ IDEA RELEASE";
|
||||
update-channel = products.idea-community.update-channel;
|
||||
};
|
||||
|
||||
idea-ultimate = buildIdea rec {
|
||||
|
|
@ -317,12 +317,12 @@ in
|
|||
sha256 = products.idea-ultimate.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-idea";
|
||||
update-channel = "IntelliJ IDEA RELEASE";
|
||||
update-channel = products.idea-ultimate.update-channel;
|
||||
};
|
||||
|
||||
mps = buildMps rec {
|
||||
pname = "mps";
|
||||
product = "MPS ${products.mps.version-major-minor}";
|
||||
product = "MPS ${products.mps.version}";
|
||||
version = products.mps.version;
|
||||
description = "Create your own domain-specific language";
|
||||
license = lib.licenses.asl20;
|
||||
|
|
@ -331,7 +331,7 @@ in
|
|||
sha256 = products.mps.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-mps";
|
||||
update-channel = "MPS RELEASE";
|
||||
update-channel = products.mps.update-channel;
|
||||
};
|
||||
|
||||
phpstorm = buildPhpStorm rec {
|
||||
|
|
@ -344,7 +344,7 @@ in
|
|||
sha256 = products.phpstorm.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
update-channel = "PhpStorm RELEASE";
|
||||
update-channel = products.phpstorm.update-channel;
|
||||
};
|
||||
|
||||
pycharm-community = buildPycharm rec {
|
||||
|
|
@ -358,7 +358,7 @@ in
|
|||
sha256 = products.pycharm-community.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-pycharm-ce";
|
||||
update-channel = "PyCharm RELEASE";
|
||||
update-channel = products.pycharm-community.update-channel;
|
||||
};
|
||||
|
||||
pycharm-professional = buildPycharm rec {
|
||||
|
|
@ -372,7 +372,7 @@ in
|
|||
sha256 = products.pycharm-professional.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-pycharm";
|
||||
update-channel = "PyCharm RELEASE";
|
||||
update-channel = products.pycharm-professional.update-channel;
|
||||
};
|
||||
|
||||
rider = buildRider rec {
|
||||
|
|
@ -385,7 +385,7 @@ in
|
|||
sha256 = products.rider.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-rider";
|
||||
update-channel = "Rider RELEASE";
|
||||
update-channel = products.rider.update-channel;
|
||||
};
|
||||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
|
|
@ -398,7 +398,7 @@ in
|
|||
sha256 = products.ruby-mine.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
update-channel = "RubyMine RELEASE";
|
||||
update-channel = products.ruby-mine.update-channel;
|
||||
};
|
||||
|
||||
webstorm = buildWebStorm rec {
|
||||
|
|
@ -411,7 +411,7 @@ in
|
|||
sha256 = products.webstorm.sha256;
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WebStorm RELEASE";
|
||||
update-channel = products.webstorm.update-channel;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests python3.pkgs.xmltodict
|
||||
import hashlib
|
||||
import json
|
||||
import pathlib
|
||||
import logging
|
||||
|
|
@ -33,7 +32,8 @@ def download_channels():
|
|||
|
||||
|
||||
def build_version(build):
|
||||
return version.parse(build["@version"])
|
||||
build_number = build["@fullNumber"] if "@fullNumber" in build else build["@number"]
|
||||
return version.parse(build_number)
|
||||
|
||||
|
||||
def latest_build(channel):
|
||||
|
|
@ -43,11 +43,10 @@ def latest_build(channel):
|
|||
|
||||
|
||||
def download_sha256(url):
|
||||
url = f"{url}.sha256"
|
||||
download_response = requests.get(url)
|
||||
download_response.raise_for_status()
|
||||
h = hashlib.sha256()
|
||||
h.update(download_response.content)
|
||||
return h.hexdigest()
|
||||
return download_response.content.decode('UTF-8').split(' ')[0]
|
||||
|
||||
|
||||
channels = download_channels()
|
||||
|
|
@ -63,18 +62,22 @@ def update_product(name, product):
|
|||
else:
|
||||
try:
|
||||
build = latest_build(channel)
|
||||
version = build["@version"]
|
||||
parsed_version = build_version(build)
|
||||
version_major_minor = f"{parsed_version.major}.{parsed_version.minor}"
|
||||
download_url = product["url-template"].format(version = version, versionMajorMinor = version_major_minor)
|
||||
new_version = build["@version"]
|
||||
new_build_number = build["@fullNumber"]
|
||||
if "EAP" not in channel["@name"]:
|
||||
version_or_build_number = new_version
|
||||
else:
|
||||
version_or_build_number = new_build_number
|
||||
version_number = new_version.split(' ')[0]
|
||||
download_url = product["url-template"].format(version=version_or_build_number, versionMajorMinor=version_number)
|
||||
product["url"] = download_url
|
||||
product["version-major-minor"] = version_major_minor
|
||||
if "sha256" not in product or product.get("version") != version:
|
||||
logging.info("Found a newer version %s.", version)
|
||||
product["version"] = version
|
||||
if "sha256" not in product or product.get("build_number") != new_build_number:
|
||||
logging.info("Found a newer version %s with build number %s.", new_version, new_build_number)
|
||||
product["version"] = new_version
|
||||
product["build_number"] = new_build_number
|
||||
product["sha256"] = download_sha256(download_url)
|
||||
else:
|
||||
logging.info("Already at the latest version %s.", version)
|
||||
logging.info("Already at the latest version %s with build number %s.", new_version, new_build_number)
|
||||
except Exception as e:
|
||||
logging.exception("Update failed:", exc_info=e)
|
||||
logging.warning("Skipping %s due to the above error.", name)
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wavesurfer";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.speech.kth.se/wavesurfer/wavesurfer-${version}.tar.gz";
|
||||
sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ snack tcl tk ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,nix-support,share/wavesurfer/}
|
||||
mv doc $out/share/wavesurfer
|
||||
mv * $out/nix-support
|
||||
ln -s $out/{nix-support,bin}/wavesurfer.tcl
|
||||
wrapProgram "$out/nix-support/wavesurfer.tcl" \
|
||||
--set TCLLIBPATH "${snack}/lib" \
|
||||
--prefix PATH : "${lib.makeBinPath [ tcl tk ]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tool for recording, playing, editing, viewing and labeling of audio";
|
||||
homepage = "https://www.speech.kth.se/wavesurfer/";
|
||||
license = lib.licenses.bsd0;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,29 @@
|
|||
{ alsa-lib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups
|
||||
, dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib
|
||||
, libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper
|
||||
, nspr, nss, pango, squashfsTools, stdenv, systemd, xorg
|
||||
{ alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, atk
|
||||
, autoPatchelfHook
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, electron_9
|
||||
, expat
|
||||
, fetchurl
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, lib
|
||||
, libappindicator-gtk3
|
||||
, libdbusmenu-gtk3
|
||||
, libuuid
|
||||
, makeWrapper
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
, squashfsTools
|
||||
, stdenv
|
||||
, systemd
|
||||
, xorg
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -11,8 +33,9 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "authy";
|
||||
version = "1.9.0";
|
||||
rev = "7";
|
||||
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version'
|
||||
version = "2.1.0";
|
||||
rev = "9";
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
|
@ -50,7 +73,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
|
||||
sha256 = "10az47cc3lgsdi0ixmmna08nqf9xm7gsl1ph00wfwrxzsi05ygx3";
|
||||
sha256 = "sha256-RxjxOYrbneVctyTJTMvoN/UdREohaZWb1kTdEeI6mUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "2.7.13";
|
||||
version = "2.7.15";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -16,8 +16,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-ObuBcFV5fq2sryC+ETTAH+S19EW+nVlxdVOtOpiBeDs=";
|
||||
x86_64-darwin = "sha256-f0+/kUukP+zIzTSSGO1ctUBd/uCSrAKz+uBnrzpPy5k=";
|
||||
x86_64-linux = "sha256-PtfDH2W8wolqa10BoI9hazcj+1bszlnpt+D+sbzSRts=";
|
||||
x86_64-darwin = "sha256-CPD/2x5FxHL9CsYz9EZJX5SYiFGz7/fjntOlDMKHYEA=";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,20 +2,19 @@
|
|||
|
||||
let
|
||||
pname = "marktext";
|
||||
version = "v0.17.1";
|
||||
name = "${pname}-${version}-binary";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage";
|
||||
url = "https://github.com/marktext/marktext/releases/download/v${version}/marktext-x86_64.AppImage";
|
||||
sha256 = "2e2555113e37df830ba3958efcccce7020907b12fd4162368cfd906aeda630b7";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
inherit pname version src;
|
||||
};
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
inherit name src;
|
||||
inherit pname version src;
|
||||
|
||||
profile = ''
|
||||
export LC_ALL=C.UTF-8
|
||||
|
|
@ -35,7 +34,7 @@ appimageTools.wrapType2 rec {
|
|||
|
||||
extraInstallCommands = ''
|
||||
# Strip version from binary name.
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
|
||||
install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop
|
||||
substituteInPlace $out/share/applications/marktext.desktop \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prusa-slicer";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "PrusaSlicer";
|
||||
sha256 = "sha256-4L/x8cMQee3n20iyWEiXd62NtA6BYM1SHkCn8ZlDNWA=";
|
||||
sha256 = "17p56f0zmiryy8k4da02in1l6yxniz286gf9yz8s1gaz5ksqj4af";
|
||||
rev = "version_${version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
, channel ? "stable"
|
||||
|
||||
# Necessary for USB audio devices.
|
||||
, pulseSupport ? true, libpulseaudio ? null
|
||||
, pulseSupport ? true, libpulseaudio
|
||||
|
||||
# Only needed for getting information about upstream binaries
|
||||
, chromium
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "kubecfg";
|
||||
version = "0.22.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitnami";
|
||||
owner = "kubecfg";
|
||||
repo = "kubecfg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8U/A4F4DboS46ftpuk5fQGT2Y0V+X0y0L3/o4x8qpnY=";
|
||||
sha256 = "sha256-ekojX7gl8wC7GlHG3Y+dwry7jxjIm5dbS7cNN1xu4kY=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/bitnami/kubecfg";
|
||||
vendorSha256 = "sha256-dPdF3qTrYRbKUepgo6WVIVyGnaWxhQ0371fzXlBD8rE=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ buildGoPackage rec {
|
|||
|
||||
meta = {
|
||||
description = "A tool for managing Kubernetes resources as code";
|
||||
homepage = "https://github.com/bitnami/kubecfg";
|
||||
homepage = "https://github.com/kubecfg/kubecfg";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ benley ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocketchat-desktop";
|
||||
version = "3.7.8";
|
||||
version = "3.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";
|
||||
sha256 = "sha256-61HSJIFir+ikwui7KtPm2BDstIRWY/WruGX3WSfY5ZI=";
|
||||
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
|
||||
sha256 = "sha256-nKEfdbHfLjM4w79hzQdKiC4+IT3WXdDdlXkzelCKqOw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
let
|
||||
pname = "zulip";
|
||||
version = "5.9.2";
|
||||
version = "5.9.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
|
||||
hash = "sha256-PJ7/KOtfjH1RHMzAKSr9Y/82Z0vL2wBy3GgI/0JrlpM=";
|
||||
hash = "sha256-Hws9vENGzCLQqav4uXtbbI0iNoS3JozC5m2DG38+3Fk=";
|
||||
name="${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -23,14 +23,13 @@
|
|||
, Foundation
|
||||
, libiconv
|
||||
, nixosTests
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "20220408-101518-b908e2dd";
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
|
|
@ -75,10 +74,8 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
|
||||
postInstall = ''
|
||||
# terminfo
|
||||
mkdir -p $terminfo/share/terminfo/w $out/nix-support
|
||||
tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo
|
||||
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
|
||||
mkdir -p $out/nix-support
|
||||
echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages
|
||||
|
||||
# desktop icon
|
||||
install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
|
||||
|
|
@ -100,9 +97,20 @@ rustPlatform.buildRustPackage rec {
|
|||
ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
all-terminfo = nixosTests.allTerminfo;
|
||||
test = nixosTests.terminal-emulators.wezterm;
|
||||
passthru = {
|
||||
tests = {
|
||||
all-terminfo = nixosTests.allTerminfo;
|
||||
terminal-emulators = nixosTests.terminal-emulators.wezterm;
|
||||
};
|
||||
terminfo = runCommand "wezterm-terminfo"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
ncurses
|
||||
];
|
||||
} ''
|
||||
mkdir -p $out/share/terminfo $out/nix-support
|
||||
tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "14.9.3",
|
||||
"repo_hash": "04a5z9dr8qs1vrgrdlw5sx5wjwjgqzgj7rqxy4lswycxglc8i1ad",
|
||||
"yarn_hash": "1mya6y0cb9x8491gpf7f1i7qi2rb0l7d9g5yzj44vvy3mb4rcqaj",
|
||||
"version": "14.10.0",
|
||||
"repo_hash": "0j4dx32d4i8b44zfmqshkc19g3g9a2c2rg1r8mifjv67p7hvacnx",
|
||||
"yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.9.3-ee",
|
||||
"rev": "v14.10.0-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.9.3",
|
||||
"GITALY_SERVER_VERSION": "14.10.0",
|
||||
"GITLAB_PAGES_VERSION": "1.56.1",
|
||||
"GITLAB_SHELL_VERSION": "13.24.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.9.3"
|
||||
"GITLAB_SHELL_VERSION": "13.25.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.10.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ source 'https://rubygems.org'
|
|||
gem 'rugged', '~> 1.2'
|
||||
gem 'github-linguist', '~> 7.12', require: 'linguist'
|
||||
gem 'gitlab-markup', '~> 1.7.1'
|
||||
gem 'activesupport', '~> 6.1.4.6'
|
||||
gem 'activesupport', '~> 6.1.4.7'
|
||||
gem 'rdoc', '~> 6.0'
|
||||
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false
|
||||
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
abstract_type (0.0.7)
|
||||
actionpack (6.1.4.6)
|
||||
actionview (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
actionpack (6.1.4.7)
|
||||
actionview (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
rack (~> 2.0, >= 2.0.9)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actionview (6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
actionview (6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||
activesupport (6.1.4.6)
|
||||
activesupport (6.1.4.7)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
|
|
@ -34,7 +34,7 @@ GEM
|
|||
concord (0.1.5)
|
||||
adamantium (~> 0.2.0)
|
||||
equalizer (~> 0.0.9)
|
||||
concurrent-ruby (1.1.9)
|
||||
concurrent-ruby (1.1.10)
|
||||
crass (1.0.6)
|
||||
diff-lcs (1.3)
|
||||
dotenv (2.7.6)
|
||||
|
|
@ -88,7 +88,7 @@ GEM
|
|||
google-protobuf (~> 3.18)
|
||||
googleapis-common-protos-types (~> 1.0)
|
||||
grpc-tools (1.42.0)
|
||||
i18n (1.9.1)
|
||||
i18n (1.10.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
ice_nine (0.11.2)
|
||||
jaeger-client (1.1.0)
|
||||
|
|
@ -101,7 +101,7 @@ GEM
|
|||
reverse_markdown (~> 1.0)
|
||||
rugged (>= 0.24, < 2.0)
|
||||
thor (>= 0.19, < 2.0)
|
||||
loofah (2.14.0)
|
||||
loofah (2.16.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
memoizable (0.4.2)
|
||||
|
|
@ -111,12 +111,12 @@ GEM
|
|||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2020.1104)
|
||||
mini_mime (1.0.2)
|
||||
mini_portile2 (2.6.1)
|
||||
mini_portile2 (2.8.0)
|
||||
minitest (5.15.0)
|
||||
msgpack (1.3.3)
|
||||
multipart-post (2.1.1)
|
||||
nokogiri (1.12.5)
|
||||
mini_portile2 (~> 2.6.1)
|
||||
nokogiri (1.13.3)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
octokit (4.20.0)
|
||||
faraday (>= 0.9)
|
||||
|
|
@ -225,7 +225,7 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
activesupport (~> 6.1.4.6)
|
||||
activesupport (~> 6.1.4.7)
|
||||
factory_bot
|
||||
faraday (~> 1.0)
|
||||
github-linguist (~> 7.12)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "14.9.3";
|
||||
version = "14.10.0";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
|
|
@ -23,10 +23,10 @@ buildGoModule {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D4Dgw2vqX5464ciYvTqagQG/uXt0Wm15ztdwbyJp1HM=";
|
||||
sha256 = "sha256-E0tIbcm/yI1oSn4CD8oZo8WfZVJNAZBUw2QRlhAujTI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds=";
|
||||
vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0=";
|
||||
|
||||
passthru = {
|
||||
inherit rubyEnv;
|
||||
|
|
@ -42,7 +42,7 @@ buildGoModule {
|
|||
postInstall = ''
|
||||
mkdir -p $ruby
|
||||
cp -rv $src/ruby/{bin,lib,proto} $ruby
|
||||
mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version}
|
||||
mv $out/bin/gitaly-git2go-v${lib.versions.major version} $out/bin/gitaly-git2go-${version}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "ruby" ];
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y";
|
||||
sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
actionview = {
|
||||
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -24,10 +24,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk";
|
||||
sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
|
||||
|
|
@ -35,10 +35,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35";
|
||||
sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
adamantium = {
|
||||
dependencies = ["ice_nine" "memoizable"];
|
||||
|
|
@ -122,10 +122,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
};
|
||||
crass = {
|
||||
groups = ["default"];
|
||||
|
|
@ -343,10 +343,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8";
|
||||
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
};
|
||||
ice_nine = {
|
||||
source = {
|
||||
|
|
@ -394,10 +394,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w";
|
||||
sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.14.0";
|
||||
version = "2.16.0";
|
||||
};
|
||||
memoizable = {
|
||||
dependencies = ["thread_safe"];
|
||||
|
|
@ -452,10 +452,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";
|
||||
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.1";
|
||||
version = "2.8.0";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
@ -493,10 +493,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";
|
||||
sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.5";
|
||||
version = "1.13.3";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-shell";
|
||||
version = "13.24.0";
|
||||
version = "13.25.1";
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/SH1YNmZr/NuCvyL6tmyTj1C2LUuxldeHwmJHWKPz2M=";
|
||||
sha256 = "sha256-JItk6gfpBNxabI0vsIOHIBhK7L6E1ijPgrnzhQiKPYw=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby ];
|
||||
|
||||
patches = [ ./remove-hardcoded-locations.patch ];
|
||||
|
||||
vendorSha256 = "sha256-RLV01CM5O0K4R8XDDcas2LjIig0S7GoyAo/S8+Vx2bY=";
|
||||
vendorSha256 = "sha256-S7bVQxb+p6o0LPAdx7S6dlsHLecPwMS7myjQZwYhHcU=";
|
||||
|
||||
postInstall = ''
|
||||
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.9.3";
|
||||
version = "14.10.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
|
||||
sourceRoot = "source/workhorse";
|
||||
|
||||
vendorSha256 = "sha256-ubuMuO8tDjdVZWehsmsJqUgvmySIBJ15D9GHZFzApFw=";
|
||||
vendorSha256 = "sha256-TNZtggUBMwIPO6ZZGk/EkRcilh7sztlAT7Hu4vhME0w=";
|
||||
buildInputs = [ git ];
|
||||
ldflags = [ "-X main.Version=${version}" ];
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '~> 6.1.4.6'
|
||||
gem 'rails', '~> 6.1.4.7'
|
||||
|
||||
gem 'bootsnap', '~> 1.9.1', require: false
|
||||
|
||||
|
|
@ -41,6 +41,7 @@ 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-alicloud', '~> 1.0.1'
|
||||
gem 'omniauth-facebook', '~> 4.0.0'
|
||||
gem 'omniauth-github', '~> 1.4'
|
||||
gem 'omniauth-gitlab', '~> 1.0.2'
|
||||
|
|
@ -163,7 +164,7 @@ gem 'org-ruby', '~> 0.9.12'
|
|||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
gem 'asciidoctor', '~> 2.0.10'
|
||||
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
|
||||
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
|
||||
gem 'asciidoctor-plantuml', '~> 0.0.12'
|
||||
gem 'asciidoctor-kroki', '~> 0.5.0', require: false
|
||||
gem 'rouge', '~> 3.27.0'
|
||||
|
|
@ -285,7 +286,7 @@ gem 'fast_blank'
|
|||
gem 'gitlab-chronic', '~> 0.10.5'
|
||||
gem 'gitlab_chronic_duration', '~> 0.10.6.2'
|
||||
|
||||
gem 'rack-proxy', '~> 0.6.0'
|
||||
gem 'rack-proxy', '~> 0.7.2'
|
||||
|
||||
gem 'sassc-rails', '~> 2.1.0'
|
||||
gem 'autoprefixer-rails', '10.2.5.1'
|
||||
|
|
@ -344,7 +345,7 @@ gem 'warning', '~> 1.2.0'
|
|||
|
||||
group :development do
|
||||
gem 'lefthook', '~> 0.7.0', require: false
|
||||
gem 'solargraph', '~> 0.43', require: false
|
||||
gem 'solargraph', '~> 0.44.3', require: false
|
||||
|
||||
gem 'letter_opener_web', '~> 2.0.0'
|
||||
|
||||
|
|
@ -389,7 +390,7 @@ group :development, :test do
|
|||
gem 'knapsack', '~> 1.21.1'
|
||||
gem 'crystalball', '~> 0.7.0', require: false
|
||||
|
||||
gem 'simple_po_parser', '~> 1.1.2', require: false
|
||||
gem 'simple_po_parser', '~> 1.1.6', require: false
|
||||
|
||||
gem 'timecop', '~> 0.9.1'
|
||||
|
||||
|
|
@ -403,7 +404,7 @@ group :development, :test do
|
|||
end
|
||||
|
||||
group :development, :test, :danger do
|
||||
gem 'gitlab-dangerfiles', '~> 2.11.0', require: false
|
||||
gem 'gitlab-dangerfiles', '~> 3.0', require: false
|
||||
end
|
||||
|
||||
group :development, :test, :coverage do
|
||||
|
|
@ -481,7 +482,7 @@ gem 'ssh_data', '~> 1.2'
|
|||
gem 'spamcheck', '~> 0.1.0'
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
gem 'gitaly', '~> 14.9.0.pre.rc4'
|
||||
gem 'gitaly', '~> 14.10.0-rc1'
|
||||
|
||||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.0.2'
|
||||
|
|
@ -497,7 +498,7 @@ gem 'flipper', '~> 0.21.0'
|
|||
gem 'flipper-active_record', '~> 0.21.0'
|
||||
gem 'flipper-active_support_cache_store', '~> 0.21.0'
|
||||
gem 'unleash', '~> 3.2.2'
|
||||
gem 'gitlab-experiment', '~> 0.7.0'
|
||||
gem 'gitlab-experiment', '~> 0.7.1'
|
||||
|
||||
# Structured logging
|
||||
gem 'lograge', '~> 0.5'
|
||||
|
|
@ -542,4 +543,4 @@ gem 'ipaddress', '~> 0.8.3'
|
|||
|
||||
gem 'parslet', '~> 1.8'
|
||||
|
||||
gem 'ipynbdiff', '0.4.4'
|
||||
gem 'ipynbdiff', '0.4.5'
|
||||
|
|
|
|||
|
|
@ -4,63 +4,63 @@ GEM
|
|||
RedCloth (4.3.2)
|
||||
acme-client (2.0.9)
|
||||
faraday (>= 0.17, < 2.0.0)
|
||||
actioncable (6.1.4.6)
|
||||
actionpack (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
actioncable (6.1.4.7)
|
||||
actionpack (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailbox (6.1.4.6)
|
||||
actionpack (= 6.1.4.6)
|
||||
activejob (= 6.1.4.6)
|
||||
activerecord (= 6.1.4.6)
|
||||
activestorage (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
actionmailbox (6.1.4.7)
|
||||
actionpack (= 6.1.4.7)
|
||||
activejob (= 6.1.4.7)
|
||||
activerecord (= 6.1.4.7)
|
||||
activestorage (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
mail (>= 2.7.1)
|
||||
actionmailer (6.1.4.6)
|
||||
actionpack (= 6.1.4.6)
|
||||
actionview (= 6.1.4.6)
|
||||
activejob (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
actionmailer (6.1.4.7)
|
||||
actionpack (= 6.1.4.7)
|
||||
actionview (= 6.1.4.7)
|
||||
activejob (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (6.1.4.6)
|
||||
actionview (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
actionpack (6.1.4.7)
|
||||
actionview (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
rack (~> 2.0, >= 2.0.9)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actiontext (6.1.4.6)
|
||||
actionpack (= 6.1.4.6)
|
||||
activerecord (= 6.1.4.6)
|
||||
activestorage (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
actiontext (6.1.4.7)
|
||||
actionpack (= 6.1.4.7)
|
||||
activerecord (= 6.1.4.7)
|
||||
activestorage (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
actionview (6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||
activejob (6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
activejob (6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
activerecord (6.1.4.6)
|
||||
activemodel (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
activemodel (6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
activerecord (6.1.4.7)
|
||||
activemodel (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
activerecord-explain-analyze (0.1.0)
|
||||
activerecord (>= 4)
|
||||
pg
|
||||
activestorage (6.1.4.6)
|
||||
actionpack (= 6.1.4.6)
|
||||
activejob (= 6.1.4.6)
|
||||
activerecord (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
activestorage (6.1.4.7)
|
||||
actionpack (= 6.1.4.7)
|
||||
activejob (= 6.1.4.7)
|
||||
activerecord (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
marcel (~> 1.0.0)
|
||||
mini_mime (>= 1.1.0)
|
||||
activesupport (6.1.4.6)
|
||||
activesupport (6.1.4.7)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
|
|
@ -82,7 +82,7 @@ GEM
|
|||
faraday_middleware-multi_json (~> 0.0)
|
||||
oauth2 (~> 1.4)
|
||||
asciidoctor (2.0.15)
|
||||
asciidoctor-include-ext (0.3.1)
|
||||
asciidoctor-include-ext (0.4.0)
|
||||
asciidoctor (>= 1.5.6, < 3.0.0)
|
||||
asciidoctor-kroki (0.5.0)
|
||||
asciidoctor (~> 2.0)
|
||||
|
|
@ -130,7 +130,7 @@ GEM
|
|||
base32 (0.3.2)
|
||||
batch-loader (2.0.1)
|
||||
bcrypt (3.1.16)
|
||||
benchmark (0.1.1)
|
||||
benchmark (0.2.0)
|
||||
benchmark-ips (2.3.0)
|
||||
benchmark-malloc (0.2.0)
|
||||
benchmark-memory (0.1.2)
|
||||
|
|
@ -196,7 +196,7 @@ GEM
|
|||
coderay (1.1.3)
|
||||
colored2 (3.1.2)
|
||||
commonmarker (0.23.4)
|
||||
concurrent-ruby (1.1.9)
|
||||
concurrent-ruby (1.1.10)
|
||||
connection_pool (2.2.5)
|
||||
contracts (0.11.0)
|
||||
cork (0.3.0)
|
||||
|
|
@ -217,7 +217,7 @@ GEM
|
|||
css_parser (1.7.0)
|
||||
addressable
|
||||
daemons (1.3.1)
|
||||
danger (8.4.5)
|
||||
danger (8.5.0)
|
||||
claide (~> 1.0)
|
||||
claide-plugins (>= 0.9.2)
|
||||
colored2 (~> 3.1)
|
||||
|
|
@ -448,7 +448,7 @@ GEM
|
|||
rails (>= 3.2.0)
|
||||
git (1.7.0)
|
||||
rchardet (~> 1.8)
|
||||
gitaly (14.9.0.pre.rc4)
|
||||
gitaly (14.10.0.pre.rc1)
|
||||
grpc (~> 1.0)
|
||||
github-markup (1.7.0)
|
||||
gitlab (4.16.1)
|
||||
|
|
@ -456,10 +456,11 @@ GEM
|
|||
terminal-table (~> 1.5, >= 1.5.1)
|
||||
gitlab-chronic (0.10.5)
|
||||
numerizer (~> 0.2)
|
||||
gitlab-dangerfiles (2.11.0)
|
||||
gitlab-dangerfiles (3.0.0)
|
||||
danger (>= 8.4.5)
|
||||
danger-gitlab (>= 8.0.0)
|
||||
gitlab-experiment (0.7.0)
|
||||
rake
|
||||
gitlab-experiment (0.7.1)
|
||||
activesupport (>= 3.0)
|
||||
request_store (>= 1.0)
|
||||
gitlab-fog-azure-rm (1.2.0)
|
||||
|
|
@ -526,7 +527,7 @@ GEM
|
|||
signet (~> 0.12)
|
||||
google-cloud-env (1.5.0)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
google-protobuf (3.19.1)
|
||||
google-protobuf (3.19.4)
|
||||
googleapis-common-protos-types (1.3.0)
|
||||
google-protobuf (~> 3.14)
|
||||
googleauth (0.14.0)
|
||||
|
|
@ -647,7 +648,7 @@ GEM
|
|||
invisible_captcha (1.1.0)
|
||||
rails (>= 4.2)
|
||||
ipaddress (0.8.3)
|
||||
ipynbdiff (0.4.4)
|
||||
ipynbdiff (0.4.5)
|
||||
diffy (~> 3.3)
|
||||
json (~> 2.5, >= 2.5.1)
|
||||
jaeger-client (1.1.0)
|
||||
|
|
@ -729,7 +730,7 @@ GEM
|
|||
activesupport (>= 4)
|
||||
railties (>= 4)
|
||||
request_store (~> 1.0)
|
||||
loofah (2.12.0)
|
||||
loofah (2.16.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
lru_redux (1.1.0)
|
||||
|
|
@ -748,8 +749,8 @@ GEM
|
|||
mime-types-data (3.2020.0512)
|
||||
mini_histogram (0.3.1)
|
||||
mini_magick (4.10.1)
|
||||
mini_mime (1.1.1)
|
||||
mini_portile2 (2.6.1)
|
||||
mini_mime (1.1.2)
|
||||
mini_portile2 (2.8.0)
|
||||
minitest (5.11.3)
|
||||
mixlib-cli (2.1.8)
|
||||
mixlib-config (3.0.9)
|
||||
|
|
@ -787,8 +788,8 @@ GEM
|
|||
netrc (0.11.0)
|
||||
nio4r (2.5.8)
|
||||
no_proxy_fix (0.1.2)
|
||||
nokogiri (1.12.5)
|
||||
mini_portile2 (~> 2.6.1)
|
||||
nokogiri (1.13.3)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
notiffany (0.1.3)
|
||||
nenv (~> 0.1)
|
||||
|
|
@ -821,6 +822,8 @@ GEM
|
|||
omniauth (1.9.1)
|
||||
hashie (>= 3.4.6)
|
||||
rack (>= 1.6.2, < 3)
|
||||
omniauth-alicloud (1.0.1)
|
||||
omniauth-oauth2 (~> 1.7.1)
|
||||
omniauth-atlassian-oauth2 (0.2.0)
|
||||
omniauth (>= 1.1.1)
|
||||
omniauth-oauth2 (>= 1.5)
|
||||
|
|
@ -961,25 +964,25 @@ GEM
|
|||
httpclient
|
||||
json-jwt (>= 1.11.0)
|
||||
rack (>= 2.1.0)
|
||||
rack-proxy (0.6.0)
|
||||
rack-proxy (0.7.2)
|
||||
rack
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rack-timeout (0.5.2)
|
||||
rails (6.1.4.6)
|
||||
actioncable (= 6.1.4.6)
|
||||
actionmailbox (= 6.1.4.6)
|
||||
actionmailer (= 6.1.4.6)
|
||||
actionpack (= 6.1.4.6)
|
||||
actiontext (= 6.1.4.6)
|
||||
actionview (= 6.1.4.6)
|
||||
activejob (= 6.1.4.6)
|
||||
activemodel (= 6.1.4.6)
|
||||
activerecord (= 6.1.4.6)
|
||||
activestorage (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
rails (6.1.4.7)
|
||||
actioncable (= 6.1.4.7)
|
||||
actionmailbox (= 6.1.4.7)
|
||||
actionmailer (= 6.1.4.7)
|
||||
actionpack (= 6.1.4.7)
|
||||
actiontext (= 6.1.4.7)
|
||||
actionview (= 6.1.4.7)
|
||||
activejob (= 6.1.4.7)
|
||||
activemodel (= 6.1.4.7)
|
||||
activerecord (= 6.1.4.7)
|
||||
activestorage (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 6.1.4.6)
|
||||
railties (= 6.1.4.7)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-controller-testing (1.0.5)
|
||||
actionpack (>= 5.0.1.rc1)
|
||||
|
|
@ -993,9 +996,9 @@ GEM
|
|||
rails-i18n (6.0.0)
|
||||
i18n (>= 0.7, < 2)
|
||||
railties (>= 6.0.0, < 7)
|
||||
railties (6.1.4.6)
|
||||
actionpack (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
railties (6.1.4.7)
|
||||
actionpack (= 6.1.4.7)
|
||||
activesupport (= 6.1.4.7)
|
||||
method_source
|
||||
rake (>= 0.13)
|
||||
thor (~> 1.0)
|
||||
|
|
@ -1199,7 +1202,7 @@ GEM
|
|||
faraday (>= 0.17.3, < 2.0)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
multi_json (~> 1.10)
|
||||
simple_po_parser (1.1.2)
|
||||
simple_po_parser (1.1.6)
|
||||
simplecov (0.21.2)
|
||||
docile (~> 1.1)
|
||||
simplecov-html (~> 0.11)
|
||||
|
|
@ -1213,7 +1216,7 @@ GEM
|
|||
slack-messenger (2.3.4)
|
||||
snowplow-tracker (0.6.1)
|
||||
contracts (~> 0.7, <= 0.11)
|
||||
solargraph (0.43.0)
|
||||
solargraph (0.44.3)
|
||||
backport (~> 1.2)
|
||||
benchmark
|
||||
bundler (>= 1.17.2)
|
||||
|
|
@ -1240,11 +1243,11 @@ GEM
|
|||
sprockets (3.7.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.2.2)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets-rails (3.4.2)
|
||||
actionpack (>= 5.2)
|
||||
activesupport (>= 5.2)
|
||||
sprockets (>= 3.0.0)
|
||||
sqlite3 (1.3.13)
|
||||
sqlite3 (1.4.2)
|
||||
ssh_data (1.2.0)
|
||||
ssrf_filter (1.0.7)
|
||||
stackprof (0.2.15)
|
||||
|
|
@ -1410,7 +1413,7 @@ DEPENDENCIES
|
|||
apollo_upload_server (~> 2.1.0)
|
||||
asana (~> 0.10.3)
|
||||
asciidoctor (~> 2.0.10)
|
||||
asciidoctor-include-ext (~> 0.3.1)
|
||||
asciidoctor-include-ext (~> 0.4.0)
|
||||
asciidoctor-kroki (~> 0.5.0)
|
||||
asciidoctor-plantuml (~> 0.0.12)
|
||||
atlassian-jwt (~> 0.2.0)
|
||||
|
|
@ -1484,11 +1487,11 @@ DEPENDENCIES
|
|||
gettext (~> 3.3)
|
||||
gettext_i18n_rails (~> 1.8.0)
|
||||
gettext_i18n_rails_js (~> 1.3)
|
||||
gitaly (~> 14.9.0.pre.rc4)
|
||||
gitaly (~> 14.10.0.pre.rc1)
|
||||
github-markup (~> 1.7.0)
|
||||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-dangerfiles (~> 2.11.0)
|
||||
gitlab-experiment (~> 0.7.0)
|
||||
gitlab-dangerfiles (~> 3.0)
|
||||
gitlab-experiment (~> 0.7.1)
|
||||
gitlab-fog-azure-rm (~> 1.2.0)
|
||||
gitlab-labkit (~> 0.22.0)
|
||||
gitlab-license (~> 2.1.0)
|
||||
|
|
@ -1528,7 +1531,7 @@ DEPENDENCIES
|
|||
icalendar
|
||||
invisible_captcha (~> 1.1.0)
|
||||
ipaddress (~> 0.8.3)
|
||||
ipynbdiff (= 0.4.4)
|
||||
ipynbdiff (= 0.4.5)
|
||||
jira-ruby (~> 2.1.4)
|
||||
js_regex (~> 3.7)
|
||||
json (~> 2.5.1)
|
||||
|
|
@ -1561,6 +1564,7 @@ DEPENDENCIES
|
|||
ohai (~> 16.10)
|
||||
oj (~> 3.10.6)
|
||||
omniauth (~> 1.8)
|
||||
omniauth-alicloud (~> 1.0.1)
|
||||
omniauth-atlassian-oauth2 (~> 0.2.0)
|
||||
omniauth-auth0 (~> 2.0.0)
|
||||
omniauth-authentiq (~> 0.3.3)
|
||||
|
|
@ -1597,9 +1601,9 @@ DEPENDENCIES
|
|||
rack-attack (~> 6.3.0)
|
||||
rack-cors (~> 1.0.6)
|
||||
rack-oauth2 (~> 1.16.0)
|
||||
rack-proxy (~> 0.6.0)
|
||||
rack-proxy (~> 0.7.2)
|
||||
rack-timeout (~> 0.5.1)
|
||||
rails (~> 6.1.4.6)
|
||||
rails (~> 6.1.4.7)
|
||||
rails-controller-testing
|
||||
rails-i18n (~> 6.0)
|
||||
rainbow (~> 3.0)
|
||||
|
|
@ -1644,13 +1648,13 @@ DEPENDENCIES
|
|||
sidekiq (~> 6.4)
|
||||
sidekiq-cron (~> 1.2)
|
||||
sigdump (~> 0.2.4)
|
||||
simple_po_parser (~> 1.1.2)
|
||||
simple_po_parser (~> 1.1.6)
|
||||
simplecov (~> 0.21)
|
||||
simplecov-cobertura (~> 1.3.1)
|
||||
simplecov-lcov (~> 0.8.0)
|
||||
slack-messenger (~> 2.3.4)
|
||||
snowplow-tracker (~> 0.6.1)
|
||||
solargraph (~> 0.43)
|
||||
solargraph (~> 0.44.3)
|
||||
spamcheck (~> 0.1.0)
|
||||
spring (~> 2.1.0)
|
||||
spring-commands-rspec (~> 1.0.4)
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0abclh3rd7s2k88bj40jn9wcmal8dcybvn5xrnl80xknmxh3zigp";
|
||||
sha256 = "0knrmrqmjl4gdzvmxk5plc9i5ipclncg7l0l0yhvy07779j3xqpd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
actionmailbox = {
|
||||
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
|
||||
|
|
@ -27,10 +27,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qhnkz4fs45zid30lnc77m4rw7an6pp2pdmkwkn6cczikqz5sklw";
|
||||
sha256 = "1ksps8lzmggdhbr0d45qyp2s70kfapx1x0j77xmacw9c749y5jxd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
actionmailer = {
|
||||
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
|
||||
|
|
@ -38,10 +38,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mqcmxv28wy2jrpk9vghq7njjr03drw0ab3hw64j2d9kbpnpb8w8";
|
||||
sha256 = "0rjm6rx3qbqgxczy2a8l6hff72166hsf878fy2v1ik4pp8rh9cxa";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -49,10 +49,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y";
|
||||
sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
actiontext = {
|
||||
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
|
||||
|
|
@ -60,10 +60,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1n2n52m5j6h370r5j18w76kgqzzkcv8x72p040l16ax40ysglq7p";
|
||||
sha256 = "0dwinzhsfcysz9khk137z92qr5kx6aw5f2ybkdjk1yqml8avv1wd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
actionview = {
|
||||
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -71,10 +71,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk";
|
||||
sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
activejob = {
|
||||
dependencies = ["activesupport" "globalid"];
|
||||
|
|
@ -82,10 +82,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02dnr16mgwp98n9q733nprfx7dn09z6pa11cfk0pivj8daad5x1l";
|
||||
sha256 = "1g8dpxjzj7k3sjfjhfia21bwzmgc721lafpk2napravmq1qi0rkj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
activemodel = {
|
||||
dependencies = ["activesupport"];
|
||||
|
|
@ -93,10 +93,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv";
|
||||
sha256 = "01mzgr5pdxcki023p96bj77by1iblv9bq6pwmbly931bjwhr5irv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport"];
|
||||
|
|
@ -104,10 +104,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss";
|
||||
sha256 = "1idirwh7dzhzcjsssnghqyjl87inh84za0cmrf8g323p9qsx879l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
activerecord-explain-analyze = {
|
||||
dependencies = ["activerecord" "pg"];
|
||||
|
|
@ -126,10 +126,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kngq1555jphy5yhmz4yfigpk3ms4b65ynzy5yssrlhbmdf8r430";
|
||||
sha256 = "18gxckrydsyciaiq5j981sf522kfqpq74yvf405dgn688y5927il";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
|
||||
|
|
@ -137,10 +137,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35";
|
||||
sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
acts-as-taggable-on = {
|
||||
dependencies = ["activerecord"];
|
||||
|
|
@ -232,10 +232,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d";
|
||||
sha256 = "0y3qixbssfrzp04ng7g4lh3dq16pgrw3p8cwc0v5bhmz5yfxnsj0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
};
|
||||
asciidoctor-kroki = {
|
||||
dependencies = ["asciidoctor"];
|
||||
|
|
@ -484,10 +484,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";
|
||||
sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
};
|
||||
benchmark-ips = {
|
||||
groups = ["development" "test"];
|
||||
|
|
@ -824,10 +824,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
};
|
||||
connection_pool = {
|
||||
groups = ["default"];
|
||||
|
|
@ -951,10 +951,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bmbqxscz0whc3kf5622ffp83k96h0vx71bhb5rzi3zzmg6b4vkl";
|
||||
sha256 = "0xmckbl41v27x9ri6snrl01alsbwxcqsfc4a1nfhgx0py6y0dmjg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.4.5";
|
||||
version = "8.5.0";
|
||||
};
|
||||
danger-gitlab = {
|
||||
dependencies = ["danger" "gitlab"];
|
||||
|
|
@ -1916,10 +1916,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13yq0ln40iy0wjapdg5phkqgr2bbdfk3xccyr1828yxpgkd44716";
|
||||
sha256 = "0ls4x3h1c3axx9kqmvs1mpcmjqchl297sh1bzzl5zjgdz25w24di";
|
||||
type = "gem";
|
||||
};
|
||||
version = "14.9.0.pre.rc4";
|
||||
version = "14.10.0.pre.rc1";
|
||||
};
|
||||
github-markup = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1954,15 +1954,15 @@
|
|||
version = "0.10.5";
|
||||
};
|
||||
gitlab-dangerfiles = {
|
||||
dependencies = ["danger" "danger-gitlab"];
|
||||
dependencies = ["danger" "danger-gitlab" "rake"];
|
||||
groups = ["danger" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1in56r2mdi6ghwx4nxvfihb2sg73xhnpw0w42wc5f57wwy6m1s24";
|
||||
sha256 = "1kyp5kxp0jsk224y2nq4yg37wnn824ialdjvsf8fv3a20q9w4k7i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.11.0";
|
||||
version = "3.0.0";
|
||||
};
|
||||
gitlab-experiment = {
|
||||
dependencies = ["activesupport" "request_store"];
|
||||
|
|
@ -1970,10 +1970,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ph12qxhml2iq02sad7hybi5yrc5zvz2spav2ahfh3ks2fvs7cbx";
|
||||
sha256 = "093q9b2nv010n10axlhz68gxdi0xs176hd9wm758nhl3marxsv8n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
};
|
||||
gitlab-fog-azure-rm = {
|
||||
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
|
||||
|
|
@ -2152,10 +2152,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dwx4ns39bpmzmhglyip9d68i117zspf5lp865pf6hrsmmdf2k53";
|
||||
sha256 = "1q0aknwpr8k1v92qcm1rz1zyrgdpf1i1b9mxa1gi48y0aawlnb7j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.19.1";
|
||||
version = "3.19.4";
|
||||
};
|
||||
googleapis-common-protos-types = {
|
||||
dependencies = ["google-protobuf"];
|
||||
|
|
@ -2623,10 +2623,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cgrr3pc0y11gas6k2js33qghj7rpdh99vavda712wbq3hz42jx2";
|
||||
sha256 = "1r1pl4imiqi75bksh17r2j3w74x561z4bx1mpgv6cin1fcrzw9zy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
};
|
||||
jaeger-client = {
|
||||
dependencies = ["opentracing" "thrift"];
|
||||
|
|
@ -2944,10 +2944,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw";
|
||||
sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.12.0";
|
||||
version = "2.16.0";
|
||||
};
|
||||
lru_redux = {
|
||||
groups = ["default"];
|
||||
|
|
@ -3081,20 +3081,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "173dp4vqvx1sl6aq83daxwn5xvb5rn3jgynjmb91swl7gmgp17yl";
|
||||
sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";
|
||||
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.1";
|
||||
version = "2.8.0";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["development" "test"];
|
||||
|
|
@ -3350,10 +3350,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";
|
||||
sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.5";
|
||||
version = "1.13.3";
|
||||
};
|
||||
notiffany = {
|
||||
dependencies = ["nenv" "shellany"];
|
||||
|
|
@ -3440,6 +3440,17 @@
|
|||
};
|
||||
version = "1.9.1";
|
||||
};
|
||||
omniauth-alicloud = {
|
||||
dependencies = ["omniauth-oauth2"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0yk9vlqm7warm83l5vy44z7q4rg4mismqmb4bmgapllqiw5yr09g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
omniauth-atlassian-oauth2 = {
|
||||
dependencies = ["omniauth" "omniauth-oauth2"];
|
||||
groups = ["default"];
|
||||
|
|
@ -4081,10 +4092,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4";
|
||||
sha256 = "1dpl6vi9yiv6k8gnr3zrsq7kd1dwbn8vkn70sw7dp975sgb4ziw9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.0";
|
||||
version = "0.7.2";
|
||||
};
|
||||
rack-test = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -4113,10 +4124,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01mvxg2rmwiqcw0alfd526axg7y1knj0lhy4i2mmxa3q0v7xb8za";
|
||||
sha256 = "0kwpw06ylmjbfldqjzhy5m6chr6q6g0gm6p6h98sbjj8awri72n5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
rails-controller-testing = {
|
||||
dependencies = ["actionpack" "actionview" "activesupport"];
|
||||
|
|
@ -4168,10 +4179,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb";
|
||||
sha256 = "0g6hvhvqdmgabcpmdiby4b77ni3rsgd5p7sd1qkqj34r4an0ldyd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.6";
|
||||
version = "6.1.4.7";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
@ -5101,10 +5112,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3";
|
||||
sha256 = "1wybcipkfawg4pragmayiig03xc084x3hbwywsh1dr9x9pa8f9hj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.2";
|
||||
version = "1.1.6";
|
||||
};
|
||||
simplecov = {
|
||||
dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];
|
||||
|
|
@ -5195,10 +5206,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1i2prnczlg871l3kyqy08z8axsilgv3wm4zw061wjyzqglx7xghg";
|
||||
sha256 = "1h3i4fkn028ylhgbqac0bgpbbikjcd5ks7id8wm94ahnq89z4mh8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.43.0";
|
||||
version = "0.44.3";
|
||||
};
|
||||
sorted_set = {
|
||||
dependencies = ["rbtree" "set"];
|
||||
|
|
@ -5270,20 +5281,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2";
|
||||
sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.2";
|
||||
version = "3.4.2";
|
||||
};
|
||||
sqlite3 = {
|
||||
groups = ["default" "development" "test"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
|
||||
sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.13";
|
||||
version = "1.4.2";
|
||||
};
|
||||
ssh_data = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) ''
|
|||
stdenvNoCC.mkDerivation
|
||||
rec {
|
||||
pname = "orchis-theme";
|
||||
version = "2022-02-18";
|
||||
version = "2022-05-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "Orchis-theme";
|
||||
owner = "vinceliuice";
|
||||
rev = version;
|
||||
sha256 = "sha256-SqptW8DEDCB6LMHalRlf71TWK93gW+blbu6Q1Oommes=";
|
||||
sha256 = "sha256-OYB/TnVm8AOQTdF+rGiY5tQjUjkSSpMrqFo0+TXSHzA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 sassc ];
|
||||
|
|
|
|||
|
|
@ -4,21 +4,24 @@
|
|||
, gnome-shell
|
||||
, gtk-engine-murrine
|
||||
, gtk_engines
|
||||
, sassc
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vimix-gtk-themes";
|
||||
version = "2021-08-17";
|
||||
version = "2022-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1pn737w99j4ij8qkgw0rrzhbcqzni73z5wnkfqgqqbhj38rafbpv";
|
||||
sha256 = "0q0ahm060qvr7r9j3x9lxidjnwf032c2g1pcqw9mz93iy7vfn358";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome-shell # needed to determine the gnome-shell version
|
||||
sassc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -29,15 +32,20 @@ stdenv.mkDerivation rec {
|
|||
gtk-engine-murrine
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs install.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
patchShebangs .
|
||||
mkdir -p $out/share/themes
|
||||
name= ./install.sh --all --dest $out/share/themes
|
||||
name= HOME="$TMPDIR" ./install.sh --all --dest $out/share/themes
|
||||
rm $out/share/themes/*/{AUTHORS,LICENSE}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flat Material Design theme for GTK based desktop environments";
|
||||
homepage = "https://github.com/vinceliuice/vimix-gtk-themes";
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-watcom-v2";
|
||||
version = "unstable-2022-04-24";
|
||||
version = "unstable-2022-04-29";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "13fcf849005f8e2f1c072ad727721eeb52d17b39";
|
||||
sha256 = "Wz9Lbwz00xwes4yiko4RA95QdKOkRHUitAFsCNWhfkw=";
|
||||
rev = "520d9d7025b46b926123257b029b3dbce9a96065";
|
||||
sha256 = "aACkkTzOH8F82GPyySjtb7CGozR8OjgzqZVRiNTiS10=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alda";
|
||||
version = "2.2.0";
|
||||
version = "2.2.3";
|
||||
|
||||
src_alda = fetchurl {
|
||||
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/client/linux-amd64/alda";
|
||||
sha256 = "0z3n81fmv3fxwgr641r6jjn1dmi5d3rw8d6r8jdfjhgpxanyi9a7";
|
||||
hash = "sha256-cyOAXQ3ITIgy4QusjdYBNmNIzB6BzfbQEypvJbkbvWo=";
|
||||
};
|
||||
|
||||
src_player = fetchurl {
|
||||
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player";
|
||||
sha256 = "11kji846hbn1f2w1s7rc1ing203jkamy89j1jmysajvirdpp8nha";
|
||||
hash = "sha256-HsX0mNWrusL2FaK2oK8xhmr/ai+3ZiMmrJk7oS3b93g=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -47,6 +47,35 @@ stdenv.mkDerivation rec {
|
|||
"-DJDBC_DRIVER=${enableFeature withJdbc}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
preInstallCheck = lib.optionalString stdenv.isDarwin ''
|
||||
export DYLD_LIBRARY_PATH="$out/lib''${DYLD_LIBRARY_PATH:+:}''${DYLD_LIBRARY_PATH}"
|
||||
'';
|
||||
|
||||
installCheckPhase =
|
||||
let
|
||||
excludes = map (pattern: "exclude:'${pattern}'") [
|
||||
"*test_slow"
|
||||
"Test file buffers for reading/writing to file"
|
||||
"[test_slow]"
|
||||
"test/common/test_cast_hugeint.test"
|
||||
"test/sql/copy/csv/test_csv_remote.test"
|
||||
"test/sql/copy/parquet/test_parquet_remote.test"
|
||||
] ++ lib.optionals stdenv.isAarch64 [
|
||||
"test/sql/aggregate/aggregates/test_kurtosis.test"
|
||||
"test/sql/aggregate/aggregates/test_skewness.test"
|
||||
"test/sql/function/list/aggregates/skewness.test"
|
||||
];
|
||||
in
|
||||
''
|
||||
runHook preInstallCheck
|
||||
|
||||
$PWD/test/unittest ${lib.concatStringsSep " " excludes}
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
buildInputs = lib.optionals withHttpFs [ openssl ]
|
||||
++ lib.optionals withJdbc [ openjdk11 ]
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
# alsa-lib vorbis-tools python2 can be made optional
|
||||
|
||||
{ lib, stdenv, fetchurl, python2, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snack";
|
||||
version = "2.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.speech.kth.se/snack/dist/${pname}${version}.tar.gz";
|
||||
sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb";
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ];
|
||||
|
||||
postUnpack = ''sourceRoot="$sourceRoot/unix"'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ python2 tcl tk vorbis-tools xlibsWrapper ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postInstall = "aoeu";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
make install DESTDIR="$out"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "The Snack Sound Toolkit (Tcl)";
|
||||
homepage = "https://www.speech.kth.se/snack/";
|
||||
license = lib.licenses.gpl2;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,25 +1,23 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
|
||||
# pythonPackages
|
||||
, anyconfig
|
||||
, appdirs
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, environs
|
||||
, fetchFromGitHub
|
||||
, jinja2
|
||||
, jsonschema
|
||||
, nested-lookup
|
||||
, pathspec
|
||||
, poetry-core
|
||||
, python-json-logger
|
||||
, pythonOlder
|
||||
, ruamel-yaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "1.2.4";
|
||||
version = "1.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -28,39 +26,41 @@ buildPythonPackage rec {
|
|||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e0FmV4U96TSC/dYJlgo5AeLdXQ7Z7rrP4JCtBxJdkhU=";
|
||||
hash = "sha256-lJKJE9UccknQg8aqt/6qmjKKaICBxaCH5e8fdmie6u8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
anyconfig
|
||||
appdirs
|
||||
colorama
|
||||
environs
|
||||
jinja2
|
||||
jsonschema
|
||||
nested-lookup
|
||||
pathspec
|
||||
python-json-logger
|
||||
ruamel-yaml
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm $out/lib/python*/site-packages/LICENSE
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "0.0.0"' 'version = "${version}"' \
|
||||
--replace 'Jinja2 = "3.1.2"' 'Jinja2 = "*"' \
|
||||
--replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \
|
||||
--replace 'environs = "9.5.0"' 'environs = "*"' \
|
||||
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' \
|
||||
--replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
colorama
|
||||
python-json-logger
|
||||
pathspec
|
||||
environs
|
||||
jsonschema
|
||||
appdirs
|
||||
ruamel-yaml
|
||||
anyconfig
|
||||
nested-lookup
|
||||
];
|
||||
|
||||
# no tests
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "commoncode";
|
||||
version = "30.1.1";
|
||||
version = "30.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-KymdX+5CAYSRpOwpqQ1DMCFWqkeMAmOHjVnBZTji76I=";
|
||||
sha256 = "sha256-7kcDWfw4M7boe0ABO4ob1d+XO1YxS924mtGETvHoNf0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "devitocodes";
|
||||
repo = "devito";
|
||||
rev = "7cb52eded4038c1a0ee92cfd04d3412c48f2fb7c";
|
||||
sha256 = "sha256-QdQRCGmXaubPPnmyJo2ha0mW5P1akRZhXZVW2TNM5yY=";
|
||||
sha256 = "sha256-75hkkufQK9Nv65DBz8cmYTfkxH/UUWDQK/rGUDULvjM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-taggit";
|
||||
version = "2.1.0";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a9f41e4ad58efe4b28d86f274728ee87eb98eeae90c9eb4b4efad39e5068184e";
|
||||
sha256 = "sha256-5kW4491PhZidXvXFo9Xrvlut9dHlG1PkLQr3JiQLALk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gradient";
|
||||
version = "1.11.0";
|
||||
version = "2.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IfScVoXFq6XPwUQdkcN87zOmuFY7kapbTkthxHqMAFU=";
|
||||
hash = "sha256-NEbXLhQC72UP5+crUzkgqMTd3rvipXO7bGlGAWUDoP4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
50
pkgs/development/python-modules/isoduration/default.nix
Normal file
50
pkgs/development/python-modules/isoduration/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, arrow
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hypothesis
|
||||
, isodate
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "isoduration";
|
||||
version = "20.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bolsote";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-6LqsH+3V/K0s2YD1gvmelo+cCH+yCAmmyTYGhUegVdk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
arrow
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
isodate
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# We don't care about benchmarks
|
||||
"tests/test_benchmark.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"isoduration"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for operations with ISO 8601 durations";
|
||||
homepage = "https://github.com/bolsote/isoduration";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jedi-language-server";
|
||||
version = "0.35.1";
|
||||
version = "0.36.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pappasam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+bhvWWiG0cA36oc2PFvgRTIvqnjIt5BUN82DY0tvuPo=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-PTLzZu3CZincY4zxN+/GUryTzWre595W+kztgCXTueo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "murmurhash";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "00a5252b569d3f914b5bd0bce72d2efe9c0fb91a9703556ea1b608b141c68f2d";
|
||||
sha256 = "sha256-Ywo5br0xykTYm07KNvp06oquckrfCvqi3naAw1Cyk28=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
66
pkgs/development/python-modules/netutils/default.nix
Normal file
66
pkgs/development/python-modules/netutils/default.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, jinja2
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, toml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netutils";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "networktocode";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rTSesG7XmIzu2DcJMVgZMlh0kRQ8jEB3t++rgf63Flw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
jinja2
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
toml
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/networktocode/netutils/pull/115
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/networktocode/netutils/commit/edc8b06686db4e5b4c8c4deb6d0effbc22177b31.patch";
|
||||
sha256 = "sha256-K5oSbtOJYeKbxzbaZQBXcl6LsHQAK8CxBLfkak15V6M=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"netutils"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_is_fqdn_resolvable"
|
||||
"test_fqdn_to_ip"
|
||||
"test_tcp_ping"
|
||||
# Skip SPhinx test
|
||||
"test_sphinx_build"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library that is a collection of objects for common network automation tasks";
|
||||
homepage = "https://github.com/networktocode/netutils";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, dunamai
|
||||
, fetchFromGitHub
|
||||
, jinja2
|
||||
, markupsafe
|
||||
, poetry-core
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tomlkit
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry-dynamic-versioning";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,20 +20,24 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "mtkennerly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-J/93BFyp+XBy9TRAzAM64ZcMurHxcXDTukOGJE5yvBk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RHCP5SakizURg5MwD96Bxs/NvoTdPSCKWVYt5m4meLA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dunamai
|
||||
tomlkit
|
||||
jinja2
|
||||
markupsafe
|
||||
tomlkit
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# these require .git, but leaveDotGit = true doesn't help
|
||||
|
|
@ -41,7 +45,9 @@ buildPythonPackage rec {
|
|||
"test__get_version__format_jinja"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "poetry_dynamic_versioning" ];
|
||||
pythonImportsCheck = [
|
||||
"poetry_dynamic_versioning"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for Poetry to enable dynamic versioning based on VCS tags";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyTelegramBotAPI";
|
||||
version = "4.4.1";
|
||||
version = "4.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3Qppp/UDKiGChnvMOgW8EKygI75gYzv37c0ctExmK+g=";
|
||||
hash = "sha256-Jonbb26MbK/LKztFkB7IlaHQm98DPYn4lYK4ikDPpaE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,43 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, py, pytest }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, py
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-datafiles";
|
||||
version = "2.0";
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
sha256 = "1yfvaqbqvjfikz215kwn6qiwwn9girka93zq4jphgfyvn75jjcql";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omarkohl";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-M0Lnsqi05Xs0uN6LlafNS7HJZOut+nrMZyvGPMMhIkc=";
|
||||
};
|
||||
|
||||
buildInputs = [ py pytest ];
|
||||
buildInputs = [
|
||||
py
|
||||
pytest
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytest_datafiles"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
description = "Pytest plugin to create a tmpdir containing predefined files/directories";
|
||||
homepage = "https://github.com/omarkohl/pytest-datafiles";
|
||||
description = "py.test plugin to create a 'tmpdir' containing predefined files/directories.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-pfn-extras";
|
||||
version = "0.5.7";
|
||||
version = "0.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pfnet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gB575ZKXZRAy5K5CkBtfG6KG1yQ9WDREIobsy43CEOc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-ApXDO7VMnExYfh5nfiIaxdbvPjR7dWRAkxh3+0KxWnM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy packaging pytorch typing-extensions ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "timetagger";
|
||||
version = "22.3.1";
|
||||
version = "22.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "almarklein";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pHogDjqXuoQp5afSnPvMPaKoBtPE6u3kMi87SzY5yoU=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-CWY+5O4Y1dvKQNy1Cclqj4+U6q5vVVj9hZq41MYqXKs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -6,19 +6,22 @@
|
|||
, pyserial-asyncio
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, zigpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-deconz";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-QLEyEoX3gbrY/zvFmB1eah1wuc4bHH4S0D1B2WNHxaM=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MEYe8DGx338ze1t36Fh0Zl8GgBpk2Wmx0EKnewjnTws=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ in stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fuse pcre ];
|
||||
|
||||
patches = [ ./fusermount-setuid.patch ];
|
||||
|
||||
configurePhase = ''
|
||||
substituteInPlace src/tup/link.sh --replace '`git describe' '`echo ${version}'
|
||||
substituteInPlace Tuprules.tup --replace 'pcre-config' 'pkg-config libpcre'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
# Tup needs a setuid fusermount which may be outside $PATH.
|
||||
|
||||
diff --git a/src/tup/server/fuse_server.c b/src/tup/server/fuse_server.c
|
||||
index d4ab648d..2dc9294b 100644
|
||||
--- a/src/tup/server/fuse_server.c
|
||||
+++ b/src/tup/server/fuse_server.c
|
||||
@@ -105,16 +105,21 @@ static void *fuse_thread(void *arg)
|
||||
#if defined(__linux__)
|
||||
static int os_unmount(void)
|
||||
{
|
||||
- int rc;
|
||||
#ifdef FUSE3
|
||||
- rc = system("fusermount3 -u -z " TUP_MNT);
|
||||
+#define FUSERMOUNT "fusermount3"
|
||||
#else
|
||||
- rc = system("fusermount -u -z " TUP_MNT);
|
||||
+#define FUSERMOUNT "fusermount"
|
||||
#endif
|
||||
+ int rc;
|
||||
+ const char *cmd = (access("/run/wrappers/bin/" FUSERMOUNT, X_OK) == 0)
|
||||
+ ? "/run/wrappers/bin/" FUSERMOUNT " -u -z " TUP_MNT
|
||||
+ : FUSERMOUNT " -u -z " TUP_MNT;
|
||||
+ rc = system(cmd);
|
||||
if(rc == -1) {
|
||||
perror("system");
|
||||
}
|
||||
return rc;
|
||||
+#undef FUSERMOUNT
|
||||
}
|
||||
#elif defined(__APPLE__)
|
||||
static int os_unmount(void)
|
||||
|
|
@ -105,6 +105,8 @@ stdenv.mkDerivation rec {
|
|||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
# Never use nuget.org
|
||||
nuget sources Disable -Name "nuget.org"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,21 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "mustache-go";
|
||||
version = "1.3.0";
|
||||
|
||||
goPackagePath = "github.com/cbroglie/mustache";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cbroglie";
|
||||
repo = "mustache";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z33hHOcx2K34v3j/qFD1VqeuUaqH0jqoMsVZQnLFx4U=";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-3mGxbgxZFL05ZKn6T85tYYjaEkEJbIUkCwlNJTwoIfc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FYdsLcW6FYxSgixZ5US9cBPABOAVwidC3ejUNbs1lbA=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cbroglie/mustache";
|
||||
description = "The mustache template language in Go";
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
{ lib, fetchFromGitHub, buildGoPackage }:
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "reflex";
|
||||
version = "0.2.0";
|
||||
|
||||
goPackagePath = "github.com/cespare/reflex";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cespare";
|
||||
repo = "reflex";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ccwjmf8rjh03hpbmfiy70ai9dhgvb5vp7albffq0cmv2sl69dqr";
|
||||
sha256 = "sha256-/2qVm2xpSFVspA16rkiIw/qckxzXQp/1EGOl0f9KljY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-JCtVYDHbhH2i7tGNK1jvgHCjU6gMMkNhQ2ZnlTeqtmA=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A small tool to watch a directory and rerun a command when certain files change";
|
||||
homepage = "https://github.com/cespare/reflex";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,11 @@
|
|||
}:
|
||||
let
|
||||
|
||||
prebuilt_crt = {
|
||||
choosePlatform =
|
||||
let pname = stdenv.targetPlatform.parsed.cpu.name; in
|
||||
pset: pset.${pname} or (throw "bionic-prebuilt: unsupported platform ${pname}");
|
||||
|
||||
prebuilt_crt = choosePlatform {
|
||||
aarch64 = fetchzip {
|
||||
url = "https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/+archive/98dce673ad97a9640c5d90bbb1c718e75c21e071/lib/gcc/aarch64-linux-android/4.9.x.tar.gz";
|
||||
sha256 = "sha256-LLD2OJi78sNN5NulOsJZl7Ei4F1EUYItGG6eUsKWULc=";
|
||||
|
|
@ -15,9 +19,9 @@ let
|
|||
sha256 = "sha256-y7CFLF76pTlj+oYev9taBnL2nlT3+Tx8c6wmicWmKEw=";
|
||||
stripRoot = false;
|
||||
};
|
||||
}.${stdenv.targetPlatform.parsed.cpu.name};
|
||||
};
|
||||
|
||||
prebuilt_libs = {
|
||||
prebuilt_libs = choosePlatform {
|
||||
aarch64 = fetchzip {
|
||||
url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-arm64/usr/lib.tar.gz";
|
||||
sha256 = "sha256-TZBV7+D1QvKOCEi+VNGT5SStkgj0xRbyWoLH65zSrjw=";
|
||||
|
|
@ -28,9 +32,9 @@ let
|
|||
sha256 = "sha256-n2EuOKy3RGKmEYofNlm+vDDBuiQRuAJEJT6wq6NEJQs=";
|
||||
stripRoot = false;
|
||||
};
|
||||
}.${stdenv.targetPlatform.parsed.cpu.name};
|
||||
};
|
||||
|
||||
prebuilt_ndk_crt = {
|
||||
prebuilt_ndk_crt = choosePlatform {
|
||||
aarch64 = fetchzip {
|
||||
url = "https://android.googlesource.com/toolchain/prebuilts/ndk/r23/+archive/6c5fa4c0d3999b9ee932f6acbd430eb2f31f3151/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/30.tar.gz";
|
||||
sha256 = "sha256-KHw+cCwAwlm+5Nwp1o8WONqdi4BBDhFaVVr+7GxQ5uE=";
|
||||
|
|
@ -41,7 +45,7 @@ let
|
|||
sha256 = "sha256-XEd7L3cBzn+1pKfji40V92G/uZhHSMMuZcRZaiKkLnk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
}.${stdenv.targetPlatform.parsed.cpu.name};
|
||||
};
|
||||
|
||||
ndk_support_headers = fetchzip {
|
||||
url ="https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/0e7f808fa26cce046f444c9616d9167dafbfb272/clang-r416183b/include/c++/v1/support.tar.gz";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powerdns";
|
||||
version = "4.6.1";
|
||||
version = "4.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
|
||||
sha256 = "sha256-eRKxSIfWKEUYX3zktH21gOqnuLiX3LHJVV3+D6xe+uM=";
|
||||
hash = "sha256-9EOEiUS7Ebu0hQIhYTs6Af+1f+vyZx2myqVzYu4LGbg=";
|
||||
};
|
||||
# redact configure flags from version output to reduce closure size
|
||||
patches = [ ./version.patch ];
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "matterircd";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "42wim";
|
||||
repo = "matterircd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AuY6tAZ1WlUkiKcbDcXBDh2OdKwWllx2xJxPCbqQguM=";
|
||||
sha256 = "sha256-qglr0QN0ca6waxhwEFgYP9RHvTJ4YVn90vl+crcktao=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/42wim/matterircd";
|
||||
vendorSha256 = null;
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
|
|
|
|||
27
pkgs/servers/wishlist/default.nix
Normal file
27
pkgs/servers/wishlist/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wishlist";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "wishlist";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qXCPxFdwX+z0aaZbqFt7bWPlBJDnr0SDMrBHSALX1aw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vLhRZVEiYUCvGqPMtOz/8T6W5AKwkSzPdEglG3AevE8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A single entrypoint for multiple SSH endpoints";
|
||||
homepage = "https://github.com/charmbracelet/wishlist";
|
||||
changelog = "https://github.com/charmbracelet/wishlist/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ penguwin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,17 +1,26 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, cli53 }:
|
||||
|
||||
buildGoPackage {
|
||||
buildGoModule rec {
|
||||
pname = "cli53";
|
||||
version = "0.8.12";
|
||||
|
||||
goPackagePath = "github.com/barnybug/cli53";
|
||||
version = "0.8.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "barnybug";
|
||||
repo = "cli53";
|
||||
rev = "2624c7c4b38a33cdbd166dad1d3e512830f453e4";
|
||||
sha256 = "0bhczmzrgf7ypnhhzdrgnvg8cw8ch1x1d0cgajc5kklq9ixv9ygi";
|
||||
rev = version;
|
||||
sha256 = "sha256-RgU4+/FQEqNpVxBktZUwoVD9ilLrTm5ZT7D8jbt2sRM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-uqBa2YrQwXdTemP9yB2otkSFWJqDxw/NAvIvlEbhk90=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/barnybug/cli53.version=${version}"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = cli53;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, requests
|
||||
, distro
|
||||
, makeWrapper
|
||||
, installShellFiles
|
||||
, extraHandlers ? []
|
||||
}:
|
||||
|
||||
|
|
@ -24,15 +25,20 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage $src/usr/share/man/man1/ssh-import-id.1
|
||||
'';
|
||||
|
||||
# handlers require main bin, main bin requires handlers
|
||||
makeWrapperArgs = [ "--prefix" ":" "$out/bin" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Retrieves an SSH public key and installs it locally";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
maintainers = with maintainers; [ mkg20001 viraptor ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fuse-7z-ng";
|
||||
version = "git-2014-06-08";
|
||||
version = "unstable-2014-06-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kedazo";
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "antimicrox";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AntiMicroX";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8DCQAgwXaJxRl6NxzSCow9XpP4HhHw3hlPXvmqpq/nc=";
|
||||
sha256 = "sha256-Qn2XT/l3zx0u3twKsQr1cHbaRiLTglQf0WNx8tqtKro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ];
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fclones";
|
||||
version = "0.21.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkolaczk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4V6K4OkQkmFr45x+VYVDmrO9Tdaxt05Q7d7E9UumChE=";
|
||||
sha256 = "sha256-gzNrZJz0nC1N7LUyN5q16Vva1SD0jh7cBVV36927pmY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-PPaub+2NV0QlmyevbhvUHzX2RV/vFmJz/j+wwfBBzfQ=";
|
||||
cargoSha256 = "sha256-yooY58PZbraDYc+mvmDgKZ3CdvVkbKM/f/DcU0xDiNo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
|
|
|
|||
|
|
@ -1,20 +1,28 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC
|
||||
{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC, gengetopt, cmake
|
||||
, withApplePCSC ? stdenv.isDarwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yubico-piv-tool";
|
||||
version = "2.0.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz";
|
||||
sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs";
|
||||
sha256 = "sha256-t+3k3cPW4x3mey4t3NMZsitAzC4Jc7mGbQUqdUSTsU4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config cmake gengetopt ];
|
||||
buildInputs = [ openssl check ]
|
||||
++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGENERATE_MAN_PAGES=OFF" # Use the man page generated at release time
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-DCMAKE_INSTALL_MANDIR=share/man"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -32,5 +40,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ viraptor ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "godns";
|
||||
version = "2.7.5";
|
||||
version = "2.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimothyYe";
|
||||
repo = "godns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YQNx0MwdThA2odJMq4rRNOtEe1ul6ICJNLSVr1aqCbA=";
|
||||
sha256 = "sha256-w0hHl7QOpIOINRbCrocZM68b44h+IwkHmXTDnVfT0o0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850=";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mqttui";
|
||||
version = "0.16.1";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdJoPaTo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nLUDuLolv52WJAwBG5gSADWM2LmquJt5jZJioZWX8VA=";
|
||||
sha256 = "sha256-u2KuB0cw0xCAc5uRgHNsQknTfLwQmO9CZjSJTdycEnc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Z6V7k69fjtiG01s1Xf0UA8lhRsq3T+ImDsCHPSVIDfQ=";
|
||||
cargoSha256 = "sha256-asJvunklc0zcrkgirC6wznwKNKLFQ6sN/B1GukI/NCo=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,21 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wprecon";
|
||||
version = "1.6.3a";
|
||||
version = "2.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blackbinn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0gqi4799ha3mf8r7ini0wj4ilkfsh80vnnxijfv9a343r6z5w0dn";
|
||||
hash = "sha256-23zJD3Nnkeko+J2FjPq5RA5dIjORMXvwt3wtAYiVlQs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1sab58shspll96rqy1rp659s0yikqdcx59z9b88d6p4w8a98ns87";
|
||||
vendorSha256 = "sha256-FYdsLcW6FYxSgixZ5US9cBPABOAVwidC3ejUNbs1lbA=";
|
||||
|
||||
postFixup = ''
|
||||
# Rename binary
|
||||
mv $out/bin/cli $out/bin/${pname}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "WordPress vulnerability recognition tool";
|
||||
|
|
@ -23,6 +28,5 @@ buildGoModule rec {
|
|||
# https://github.com/blackbinn/wprecon/blob/master/LICENSE
|
||||
license = with licenses; [ unfree ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
broken = true; # build fails, missing tag
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1182,6 +1182,7 @@ mapAliases ({
|
|||
slurm-llnl-full = slurm-full; # renamed July 2017
|
||||
smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22
|
||||
smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04
|
||||
snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21
|
||||
solr_8 = solr; # Added 2021-01-30
|
||||
|
||||
# Added 2020-02-10
|
||||
|
|
@ -1352,6 +1353,7 @@ mapAliases ({
|
|||
|
||||
### W ###
|
||||
|
||||
wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21
|
||||
way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13
|
||||
webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21
|
||||
webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22
|
||||
|
|
|
|||
|
|
@ -14716,6 +14716,8 @@ with pkgs;
|
|||
ansible = ansible_2_12;
|
||||
ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core;
|
||||
|
||||
ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
|
||||
|
||||
ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
|
||||
|
||||
antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix {
|
||||
|
|
@ -20561,10 +20563,6 @@ with pkgs;
|
|||
|
||||
smpeg2 = callPackage ../development/libraries/smpeg2 { };
|
||||
|
||||
snack = callPackage ../development/libraries/snack {
|
||||
# optional
|
||||
};
|
||||
|
||||
snappy = callPackage ../development/libraries/snappy { };
|
||||
|
||||
snow = callPackage ../tools/security/snow { };
|
||||
|
|
@ -22650,6 +22648,8 @@ with pkgs;
|
|||
|
||||
webmetro = callPackage ../servers/webmetro { };
|
||||
|
||||
wishlist = callPackage ../servers/wishlist { };
|
||||
|
||||
wsdd = callPackage ../servers/wsdd { };
|
||||
|
||||
webhook = callPackage ../servers/http/webhook { };
|
||||
|
|
@ -26357,8 +26357,6 @@ with pkgs;
|
|||
|
||||
w_scan = callPackage ../applications/video/w_scan { };
|
||||
|
||||
wavesurfer = callPackage ../applications/misc/audio/wavesurfer { };
|
||||
|
||||
wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { };
|
||||
|
||||
welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };
|
||||
|
|
|
|||
|
|
@ -4230,6 +4230,8 @@ in {
|
|||
|
||||
isodate = callPackage ../development/python-modules/isodate { };
|
||||
|
||||
isoduration = callPackage ../development/python-modules/isoduration { };
|
||||
|
||||
isort = callPackage ../development/python-modules/isort { };
|
||||
|
||||
isounidecode = callPackage ../development/python-modules/isounidecode { };
|
||||
|
|
@ -5588,6 +5590,8 @@ in {
|
|||
|
||||
nettigo-air-monitor = callPackage ../development/python-modules/nettigo-air-monitor { };
|
||||
|
||||
netutils = callPackage ../development/python-modules/netutils { };
|
||||
|
||||
networkx = callPackage ../development/python-modules/networkx { };
|
||||
|
||||
neuron-mpi = pkgs.neuron-mpi.override { inherit python; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue