public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-27 00:51:02 +00:00 committed by GitHub
commit 9c87ad5a33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 1088 additions and 692 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/misc/gitlab.nix
View File

@ -44,6 +44,9 @@ let
[gitlab-shell] [gitlab-shell]
dir = "${cfg.packages.gitlab-shell}" dir = "${cfg.packages.gitlab-shell}"
[hooks]
custom_hooks_dir = "${cfg.statePath}/custom_hooks"
[gitlab] [gitlab]
secret_file = "${cfg.statePath}/gitlab_shell_secret" secret_file = "${cfg.statePath}/gitlab_shell_secret"
url = "http+unix://${pathUrlQuote gitlabSocket}" url = "http+unix://${pathUrlQuote gitlabSocket}"
@ -65,7 +68,6 @@ let
repos_path = "${cfg.statePath}/repositories"; repos_path = "${cfg.statePath}/repositories";
secret_file = "${cfg.statePath}/gitlab_shell_secret"; secret_file = "${cfg.statePath}/gitlab_shell_secret";
log_file = "${cfg.statePath}/log/gitlab-shell.log"; log_file = "${cfg.statePath}/log/gitlab-shell.log";
custom_hooks_dir = "${cfg.statePath}/custom_hooks";
redis = { redis = {
bin = "${pkgs.redis}/bin/redis-cli"; bin = "${pkgs.redis}/bin/redis-cli";
host = "127.0.0.1"; host = "127.0.0.1";

4
nixos/modules/tasks/filesystems/bcachefs.nix
View File

@ -49,8 +49,8 @@ in
} }
(mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { (mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) {
# the cryptographic modules are required only for decryption attempts # chacha20 and poly1305 are required only for decryption attempts
boot.initrd.availableKernelModules = [ "bcachefs" "chacha20" "poly1305" ]; boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ];
boot.initrd.extraUtilsCommands = '' boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs

6
pkgs/applications/audio/helio-workstation/default.nix
View File

@ -5,14 +5,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "helio-workstation"; pname = "helio-workstation";
version = "3.1"; version = "3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "helio-fm"; owner = "helio-fm";
repo = pname; repo = pname;
rev = version; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "10pna4k43g648gapviykq2zk82iwy5rqff4lbfh5vzxqpg5v4ma6"; sha256 = "sha256-meeNqV1jKUwWc7P3p/LicPsbpzpKKFmQ1wP9DuXc9NY=";
}; };
buildInputs = [ buildInputs = [
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "One music sequencer for all major platforms, both desktop and mobile"; description = "One music sequencer for all major platforms, both desktop and mobile";
homepage = "https://helio.fm/"; homepage = "https://helio.fm/";
license = licenses.gpl3; license = licenses.gpl3Only;
maintainers = [ maintainers.suhr ]; maintainers = [ maintainers.suhr ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };

33
pkgs/applications/audio/stochas/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
pname = "stochas";
version = "1.3.4";
src = fetchFromGitHub {
owner = "surge-synthesizer";
repo = pname;
rev = "v${version}";
sha256 = "0b26mbj727dnygavz4kihnhmnnvwsr9l145w6kydq7bd7nwiw7lq";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
libX11 libXrandr libXinerama libXext libXcursor freetype alsaLib libjack2
];
installPhase = ''
mkdir -p $out/lib/vst3
cp -r stochas_artefacts/Release/VST3/Stochas.vst3 $out/lib/vst3
'';
meta = with stdenv.lib; {
description = "Probabilistic polyrhythmic sequencer plugin";
homepage = "https://stochas.org/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ magnetophon ];
platforms = platforms.unix;
};
}

6
pkgs/applications/science/chemistry/openmolcas/default.nix
View File

@ -1,11 +1,9 @@
{ stdenv, fetchFromGitLab, cmake, gfortran, perl { stdenv, fetchFromGitLab, cmake, gfortran, perl
, openblas, blas, lapack, hdf5-cpp, python3, texlive , openblas, hdf5-cpp, python3, texlive
, armadillo, openmpi, globalarrays, openssh , armadillo, openmpi, globalarrays, openssh
, makeWrapper, fetchpatch , makeWrapper, fetchpatch
} : } :
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
let let
version = "20.10"; version = "20.10";
gitLabRev = "v${version}"; gitLabRev = "v${version}";
@ -74,7 +72,7 @@ in stdenv.mkDerivation {
homepage = "https://gitlab.com/Molcas/OpenMolcas"; homepage = "https://gitlab.com/Molcas/OpenMolcas";
maintainers = [ maintainers.markuskowa ]; maintainers = [ maintainers.markuskowa ];
license = licenses.lgpl21; license = licenses.lgpl21;
platforms = platforms.linux; platforms = [ "x86_64-linux" ];
}; };
} }

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

@ -1,13 +1,13 @@
{ {
"version": "13.6.1", "version": "13.7.1",
"repo_hash": "0kfh9ngykrnvvjpx4m69pfyfvsvvqfxzlxhm8dgx9ypz4bpmr947", "repo_hash": "13bbi9ps6z8q9di9gni2ckydgfk7pxkaqf0wgx8gfwm80sc7s0km",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v13.6.1-ee", "rev": "v13.7.1-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "13.6.1", "GITALY_SERVER_VERSION": "13.7.1",
"GITLAB_PAGES_VERSION": "1.30.0", "GITLAB_PAGES_VERSION": "1.32.0",
"GITLAB_SHELL_VERSION": "13.13.0", "GITLAB_SHELL_VERSION": "13.14.0",
"GITLAB_WORKHORSE_VERSION": "8.54.0" "GITLAB_WORKHORSE_VERSION": "8.58.0"
} }
} }

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

@ -1,7 +1,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rugged', '~> 0.28' gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 7.11', require: 'linguist' gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1' gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.0.3.3' gem 'activesupport', '~> 6.0.3.3'
gem 'rdoc', '~> 6.0' gem 'rdoc', '~> 6.0'

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

@ -45,7 +45,7 @@ GEM
ffi (1.13.1) ffi (1.13.1)
gemojione (3.3.0) gemojione (3.3.0)
json json
github-linguist (7.11.0) github-linguist (7.12.1)
charlock_holmes (~> 0.7.7) charlock_holmes (~> 0.7.7)
escape_utils (~> 1.2.0) escape_utils (~> 1.2.0)
mini_mime (~> 1.0) mini_mime (~> 1.0)
@ -134,7 +134,7 @@ GEM
redis (4.1.3) redis (4.1.3)
regexp_parser (1.8.1) regexp_parser (1.8.1)
rexml (3.2.4) rexml (3.2.4)
rouge (3.24.0) rouge (3.26.0)
rspec (3.8.0) rspec (3.8.0)
rspec-core (~> 3.8.0) rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0) rspec-expectations (~> 3.8.0)
@ -197,7 +197,7 @@ DEPENDENCIES
activesupport (~> 6.0.3.3) activesupport (~> 6.0.3.3)
factory_bot factory_bot
faraday (~> 1.0) faraday (~> 1.0)
github-linguist (~> 7.11) github-linguist (~> 7.12)
gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-lib (~> 4.2.7.9)
gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-labkit (~> 0.13.2) gitlab-labkit (~> 0.13.2)

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

@ -4,6 +4,18 @@
, libgit2, openssl, zlib, pcre, http-parser }: , libgit2, openssl, zlib, pcre, http-parser }:
let let
# libgit2 was updated to 1.1.0 in nixpkgs, but gitlab doesn't support that yet.
# See https://github.com/NixOS/nixpkgs/pull/106909
libgit = libgit2.overrideAttrs (attrs: rec {
version = "1.0.0";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc";
};
});
rubyEnv = bundlerEnv rec { rubyEnv = bundlerEnv rec {
name = "gitaly-env"; name = "gitaly-env";
inherit ruby; inherit ruby;
@ -21,17 +33,17 @@ let
}; };
}; };
in buildGoModule rec { in buildGoModule rec {
version = "13.6.1"; version = "13.7.1";
pname = "gitaly"; pname = "gitaly";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "02w7pf7l9sr2nk8ky9b0d5b4syx3d9my65h2kzvh2afk7kv35h5y"; sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb";
}; };
vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r"; vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187";
passthru = { passthru = {
inherit rubyEnv; inherit rubyEnv;
@ -39,7 +51,7 @@ in buildGoModule rec {
buildFlags = [ "-tags=static,system_libgit2" ]; buildFlags = [ "-tags=static,system_libgit2" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ];
doCheck = false; doCheck = false;
postInstall = '' postInstall = ''

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

@ -207,10 +207,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "12vwx6msqqdyf10zrrp2zdwr8ixrb82phriyin16rsmndb93cijv"; sha256 = "08lnb04qmlz4arls3nr3ia0k8r1kcyn010fr5qvc2qddidckqk88";
type = "gem"; type = "gem";
}; };
version = "7.11.0"; version = "7.12.1";
}; };
github-markup = { github-markup = {
source = { source = {
@ -645,10 +645,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392"; sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
type = "gem"; type = "gem";
}; };
version = "3.24.0"; version = "3.26.0";
}; };
rspec = { rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];

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

@ -2,12 +2,12 @@
buildGoModule rec { buildGoModule rec {
pname = "gitlab-shell"; pname = "gitlab-shell";
version = "13.13.0"; version = "13.14.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-shell"; repo = "gitlab-shell";
rev = "v${version}"; rev = "v${version}";
sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7"; sha256 = "171c4rfffb73198fhlwk8rq7xy4b4zrnssi8c1wd0x82kqv6csb0";
}; };
buildInputs = [ ruby ]; buildInputs = [ ruby ];

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

@ -3,16 +3,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "8.54.0"; version = "8.58.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-workhorse"; repo = "gitlab-workhorse";
rev = "v${version}"; rev = "v${version}";
sha256 = "0fz00sl9q4d3vbslh7y9nsnhjshgfg0x7mv7b7a9sc3mxmabp7gz"; sha256 = "1642vxxqnpccjzfls3vz4l62kvksk6irwv1dhjcxv1cppbr9hz80";
}; };
vendorSha256 = "0wi6vj9phwh0bsdk2lrgq807nb90iivlm0bkdjkim06jq068mizj"; vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";
buildInputs = [ git ]; buildInputs = [ git ];
buildFlagsArray = "-ldflags=-X main.Version=${version}"; buildFlagsArray = "-ldflags=-X main.Version=${version}";
doCheck = false; doCheck = false;

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

@ -66,7 +66,7 @@ gem 'attr_encrypted', '~> 3.1.0'
gem 'u2f', '~> 0.2.1' gem 'u2f', '~> 0.2.1'
# GitLab Pages # GitLab Pages
gem 'validates_hostname', '~> 1.0.10' gem 'validates_hostname', '~> 1.0.11'
gem 'rubyzip', '~> 2.0.0', require: 'zip' gem 'rubyzip', '~> 2.0.0', require: 'zip'
# GitLab Pages letsencrypt support # GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.6' gem 'acme-client', '~> 2.0', '>= 2.0.6'
@ -115,11 +115,11 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick', '~> 4.10.1' gem 'mini_magick', '~> 4.10.1'
# for backups # for backups
gem 'fog-aws', '~> 3.5' gem 'fog-aws', '~> 3.7'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb. # Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0' gem 'fog-core', '= 2.1.0'
gem 'fog-google', '~> 1.11' gem 'fog-google', '~> 1.12'
gem 'fog-local', '~> 0.6' gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0' gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1' gem 'fog-rackspace', '~> 0.1.1'
@ -149,7 +149,7 @@ gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '2.3.1' gem 'deckar01-task_list', '2.3.1'
gem 'gitlab-markup', '~> 1.7.1' gem 'gitlab-markup', '~> 1.7.1'
gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.20' gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3.0' gem 'kramdown', '~> 2.3.0'
gem 'RedCloth', '~> 4.3.2' gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.1.2' gem 'rdoc', '~> 6.1.2'
@ -159,7 +159,8 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-plantuml', '~> 0.0.12'
gem 'rouge', '~> 3.25.0' gem 'asciidoctor-kroki', '~> 0.2.2', require: false
gem 'rouge', '~> 3.26.0'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0' gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.9' gem 'nokogiri', '~> 1.10.9'
@ -209,7 +210,7 @@ gem 'httparty', '~> 0.16.4'
gem 'rainbow', '~> 3.0' gem 'rainbow', '~> 3.0'
# Progress bar # Progress bar
gem 'ruby-progressbar' gem 'ruby-progressbar', '~> 1.10'
# GitLab settings # GitLab settings
gem 'settingslogic', '~> 2.0.9' gem 'settingslogic', '~> 2.0.9'
@ -291,7 +292,6 @@ gem 'sassc-rails', '~> 2.1.0'
gem 'terser', '1.0.2' gem 'terser', '1.0.2'
gem 'addressable', '~> 2.7' gem 'addressable', '~> 2.7'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3' gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2' gem 'gon', '~> 6.2'
gem 'request_store', '~> 1.5' gem 'request_store', '~> 1.5'
@ -311,7 +311,7 @@ gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query'
gem 'premailer-rails', '~> 1.10.3' gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '0.13.1' gem 'gitlab-labkit', '0.13.3'
# I18n # I18n
gem 'ruby_parser', '~> 3.15', require: false gem 'ruby_parser', '~> 3.15', require: false
@ -351,6 +351,7 @@ group :development do
end end
group :development, :test do group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.0' gem 'bullet', '~> 6.1.0'
gem 'pry-byebug', '~> 3.9.0', platform: :mri gem 'pry-byebug', '~> 3.9.0', platform: :mri
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
@ -370,7 +371,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0' gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 5.1.0', require: false gem 'gitlab-styles', '~> 5.3.0', require: false
gem 'scss_lint', '~> 0.59.0', require: false gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false gem 'haml_lint', '~> 0.36.0', require: false
@ -428,7 +429,7 @@ end
gem 'octokit', '~> 4.15' gem 'octokit', '~> 4.15'
# https://gitlab.com/gitlab-org/gitlab/issues/207207 # https://gitlab.com/gitlab-org/gitlab/issues/207207
gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room' gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -464,7 +465,7 @@ group :ed25519 do
end end
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
gem 'gitaly', '~> 13.5.0-rc2' gem 'gitaly', '~> 13.7.0.pre.rc1'
gem 'grpc', '~> 1.30.2' gem 'grpc', '~> 1.30.2'
@ -477,6 +478,7 @@ gem 'flipper', '~> 0.17.1'
gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1'
gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5' gem 'unleash', '~> 0.1.5'
gem 'gitlab-experiment', '~> 0.4.4'
# Structured logging # Structured logging
gem 'lograge', '~> 0.5' gem 'lograge', '~> 0.5'

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

@ -84,6 +84,8 @@ GEM
asciidoctor (2.0.10) asciidoctor (2.0.10)
asciidoctor-include-ext (0.3.1) asciidoctor-include-ext (0.3.1)
asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor (>= 1.5.6, < 3.0.0)
asciidoctor-kroki (0.2.2)
asciidoctor (~> 2.0)
asciidoctor-plantuml (0.0.12) asciidoctor-plantuml (0.0.12)
asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor (>= 1.5.6, < 3.0.0)
ast (2.4.1) ast (2.4.1)
@ -177,7 +179,7 @@ GEM
open4 (~> 1.3) open4 (~> 1.3)
coderay (1.1.3) coderay (1.1.3)
colored2 (3.1.2) colored2 (3.1.2)
commonmarker (0.20.1) commonmarker (0.21.0)
ruby-enum (~> 0.5) ruby-enum (~> 0.5)
concord (0.1.5) concord (0.1.5)
adamantium (~> 0.2.0) adamantium (~> 0.2.0)
@ -220,10 +222,12 @@ GEM
debugger-ruby_core_source (1.3.8) debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.3.1) deckar01-task_list (2.3.1)
html-pipeline html-pipeline
declarative (0.0.10) declarative (0.0.20)
declarative-option (0.1.0) declarative-option (0.1.0)
default_value_for (3.3.0) default_value_for (3.3.0)
activerecord (>= 3.2.0, < 6.1) activerecord (>= 3.2.0, < 6.1)
deprecation_toolkit (1.5.1)
activesupport (>= 4.2)
derailed_benchmarks (1.7.0) derailed_benchmarks (1.7.0)
benchmark-ips (~> 2) benchmark-ips (~> 2)
get_process_mem (~> 0) get_process_mem (~> 0)
@ -359,7 +363,7 @@ GEM
fog-json fog-json
ipaddress (~> 0.8) ipaddress (~> 0.8)
xml-simple (~> 1.1) xml-simple (~> 1.1)
fog-aws (3.5.2) fog-aws (3.7.0)
fog-core (~> 2.1) fog-core (~> 2.1)
fog-json (~> 1.1) fog-json (~> 1.1)
fog-xml (~> 0.1) fog-xml (~> 0.1)
@ -369,11 +373,11 @@ GEM
excon (~> 0.58) excon (~> 0.58)
formatador (~> 0.2) formatador (~> 0.2)
mime-types mime-types
fog-google (1.11.0) fog-google (1.12.0)
fog-core (<= 2.1.0) fog-core (<= 2.1.0)
fog-json (~> 1.2) fog-json (~> 1.2)
fog-xml (~> 0.1.0) fog-xml (~> 0.1.0)
google-api-client (>= 0.32, < 0.34) google-api-client (>= 0.44.2, < 0.51)
google-cloud-env (~> 1.2) google-cloud-env (~> 1.2)
fog-json (1.2.0) fog-json (1.2.0)
fog-core fog-core
@ -392,8 +396,6 @@ GEM
fog-xml (0.1.3) fog-xml (0.1.3)
fog-core fog-core
nokogiri (>= 1.5.11, < 2.0.0) nokogiri (>= 1.5.11, < 2.0.0)
font-awesome-rails (4.7.0.5)
railties (>= 3.2, < 6.1)
formatador (0.2.5) formatador (0.2.5)
fugit (1.2.1) fugit (1.2.1)
et-orbi (~> 1.1, >= 1.1.8) et-orbi (~> 1.1, >= 1.1.8)
@ -418,11 +420,14 @@ GEM
rails (>= 3.2.0) rails (>= 3.2.0)
git (1.7.0) git (1.7.0)
rchardet (~> 1.8) rchardet (~> 1.8)
gitaly (13.5.0.pre.rc2) gitaly (13.7.0.pre.rc1)
grpc (~> 1.0) grpc (~> 1.0)
github-markup (1.7.0) github-markup (1.7.0)
gitlab-chronic (0.10.5) gitlab-chronic (0.10.5)
numerizer (~> 0.2) numerizer (~> 0.2)
gitlab-experiment (0.4.4)
activesupport (>= 3.0)
scientist (~> 1.5, >= 1.5.0)
gitlab-fog-azure-rm (1.0.0) gitlab-fog-azure-rm (1.0.0)
azure-storage-blob (~> 2.0) azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0) azure-storage-common (~> 2.0)
@ -430,15 +435,16 @@ GEM
fog-json (~> 1.2.0) fog-json (~> 1.2.0)
mime-types mime-types
ms_rest_azure (~> 0.12.0) ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.13.1) gitlab-labkit (0.13.3)
actionpack (>= 5.0.0, < 6.1.0) actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0)
gitlab-pg_query (~> 1.3)
grpc (~> 1.19) grpc (~> 1.19)
jaeger-client (~> 1.1) jaeger-client (~> 1.1)
opentracing (~> 0.4) opentracing (~> 0.4)
redis (> 3.0.0, < 5.0.0) redis (> 3.0.0, < 5.0.0)
gitlab-license (1.0.0) gitlab-license (1.0.0)
gitlab-mail_room (0.0.7) gitlab-mail_room (0.0.8)
gitlab-markup (1.7.1) gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1) gitlab-net-dns (0.9.1)
gitlab-pg_query (1.3.0) gitlab-pg_query (1.3.0)
@ -449,7 +455,7 @@ GEM
gitlab-puma (>= 2.7, < 5) gitlab-puma (>= 2.7, < 5)
gitlab-sidekiq-fetcher (0.5.2) gitlab-sidekiq-fetcher (0.5.2)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (5.1.0) gitlab-styles (5.3.0)
rubocop (~> 0.89.1) rubocop (~> 0.89.1)
rubocop-gitlab-security (~> 0.1.0) rubocop-gitlab-security (~> 0.1.0)
rubocop-performance (~> 1.8.1) rubocop-performance (~> 1.8.1)
@ -468,20 +474,21 @@ GEM
actionpack (>= 3.0) actionpack (>= 3.0)
multi_json multi_json
request_store (>= 1.0) request_store (>= 1.0)
google-api-client (0.33.2) google-api-client (0.50.0)
addressable (~> 2.5, >= 2.5.1) addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9) googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0) httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0) mini_mime (~> 1.0)
representable (~> 3.0) representable (~> 3.0)
retriable (>= 2.0, < 4.0) retriable (>= 2.0, < 4.0)
rexml
signet (~> 0.12) signet (~> 0.12)
google-cloud-env (1.4.0) google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0) faraday (>= 0.17.3, < 2.0)
google-protobuf (3.12.4) google-protobuf (3.12.4)
googleapis-common-protos-types (1.0.5) googleapis-common-protos-types (1.0.5)
google-protobuf (~> 3.11) google-protobuf (~> 3.11)
googleauth (0.12.0) googleauth (0.14.0)
faraday (>= 0.17.3, < 2.0) faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0) jwt (>= 1.4, < 3.0)
memoist (~> 0.16) memoist (~> 0.16)
@ -691,7 +698,7 @@ GEM
marginalia (1.9.0) marginalia (1.9.0)
actionpack (>= 2.3) actionpack (>= 2.3)
activerecord (>= 2.3) activerecord (>= 2.3)
memoist (0.16.0) memoist (0.16.2)
memoizable (0.4.2) memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
memory_profiler (0.9.14) memory_profiler (0.9.14)
@ -832,7 +839,7 @@ GEM
org-ruby (0.9.12) org-ruby (0.9.12)
rubypants (~> 0.2) rubypants (~> 0.2)
orm_adapter (0.5.0) orm_adapter (0.5.0)
os (1.0.0) os (1.1.1)
parallel (1.19.2) parallel (1.19.2)
parser (2.7.2.0) parser (2.7.2.0)
ast (~> 2.4.1) ast (~> 2.4.1)
@ -977,7 +984,7 @@ GEM
rexml (3.2.4) rexml (3.2.4)
rinku (2.0.0) rinku (2.0.0)
rotp (2.1.2) rotp (2.1.2)
rouge (3.25.0) rouge (3.26.0)
rqrcode (0.7.0) rqrcode (0.7.0)
chunky_png chunky_png
rqrcode-rails3 (0.1.7) rqrcode-rails3 (0.1.7)
@ -1041,7 +1048,7 @@ GEM
rubocop-rspec (1.44.1) rubocop-rspec (1.44.1)
rubocop (~> 0.87) rubocop (~> 0.87)
rubocop-ast (>= 0.7.1) rubocop-ast (>= 0.7.1)
ruby-enum (0.7.2) ruby-enum (0.8.0)
i18n i18n
ruby-fogbugz (0.2.1) ruby-fogbugz (0.2.1)
crack (~> 0.4) crack (~> 0.4)
@ -1081,6 +1088,7 @@ GEM
sawyer (0.8.2) sawyer (0.8.2)
addressable (>= 2.3.5) addressable (>= 2.3.5)
faraday (> 0.8, < 2.0) faraday (> 0.8, < 2.0)
scientist (1.5.0)
scss_lint (0.59.0) scss_lint (0.59.0)
sass (~> 3.5, >= 3.5.5) sass (~> 3.5, >= 3.5.5)
securecompare (1.0.0) securecompare (1.0.0)
@ -1215,7 +1223,7 @@ GEM
validate_url (1.0.8) validate_url (1.0.8)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
public_suffix public_suffix
validates_hostname (1.0.10) validates_hostname (1.0.11)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
version_sorter (2.2.4) version_sorter (2.2.4)
@ -1267,6 +1275,7 @@ DEPENDENCIES
asana (= 0.10.2) asana (= 0.10.2)
asciidoctor (~> 2.0.10) asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1) asciidoctor-include-ext (~> 0.3.1)
asciidoctor-kroki (~> 0.2.2)
asciidoctor-plantuml (~> 0.0.12) asciidoctor-plantuml (~> 0.0.12)
atlassian-jwt (~> 0.2.0) atlassian-jwt (~> 0.2.0)
attr_encrypted (~> 3.1.0) attr_encrypted (~> 3.1.0)
@ -1292,7 +1301,7 @@ DEPENDENCIES
capybara-screenshot (~> 1.0.22) capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3) carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7) charlock_holmes (~> 0.7.7)
commonmarker (~> 0.20) commonmarker (~> 0.21)
concurrent-ruby (~> 1.1) concurrent-ruby (~> 1.1)
connection_pool (~> 2.0) connection_pool (~> 2.0)
countries (~> 3.0) countries (~> 3.0)
@ -1302,6 +1311,7 @@ DEPENDENCIES
database_cleaner (~> 1.7.0) database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.1) deckar01-task_list (= 2.3.1)
default_value_for (~> 3.3.0) default_value_for (~> 3.3.0)
deprecation_toolkit (~> 1.5.1)
derailed_benchmarks derailed_benchmarks
device_detector device_detector
devise (~> 4.7.2) devise (~> 4.7.2)
@ -1329,33 +1339,33 @@ DEPENDENCIES
flipper-active_support_cache_store (~> 0.17.1) flipper-active_support_cache_store (~> 0.17.1)
flowdock (~> 0.7) flowdock (~> 0.7)
fog-aliyun (~> 0.3) fog-aliyun (~> 0.3)
fog-aws (~> 3.5) fog-aws (~> 3.7)
fog-core (= 2.1.0) fog-core (= 2.1.0)
fog-google (~> 1.11) fog-google (~> 1.12)
fog-local (~> 0.6) fog-local (~> 0.6)
fog-openstack (~> 1.0) fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1) fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
fugit (~> 1.2.1) fugit (~> 1.2.1)
fuubar (~> 2.2.0) fuubar (~> 2.2.0)
gemojione (~> 3.3) gemojione (~> 3.3)
gettext (~> 3.3) gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly (~> 13.5.0.pre.rc2) gitaly (~> 13.7.0.pre.rc1)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5) gitlab-chronic (~> 0.10.5)
gitlab-experiment (~> 0.4.4)
gitlab-fog-azure-rm (~> 1.0) gitlab-fog-azure-rm (~> 1.0)
gitlab-labkit (= 0.13.1) gitlab-labkit (= 0.13.3)
gitlab-license (~> 1.0) gitlab-license (~> 1.0)
gitlab-mail_room (~> 0.0.7) gitlab-mail_room (~> 0.0.8)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-pg_query (~> 1.3) gitlab-pg_query (~> 1.3)
gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma (~> 4.3.3.gitlab.2)
gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
gitlab-sidekiq-fetcher (= 0.5.2) gitlab-sidekiq-fetcher (= 0.5.2)
gitlab-styles (~> 5.1.0) gitlab-styles (~> 5.3.0)
gitlab_chronic_duration (~> 0.10.6.2) gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2) gon (~> 6.2)
@ -1468,7 +1478,7 @@ DEPENDENCIES
request_store (~> 1.5) request_store (~> 1.5)
responders (~> 3.0) responders (~> 3.0)
retriable (~> 3.1.2) retriable (~> 3.1.2)
rouge (~> 3.25.0) rouge (~> 3.26.0)
rqrcode-rails3 (~> 0.1.7) rqrcode-rails3 (~> 0.1.7)
rspec-parameterized rspec-parameterized
rspec-rails (~> 4.0.0) rspec-rails (~> 4.0.0)
@ -1477,7 +1487,7 @@ DEPENDENCIES
rspec_profiling (~> 0.0.6) rspec_profiling (~> 0.0.6)
ruby-fogbugz (~> 0.2.1) ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 1.3.0) ruby-prof (~> 1.3.0)
ruby-progressbar ruby-progressbar (~> 1.10)
ruby_parser (~> 3.15) ruby_parser (~> 3.15)
rubyzip (~> 2.0.0) rubyzip (~> 2.0.0)
rugged (~> 0.28) rugged (~> 0.28)
@ -1515,7 +1525,7 @@ DEPENDENCIES
unicorn-worker-killer (~> 0.4.4) unicorn-worker-killer (~> 0.4.4)
unleash (~> 0.1.5) unleash (~> 0.1.5)
valid_email (~> 0.1) valid_email (~> 0.1)
validates_hostname (~> 1.0.10) validates_hostname (~> 1.0.11)
version_sorter (~> 2.2.4) version_sorter (~> 2.2.4)
vmstat (~> 2.3.0) vmstat (~> 2.3.0)
webauthn (~> 2.3) webauthn (~> 2.3)

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

@ -258,6 +258,17 @@
}; };
version = "0.3.1"; version = "0.3.1";
}; };
asciidoctor-kroki = {
dependencies = ["asciidoctor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10yc07x2z9f122wnncf34s91vlfcd4wy8y9wshxc7j2m4a2jlzm5";
type = "gem";
};
version = "0.2.2";
};
asciidoctor-plantuml = { asciidoctor-plantuml = {
dependencies = ["asciidoctor"]; dependencies = ["asciidoctor"];
groups = ["default"]; groups = ["default"];
@ -762,10 +773,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "19zd9na1g2d0zzbqhmfj8rjfzcxj34vja3i52gvv859i8fifa461"; sha256 = "0vwpkmwfr8lx8b6cfvwh56f1ygyf2da5ah37mxbdr9mxmfwig5fr";
type = "gem"; type = "gem";
}; };
version = "0.20.1"; version = "0.21.0";
}; };
concord = { concord = {
dependencies = ["adamantium" "equalizer"]; dependencies = ["adamantium" "equalizer"];
@ -955,10 +966,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0";
type = "gem"; type = "gem";
}; };
version = "0.0.10"; version = "0.0.20";
}; };
declarative-option = { declarative-option = {
groups = ["default"]; groups = ["default"];
@ -981,6 +992,17 @@
}; };
version = "3.3.0"; version = "3.3.0";
}; };
deprecation_toolkit = {
dependencies = ["activesupport"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fh4d98irhph3ri7c2rrvvmmjd4z14702r8baq9flh5f34dap8d8";
type = "gem";
};
version = "1.5.1";
};
derailed_benchmarks = { derailed_benchmarks = {
dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor" "unicode_plot"]; dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor" "unicode_plot"];
groups = ["default"]; groups = ["default"];
@ -1590,10 +1612,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4"; sha256 = "1764kvyzigaxwmxgfggpqq15qpplm77j2nmvhf8f0gybsm3vbrbn";
type = "gem"; type = "gem";
}; };
version = "3.5.2"; version = "3.7.0";
}; };
fog-core = { fog-core = {
dependencies = ["builder" "excon" "formatador" "mime-types"]; dependencies = ["builder" "excon" "formatador" "mime-types"];
@ -1612,10 +1634,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1h9apmm2pyb157pbnrqk37wfs2d9f35navsgzs3kclrxhyl2qm5f"; sha256 = "1cl6rprichdn1i40c2ndri1c53cfb0x2xk58l9arwip9ivkasln4";
type = "gem"; type = "gem";
}; };
version = "1.11.0"; version = "1.12.0";
}; };
fog-json = { fog-json = {
dependencies = ["fog-core" "multi_json"]; dependencies = ["fog-core" "multi_json"];
@ -1672,17 +1694,6 @@
}; };
version = "0.1.3"; version = "0.1.3";
}; };
font-awesome-rails = {
dependencies = ["railties"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a32q69rdsdw9zhmf2cflvvnikg20amidhn40sv2afw2qk91fcrz";
type = "gem";
};
version = "4.7.0.5";
};
formatador = { formatador = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -1797,10 +1808,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1q1l0c1yjnhr451jj845h2vd9s00grjiyj2w9r1b9y3bscsyzs0m"; sha256 = "1al29diaj9zrkj1rxwrqd644f2winv81dmnjycvm0gsim0vvw2hq";
type = "gem"; type = "gem";
}; };
version = "13.5.0.pre.rc2"; version = "13.7.0.pre.rc1";
}; };
github-markup = { github-markup = {
groups = ["default"]; groups = ["default"];
@ -1823,6 +1834,17 @@
}; };
version = "0.10.5"; version = "0.10.5";
}; };
gitlab-experiment = {
dependencies = ["activesupport" "scientist"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12ng0q49vl4k80m3hyx6bz915x1gmfmxjvgzdp3w0q77j4qv6nwi";
type = "gem";
};
version = "0.4.4";
};
gitlab-fog-azure-rm = { gitlab-fog-azure-rm = {
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
groups = ["default"]; groups = ["default"];
@ -1835,15 +1857,15 @@
version = "1.0.0"; version = "1.0.0";
}; };
gitlab-labkit = { gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"]; dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0cnrpqswicawhpvd4dh4jcma9d4haznc4gyl37ssvj1jkfhc4w40"; sha256 = "0x4d5dl60cfvvqj89b8blpsxa7lbbblqwdqy8kc1z51gira7i803";
type = "gem"; type = "gem";
}; };
version = "0.13.1"; version = "0.13.3";
}; };
gitlab-license = { gitlab-license = {
groups = ["default"]; groups = ["default"];
@ -1860,10 +1882,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "14785l38sqrgf06y45ayhj3nhfqdar8vrsxna764vdsw01dngmin"; sha256 = "05j8rpsbl2l5q4xnfh2cnws9axy1a19asg8nlw6jngba94raw5ir";
type = "gem"; type = "gem";
}; };
version = "0.0.7"; version = "0.0.8";
}; };
gitlab-markup = { gitlab-markup = {
groups = ["default"]; groups = ["default"];
@ -1934,10 +1956,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0l24vgcmvval1apqk99c3ifcwlg1fh60vf02ggnc20f65dka81p3"; sha256 = "14zg4mxj780ssk6lg8mvy4br3327cdlq17k5sds8zk2glng9vmsh";
type = "gem"; type = "gem";
}; };
version = "5.1.0"; version = "5.3.0";
}; };
gitlab_chronic_duration = { gitlab_chronic_duration = {
dependencies = ["numerizer"]; dependencies = ["numerizer"];
@ -1984,15 +2006,15 @@
version = "6.2.0"; version = "6.2.0";
}; };
google-api-client = { google-api-client = {
dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "13y6xara8w211y88pxa8bcbg6y40vkidqk854zl7z4csmgfnplxq"; sha256 = "05ynbapd26wppcqa81kw6kb8a39mzp0fql1rwmk3lgr95ybmxr1s";
type = "gem"; type = "gem";
}; };
version = "0.33.2"; version = "0.50.0";
}; };
google-cloud-env = { google-cloud-env = {
dependencies = ["faraday"]; dependencies = ["faraday"];
@ -2032,10 +2054,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0rsk471ld98pxhvzig3lnw9i13454c9nschvzxvq6vjqnn9ip0yh"; sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6";
type = "gem"; type = "gem";
}; };
version = "0.12.0"; version = "0.14.0";
}; };
gpgme = { gpgme = {
dependencies = ["mini_portile2"]; dependencies = ["mini_portile2"];
@ -2854,10 +2876,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
type = "gem"; type = "gem";
}; };
version = "0.16.0"; version = "0.16.2";
}; };
memoizable = { memoizable = {
dependencies = ["thread_safe"]; dependencies = ["thread_safe"];
@ -3562,10 +3584,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
type = "gem"; type = "gem";
}; };
version = "1.0.0"; version = "1.1.1";
}; };
parallel = { parallel = {
groups = ["development" "test"]; groups = ["development" "test"];
@ -4250,10 +4272,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn"; sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
type = "gem"; type = "gem";
}; };
version = "3.25.0"; version = "3.26.0";
}; };
rqrcode = { rqrcode = {
dependencies = ["chunky_png"]; dependencies = ["chunky_png"];
@ -4458,10 +4480,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; sha256 = "0d3dyx2z41zd6va9dwn3q8caf710vzdaf57xspc0y17aqmnprwnw";
type = "gem"; type = "gem";
}; };
version = "0.7.2"; version = "0.8.0";
}; };
ruby-fogbugz = { ruby-fogbugz = {
dependencies = ["crack"]; dependencies = ["crack"];
@ -4663,6 +4685,16 @@
}; };
version = "0.8.2"; version = "0.8.2";
}; };
scientist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09565ppvd851zxpspn5d5q28wqkfjyfxhvda9w80i16p3y937155";
type = "gem";
};
version = "1.5.0";
};
scss_lint = { scss_lint = {
dependencies = ["sass"]; dependencies = ["sass"];
groups = ["development" "test"]; groups = ["development" "test"];
@ -5374,10 +5406,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "066hkh3ihzhrp5a9knjgqqfi5dyv4z5hfrpdj4fpgxjkvkfaxivy"; sha256 = "1hxqza44pvk6x6vb91cvllhw71hqziby06dk1s94rh9f6khbl1nm";
type = "gem"; type = "gem";
}; };
version = "1.0.10"; version = "1.0.11";
}; };
version_sorter = { version_sorter = {
groups = ["default"]; groups = ["default"];

44
pkgs/applications/version-management/gitlab/update.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix #! nix-shell -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log yarn2nix
import click import click
import click_log import click_log
@ -83,10 +83,10 @@ def _get_data_json():
return json.load(f) return json.load(f)
def _call_update_source_version(pkg, version): def _call_nix_update(pkg, version):
"""calls update-source-version from nixpkgs root dir""" """calls nix-update from nixpkgs root dir"""
nixpkgs_path = pathlib.Path(__file__).parent / '../../../../' nixpkgs_path = pathlib.Path(__file__).parent / '../../../../'
return subprocess.check_output(['update-source-version', pkg, version], cwd=nixpkgs_path) return subprocess.check_output(['nix-update', pkg, '--version', version], cwd=nixpkgs_path)
@click_log.simple_verbosity_option(logger) @click_log.simple_verbosity_option(logger)
@ -168,20 +168,10 @@ def update_gitaly():
with open(gitaly_dir / fn, 'w') as f: with open(gitaly_dir / fn, 'w') as f:
f.write(repo.get_file(f"ruby/{fn}", f"v{gitaly_server_version}")) f.write(repo.get_file(f"ruby/{fn}", f"v{gitaly_server_version}"))
for fn in ['go.mod', 'go.sum']:
with open(gitaly_dir / fn, 'w') as f:
f.write(repo.get_file(fn, f"v{gitaly_server_version}"))
subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir) subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir)
subprocess.check_output(['bundix'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir)
os.environ['GOROOT'] = "" _call_nix_update('gitaly', gitaly_server_version)
subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitaly_dir)
for fn in ['go.mod', 'go.sum']:
os.unlink(gitaly_dir / fn)
_call_update_source_version('gitaly', gitaly_server_version)
@cli.command('update-gitlab-shell') @cli.command('update-gitlab-shell')
@ -189,42 +179,22 @@ def update_gitlab_shell():
"""Update gitlab-shell""" """Update gitlab-shell"""
data = _get_data_json() data = _get_data_json()
gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION'] gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION']
_call_update_source_version('gitlab-shell', gitlab_shell_version) _call_nix_update('gitlab-shell', gitlab_shell_version)
repo = GitLabRepo(repo='gitlab-shell') repo = GitLabRepo(repo='gitlab-shell')
gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell' gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell'
for fn in ['go.mod', 'go.sum']:
with open(gitlab_shell_dir / fn, 'w') as f:
f.write(repo.get_file(fn, f"v{gitlab_shell_version}"))
os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_shell_dir)
for fn in ['go.mod', 'go.sum']:
os.unlink(gitlab_shell_dir / fn)
@cli.command('update-gitlab-workhorse') @cli.command('update-gitlab-workhorse')
def update_gitlab_workhorse(): def update_gitlab_workhorse():
"""Update gitlab-workhorse""" """Update gitlab-workhorse"""
data = _get_data_json() data = _get_data_json()
gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION'] gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION']
_call_update_source_version('gitlab-workhorse', gitlab_workhorse_version) _call_nix_update('gitlab-workhorse', gitlab_workhorse_version)
repo = GitLabRepo('gitlab-org', 'gitlab-workhorse') repo = GitLabRepo('gitlab-org', 'gitlab-workhorse')
gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse' gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse'
for fn in ['go.mod', 'go.sum']:
with open(gitlab_workhorse_dir / fn, 'w') as f:
f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}"))
os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_workhorse_dir)
for fn in ['go.mod', 'go.sum']:
os.unlink(gitlab_workhorse_dir / fn)
@cli.command('update-all') @cli.command('update-all')
@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'')
@click.pass_context @click.pass_context

96
pkgs/applications/version-management/gitlab/yarnPkgs.nix
View File

@ -786,19 +786,27 @@
}; };
} }
{ {
name = "_gitlab_svgs___svgs_1.175.0.tgz"; name = "_gitlab_svgs___svgs_1.177.0.tgz";
path = fetchurl { path = fetchurl {
name = "_gitlab_svgs___svgs_1.175.0.tgz"; name = "_gitlab_svgs___svgs_1.177.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz"; url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz";
sha1 = "734f341784af1cd1d62d160a17bcdfb61ff7b04d"; sha1 = "e481ed327a11d3834c8b1668d7485b9eefef97f5";
}; };
} }
{ {
name = "_gitlab_ui___ui_23.9.0.tgz"; name = "_gitlab_tributejs___tributejs_1.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "_gitlab_ui___ui_23.9.0.tgz"; name = "_gitlab_tributejs___tributejs_1.0.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz"; url = "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz";
sha1 = "e21966130b41e624dbe4505911a79afb731c2d6b"; sha1 = "672befa222aeffc83e7d799b0500a7a4418e59b8";
};
}
{
name = "_gitlab_ui___ui_24.8.1.tgz";
path = fetchurl {
name = "_gitlab_ui___ui_24.8.1.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.8.1.tgz";
sha1 = "eb674d19aedf9c91b9a14aa7a66397d54b199fb7";
}; };
} }
{ {
@ -1026,19 +1034,19 @@
}; };
} }
{ {
name = "_toast_ui_editor___editor_2.5.0.tgz"; name = "_toast_ui_editor___editor_2.5.1.tgz";
path = fetchurl { path = fetchurl {
name = "_toast_ui_editor___editor_2.5.0.tgz"; name = "_toast_ui_editor___editor_2.5.1.tgz";
url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.0.tgz"; url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.1.tgz";
sha1 = "02779b119eaa6dd7601249d75ca031e0b98400f1"; sha1 = "42671c52ca4b97c84f684d09c2966711b36f41a7";
}; };
} }
{ {
name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz";
path = fetchurl { path = fetchurl {
name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz";
url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.0.tgz"; url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.1.tgz";
sha1 = "8094136588b0f726241b5f89d0754a7169f2ffee"; sha1 = "0a221d74d5305c8ca20cb11d9eb8ff9206455cfc";
}; };
} }
{ {
@ -4394,11 +4402,11 @@
}; };
} }
{ {
name = "dompurify___dompurify_2.2.2.tgz"; name = "dompurify___dompurify_2.2.4.tgz";
path = fetchurl { path = fetchurl {
name = "dompurify___dompurify_2.2.2.tgz"; name = "dompurify___dompurify_2.2.4.tgz";
url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz"; url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz";
sha1 = "cb8c2b1a2f3c8a0b565127504ae4eedec176a972"; sha1 = "a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410";
}; };
} }
{ {
@ -7433,6 +7441,14 @@
sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c";
}; };
} }
{
name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz";
path = fetchurl {
name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz";
url = "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz";
sha1 = "ce9f56d54650f157c4a7d16d224ba5d613bcd626";
};
}
{ {
name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; name = "jest_regex_util___jest_regex_util_26.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -8938,11 +8954,11 @@
}; };
} }
{ {
name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz";
path = fetchurl { path = fetchurl {
name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz";
url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.4.0.tgz"; url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.5.0.tgz";
sha1 = "556a6090b1816dbf07e51093b652aca84aee979e"; sha1 = "8f0d6a1ba0d349ebde87a1dcd85c7fd353076922";
}; };
} }
{ {
@ -12657,14 +12673,6 @@
sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; sha1 = "03273586def1595ae08fedb38d7733cee91d2479";
}; };
} }
{
name = "tributejs___tributejs_5.1.3.tgz";
path = fetchurl {
name = "tributejs___tributejs_5.1.3.tgz";
url = "https://registry.yarnpkg.com/tributejs/-/tributejs-5.1.3.tgz";
sha1 = "980600fc72865be5868893078b4bfde721129eae";
};
}
{ {
name = "trim_newlines___trim_newlines_1.0.0.tgz"; name = "trim_newlines___trim_newlines_1.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -13466,19 +13474,19 @@
}; };
} }
{ {
name = "vue_loader___vue_loader_15.9.3.tgz"; name = "vue_loader___vue_loader_15.9.5.tgz";
path = fetchurl { path = fetchurl {
name = "vue_loader___vue_loader_15.9.3.tgz"; name = "vue_loader___vue_loader_15.9.5.tgz";
url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz"; url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz";
sha1 = "0de35d9e555d3ed53969516cac5ce25531299dda"; sha1 = "7a960dc420a3439deaacdda038fdcdbf7c432706";
}; };
} }
{ {
name = "vue_router___vue_router_3.4.5.tgz"; name = "vue_router___vue_router_3.4.9.tgz";
path = fetchurl { path = fetchurl {
name = "vue_router___vue_router_3.4.5.tgz"; name = "vue_router___vue_router_3.4.9.tgz";
url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz"; url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz";
sha1 = "d396ec037b35931bdd1e9b7edd86f9788dc15175"; sha1 = "c016f42030ae2932f14e4748b39a1d9a0e250e66";
}; };
} }
{ {
@ -13538,11 +13546,11 @@
}; };
} }
{ {
name = "vuex___vuex_3.5.1.tgz"; name = "vuex___vuex_3.6.0.tgz";
path = fetchurl { path = fetchurl {
name = "vuex___vuex_3.5.1.tgz"; name = "vuex___vuex_3.6.0.tgz";
url = "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz"; url = "https://registry.yarnpkg.com/vuex/-/vuex-3.6.0.tgz";
sha1 = "f1b8dcea649bc25254cf4f4358081dbf5da18b3d"; sha1 = "95efa56a58f7607c135b053350833a09e01aa813";
}; };
} }
{ {

4
pkgs/development/go-modules/generic/default.nix
View File

@ -46,7 +46,7 @@ with builtins;
let let
args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ]; args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ];
go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = { go-modules = if vendorSha256 != null then stdenv.mkDerivation (let modArgs = {
name = "${name}-go-modules"; name = "${name}-go-modules";
@ -119,7 +119,7 @@ let
} }
) // overrideModAttrs modArgs) else ""; ) // overrideModAttrs modArgs) else "";
package = go.stdenv.mkDerivation (args // { package = stdenv.mkDerivation (args // {
nativeBuildInputs = [ go ] ++ nativeBuildInputs; nativeBuildInputs = [ go ] ++ nativeBuildInputs;
inherit (go) GOOS GOARCH; inherit (go) GOOS GOARCH;

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ntirpc"; pname = "ntirpc";
version = "3.3"; version = "3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nfs-ganesha"; owner = "nfs-ganesha";
repo = "ntirpc"; repo = "ntirpc";
rev = "v${version}"; rev = "v${version}";
sha256 = "08vc2z9sl1p9mk1mx0zn4xv7dw12gamhciy41fbavm90iavf3vqm"; sha256 = "1xdwqyc9m4lbsgr7ll1g0f84c2h8jrfkg67cgvsp424i1a7r9mm1";
}; };
postPatch = '' postPatch = ''

77
pkgs/development/libraries/vtk/7.x.nix
View File

@ -1,74 +1,9 @@
{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff import ./generic.nix {
, fetchpatch
, qtLib ? null
, enablePython ? false, python ? null
# Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }:
with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "7.1"; majorVersion = "7.1";
minorVersion = "1"; minorVersion = "1";
version = "${majorVersion}.${minorVersion}"; sourceSha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
in patchesToFetch = [{
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff";
stdenv.mkDerivation rec { sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx";
name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; }];
src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
};
patches = [
(fetchpatch {
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff";
sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ libtiff ]
++ optional (qtLib != null) qtLib
++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ]
++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
CFNetwork Security ApplicationServices CoreText
IOSurface ImageIO OpenGL GLUT ]
++ optional enablePython [
python
];
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ];
preBuild = ''
export LD_LIBRARY_PATH="$(pwd)/lib";
'';
# Shared libraries don't work, because of rpath troubles with the current
# nixpkgs cmake approach. It wants to call a binary at build time, just
# built and requiring one of the shared objects.
# At least, we use -fPIC for other packages to be able to use this in shared
# objects.
cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ]
++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ]
++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
'';
enableParallelBuilding = true;
meta = {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = "https://www.vtk.org/";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
platforms = with stdenv.lib.platforms; unix;
};
} }

9
pkgs/development/libraries/vtk/8.x.nix Normal file
View File

@ -0,0 +1,9 @@
import ./generic.nix {
majorVersion = "8.2";
minorVersion = "0";
sourceSha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl";
patchesToFetch = [{
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab.diff";
sha256 = "0qdahp4f4gcaznr28j06d5fyxiis774ys0p335aazf7h51zb8rzy";
}];
}

94
pkgs/development/libraries/vtk/9.x.nix
View File

@ -1,95 +1,5 @@
{ stdenv, mkDerivation, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff import ./generic.nix {
, fetchpatch
, enableQt ? false, qtbase, qtx11extras, qttools
, enablePython ? false, python ? null
# Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }:
with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "9.0"; majorVersion = "9.0";
minorVersion = "1"; minorVersion = "1";
version = "${majorVersion}.${minorVersion}"; sourceSha256 = "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v";
in
mkDerivation rec {
name = "vtk-${os enableQt "qvtk-"}${version}";
src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
sha256 = "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libtiff ]
++ optionals enableQt [ qtbase qtx11extras qttools ]
++ optionals stdenv.isLinux [
libGLU
libGL
libX11
xorgproto
libXt
] ++ optionals stdenv.isDarwin [
xpc
Cocoa
CoreServices
DiskArbitration
IOKit
CFNetwork
Security
ApplicationServices
CoreText
IOSurface
ImageIO
OpenGL
GLUT
]
++ optional enablePython [
python
];
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ];
preBuild = ''
export LD_LIBRARY_PATH="$(pwd)/lib";
'';
# Shared libraries don't work, because of rpath troubles with the current
# nixpkgs cmake approach. It wants to call a binary at build time, just
# built and requiring one of the shared objects.
# At least, we use -fPIC for other packages to be able to use this in shared
# objects.
cmakeFlags = [
"-DCMAKE_C_FLAGS=-fPIC"
"-DCMAKE_CXX_FLAGS=-fPIC"
"-DVTK_USE_SYSTEM_TIFF=1"
"-DOPENGL_INCLUDE_DIR=${libGL}/include"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_BINDIR=bin"
]
++ optionals enableQt [ "-DVTK_Group_Qt:BOOL=ON" ]
++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
++ optionals enablePython [
"-DVTK_WRAP_PYTHON:BOOL=ON"
"-DVTK_PYTHON_VERSION:STRING=3"
];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = "https://www.vtk.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ tfmoraes ];
platforms = with platforms; unix;
};
} }

75
pkgs/development/libraries/vtk/default.nix
View File

@ -1,75 +0,0 @@
{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
, fetchpatch
, qtLib ? null
, enablePython ? false, python ? null
# Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }:
with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "8.2";
minorVersion = "0";
version = "${majorVersion}.${minorVersion}";
in
stdenv.mkDerivation rec {
name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
sha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl";
};
patches = [
# Fix compilation with Qt 5.15
(fetchpatch {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch?id=3ca9613d7ad604c93d714e29b116952561e4e41c";
sha256 = "sha256-BFjoKws1hVD3Ly9RS4lGN62J6RTyI1E8ATHrZdzg7ds=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ libtiff ]
++ optionals (qtLib != null) (with qtLib; [ qtbase qtx11extras qttools ])
++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ]
++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
CFNetwork Security ApplicationServices CoreText
IOSurface ImageIO OpenGL GLUT ]
++ optional enablePython [
python
];
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ];
preBuild = ''
export LD_LIBRARY_PATH="$(pwd)/lib";
'';
# Shared libraries don't work, because of rpath troubles with the current
# nixpkgs cmake approach. It wants to call a binary at build time, just
# built and requiring one of the shared objects.
# At least, we use -fPIC for other packages to be able to use this in shared
# objects.
cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ]
++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ]
++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
'';
enableParallelBuilding = true;
meta = {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = "https://www.vtk.org/";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
platforms = with stdenv.lib.platforms; unix;
};
}

96
pkgs/development/libraries/vtk/generic.nix Normal file
View File

@ -0,0 +1,96 @@
{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:
{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
, fetchpatch
, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools
, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
# Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc
}:
let
inherit (lib) optionalString optionals optional;
pythonMajor = lib.substring 0 1 pythonInterpreter.pythonVersion;
in stdenv.mkDerivation rec {
pname = "vtk${optionalString enableQt "-qvtk"}";
version = "${majorVersion}.${minorVersion}";
src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
sha256 = sourceSha256;
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libtiff ]
++ optionals enableQt [ qtbase qtx11extras qttools ]
++ optionals stdenv.isLinux [
libGLU
libGL
libX11
xorgproto
libXt
] ++ optionals stdenv.isDarwin [
xpc
Cocoa
CoreServices
DiskArbitration
IOKit
CFNetwork
Security
ApplicationServices
CoreText
IOSurface
ImageIO
OpenGL
GLUT
] ++ optional enablePython [
pythonInterpreter
];
propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ];
patches = map fetchpatch patchesToFetch;
preBuild = ''
export LD_LIBRARY_PATH="$(pwd)/lib";
'';
# Shared libraries don't work, because of rpath troubles with the current
# nixpkgs cmake approach. It wants to call a binary at build time, just
# built and requiring one of the shared objects.
# At least, we use -fPIC for other packages to be able to use this in shared
# objects.
cmakeFlags = [
"-DCMAKE_C_FLAGS=-fPIC"
"-DCMAKE_CXX_FLAGS=-fPIC"
"-DVTK_USE_SYSTEM_TIFF=1"
"-DOPENGL_INCLUDE_DIR=${libGL}/include"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_BINDIR=bin"
]
++ optionals enableQt [ "-DVTK_Group_Qt:BOOL=ON" ]
++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
++ optionals enablePython [
"-DVTK_WRAP_PYTHON:BOOL=ON"
"-DVTK_PYTHON_VERSION:STRING=${pythonMajor}"
];
postPatch = optionalString stdenv.isDarwin ''
sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = "https://www.vtk.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ];
platforms = with platforms; unix;
};
}

46
pkgs/development/libraries/xed/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, fetchFromGitHub, python3Packages }:
let
# mbuild is a custom build system used only to build xed
mbuild = python3Packages.buildPythonPackage rec {
pname = "mbuild";
version = "0.2496-dev";
src = fetchFromGitHub {
owner = "intelxed";
repo = "mbuild";
rev = "3e8eb33aada4153c21c4261b35e5f51f6e2019e8";
sha256 = "0yamgzkzw4v6x1a857psw9f7i62ydgd0zaqrf33dbdg8hfd2mq3q";
};
};
in stdenv.mkDerivation rec {
pname = "xed";
version = "12.0.1";
src = fetchFromGitHub {
owner = "intelxed";
repo = "xed";
rev = version;
sha256 = "07zfff8zf29c2n0wal87hiqfq3cwcjn80zz78mz0nyjfj09nd39f";
};
nativeBuildInputs = [ mbuild ];
buildPhase = ''
patchShebangs mfile.py
# this will build, test and install
./mfile.py test --prefix $out
'';
dontInstall = true; # already installed during buildPhase
meta = with stdenv.lib; {
description = "Intel X86 Encoder Decoder (Intel XED)";
homepage = "https://intelxed.github.io/";
license = licenses.apsl20;
platforms = platforms.unix;
maintainers = with maintainers; [ arturcygan ];
};
}

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

@ -28,7 +28,7 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "PyMySQL>=0.9,<=0.9.2" "PyMySQL" --replace "PyMySQL>=0.9,<=0.9.3" "PyMySQL"
''; '';
checkPhase = '' checkPhase = ''

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

@ -3,6 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, python , python
, isPy27 , isPy27
, pythonAtLeast
, pinqSupport ? false, sqlalchemy , pinqSupport ? false, sqlalchemy
, pyxlSupport ? false, pyxl3 , pyxlSupport ? false, pyxl3
}: }:
@ -34,5 +35,6 @@ buildPythonPackage rec {
description = "Macros in Python: quasiquotes, case classes, LINQ and more"; description = "Macros in Python: quasiquotes, case classes, LINQ and more";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];
broken = pythonAtLeast "3.8"; # see https://github.com/lihaoyi/macropy/issues/103
}; };
} }

6
pkgs/development/tools/misc/sccache/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
version = "0.2.13"; version = "0.2.14";
pname = "sccache"; pname = "sccache";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla"; owner = "mozilla";
repo = "sccache"; repo = "sccache";
rev = version; rev = version;
sha256 = "19z9fdkn3bnr8q33m66h2by6bs6kmhw3a2lq2n8bywmnhrjwhxpw"; sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind";
}; };
cargoSha256 = "1pm7il0x7i9mqx4vsmkcs8nq0dqr5ck3x3x7la6k39igaxn9vkwz"; cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda";
cargoBuildFlags = [ "--features=all" ]; cargoBuildFlags = [ "--features=all" ];
nativeBuildInputs = [ nativeBuildInputs = [

19
pkgs/games/osu-lazer/default.nix
View File

@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "osu-lazer"; pname = "osu-lazer";
version = "2020.1204.0"; version = "2020.1225.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ppy"; owner = "ppy";
repo = "osu"; repo = "osu";
rev = version; rev = version;
sha256 = "1yr9rkkmm15lgbfbrvpyp0d66i5v2xs39abw8yv6qlf70qh4bsg5"; sha256 = "BISczC4xYcF6m5l3ye/bdZxs/aK0Jz6sFVFOgNDo0v0=";
}; };
patches = [ ./bypass-tamper-detection.patch ]; patches = [ ./bypass-tamper-detection.patch ];
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export DOTNET_NOLOGO=1
nuget sources Add -Name nixos -Source "$PWD/nixos" nuget sources Add -Name nixos -Source "$PWD/nixos"
nuget init "$nugetDeps" "$PWD/nixos" nuget init "$nugetDeps" "$PWD/nixos"
@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
mkdir -p $HOME/.nuget/NuGet mkdir -p $HOME/.nuget/NuGet
cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet
dotnet restore --source "$PWD/nixos" osu.Desktop dotnet restore --source "$PWD/nixos" osu.Desktop --runtime ${runtimeId}
runHook postConfigure runHook postConfigure
''; '';
@ -59,6 +59,7 @@ in stdenv.mkDerivation rec {
dotnet build osu.Desktop \ dotnet build osu.Desktop \
--no-restore \ --no-restore \
--configuration Release \ --configuration Release \
--runtime ${runtimeId} \
-p:Version=${version} -p:Version=${version}
runHook postBuild runHook postBuild
''; '';
@ -69,10 +70,9 @@ in stdenv.mkDerivation rec {
dotnet publish osu.Desktop \ dotnet publish osu.Desktop \
--no-build \ --no-build \
--configuration Release \ --configuration Release \
--runtime ${runtimeId} \
--no-self-contained \ --no-self-contained \
--output $out/lib/osu --output $out/lib/osu
shopt -s extglob
rm -r $out/lib/osu/runtimes/!(${runtimeId})
makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \ makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \
--set DOTNET_ROOT "${dotnet-netcore}" \ --set DOTNET_ROOT "${dotnet-netcore}" \
@ -93,6 +93,13 @@ in stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
fixupPhase = ''
runHook preFixup
cp -f ${./osu.runtimeconfig.json} "$out/lib/osu/osu!.runtimeconfig.json"
ln -sft $out/lib/osu ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}
runHook postFixup
'';
# Strip breaks the executable. # Strip breaks the executable.
dontStrip = true; dontStrip = true;

758
pkgs/games/osu-lazer/deps.nix generated
View File

File diff suppressed because it is too large Load Diff

9
pkgs/games/osu-lazer/osu.runtimeconfig.json Normal file
View File

@ -0,0 +1,9 @@
{
"runtimeOptions": {
"tfm": "netcoreapp3.1",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "3.1.0"
}
}
}

4
pkgs/games/osu-lazer/update.sh
View File

@ -5,7 +5,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
deps_file="$(realpath "./deps.nix")" deps_file="$(realpath "./deps.nix")"
new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases" | jq -r '.[0].name')" new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')"
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
if [[ "$new_version" == "$old_version" ]]; then if [[ "$new_version" == "$old_version" ]]; then
echo "Up to date" echo "Up to date"
@ -36,7 +36,7 @@ cat >./nuget_tmp.config <<EOF
</configuration> </configuration>
EOF EOF
dotnet restore osu.Desktop --configfile ./nuget_tmp.config dotnet restore osu.Desktop --configfile ./nuget_tmp.config --runtime linux-x64
echo "{ fetchNuGet }: [" >"$deps_file" echo "{ fetchNuGet }: [" >"$deps_file"
while read pkg_spec; do while read pkg_spec; do

33
pkgs/os-specific/linux/cpuset/default.nix
View File

@ -1,27 +1,44 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, python2Packages , fetchpatch
, pythonPackages
}: }:
python2Packages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "cpuset"; pname = "cpuset";
version = "1.5.8"; version = "1.6";
propagatedBuildInputs = [ ]; propagatedBuildInputs = with pythonPackages; [
configparser
future
];
# https://github.com/lpechacek/cpuset/pull/36
patches = [
(fetchpatch {
url = "https://github.com/MawKKe/cpuset/commit/a4b6b275d0a43d2794ab9e82922d3431aeea9903.patch";
sha256 = "1mi1xrql81iczl67s4dk2rm9r1mk36qhsa19wn7zgryf95krsix2";
})
];
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=$(out)" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wykurz"; owner = "lpechacek";
repo = "cpuset"; repo = "cpuset";
rev = "v${version}"; rev = "v${version}";
sha256 = "19fl2sn470yrnm2q508giggjwy5b6r2gd94gvwfbdlhf0r9dsbbm"; sha256 = "0ig0ml2zd5542d0989872vmy7cs3qg7nxwa93k42bdkm50amhar4";
}; };
checkPhase = ''
cd t
make
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier"; description = "Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier";
homepage = "https://github.com/wykurz/cpuset"; homepage = "https://github.com/lpechacek/cpuset";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ wykurz ]; maintainers = with maintainers; [ thiagokokada wykurz ];
}; };
} }

3
pkgs/tools/misc/kermit/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
-e 's@/usr/local@'"$out"@ makefile -e 's@/usr/local@'"$out"@ makefile
''; '';
buildPhase = "make -f makefile linux LNKFLAGS='-lcrypt -lresolv'"; buildPhase = "make -f makefile linux KFLAGS='-D_IO_file_flags' LNKFLAGS='-lcrypt -lresolv'";
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
@ -35,6 +35,5 @@ stdenv.mkDerivation {
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux; platforms = with platforms; linux;
broken = true;
}; };
} }

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that # The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported # downloads break constantly. Because of that, updates should always be backported
# to the latest stable release. # to the latest stable release.
version = "2020.12.22"; version = "2020.12.26";
src = fetchurl { src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0v7pyrdii8yqcx9pjl6r46qj7ljjmwmwkrd5sghf1vmgfwacx5fc"; sha256 = "1kqfrci4qg6bx7ywzppidjqxsx1c4l5psmwqcylw66bs0s442fwy";
}; };
nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeBuildInputs = [ installShellFiles makeWrapper ];

38
pkgs/tools/security/naabu/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ buildGoModule
, fetchFromGitHub
, lib
, libpcap
}:
buildGoModule rec {
pname = "naabu";
version = "2.0.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "naabu";
rev = "v${version}";
sha256 = "05iybf7q3y0piyw202yzld89fiz2dv2pmnpm1pd905phk5a23n1x";
};
vendorSha256 = "111qvkqdcdgir3dz267xckzlnfx72flnyi7ki7fa6ml7mkfyf70y";
buildInputs = [ libpcap ];
preBuild = ''
mv v2/* .
'';
meta = with lib; {
description = "Fast SYN/CONNECT port scanner";
longDescription = ''
Naabu is a port scanning tool written in Go that allows you to enumerate
valid ports for hosts in a fast and reliable manner. It is a really simple
tool that does fast SYN/CONNECT scans on the host/list of hosts and lists
all ports that return a reply.
'';
homepage = "https://github.com/projectdiscovery/naabu";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

21
pkgs/top-level/all-packages.nix
View File

@ -5349,6 +5349,8 @@ in
mxisd = callPackage ../servers/mxisd { }; mxisd = callPackage ../servers/mxisd { };
naabu = callPackage ../tools/security/naabu { };
nagstamon = callPackage ../tools/misc/nagstamon { nagstamon = callPackage ../tools/misc/nagstamon {
pythonPackages = python3Packages; pythonPackages = python3Packages;
}; };
@ -16497,16 +16499,14 @@ in
vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
vtk = callPackage ../development/libraries/vtk { vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix {
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT; CoreText IOSurface ImageIO OpenGL GLUT;
}; };
vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix {
vtk_7 = callPackage ../development/libraries/vtk/7.x.nix {
stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv;
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
@ -16522,6 +16522,9 @@ in
CoreText IOSurface ImageIO OpenGL GLUT; CoreText IOSurface ImageIO OpenGL GLUT;
}; };
vtk = vtk_8;
vtkWithQt5 = vtk.override { enableQt = true; };
vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
@ -16529,8 +16532,6 @@ in
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
vtkWithQt5 = vtk.override { qtLib = qt515; };
vxl = callPackage ../development/libraries/vxl { vxl = callPackage ../development/libraries/vxl {
libpng = libpng12; libpng = libpng12;
stdenv = gcc6Stdenv; # upstream code incompatible with gcc7 stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
@ -16644,6 +16645,8 @@ in
xdo = callPackage ../tools/misc/xdo { }; xdo = callPackage ../tools/misc/xdo { };
xed = callPackage ../development/libraries/xed { };
xineLib = callPackage ../development/libraries/xine-lib { }; xineLib = callPackage ../development/libraries/xine-lib { };
xautolock = callPackage ../misc/screensavers/xautolock { }; xautolock = callPackage ../misc/screensavers/xautolock { };
@ -18134,7 +18137,9 @@ in
cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
cpuset = callPackage ../os-specific/linux/cpuset { }; cpuset = callPackage ../os-specific/linux/cpuset {
pythonPackages = python3Packages;
};
criu = callPackage ../os-specific/linux/criu { }; criu = callPackage ../os-specific/linux/criu { };
@ -23207,6 +23212,8 @@ in
station = callPackage ../applications/networking/station { }; station = callPackage ../applications/networking/station { };
stochas = callPackage ../applications/audio/stochas { };
synapse = callPackage ../applications/misc/synapse { }; synapse = callPackage ../applications/misc/synapse { };
synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {

13
pkgs/top-level/python-packages.nix
View File

@ -7746,8 +7746,17 @@ in {
vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { };
vtk = toPythonModule (pkgs.vtk_7.override { vtk = self.vtk_7;
inherit (self) python; vtk_7 = toPythonModule (pkgs.vtk_7.override {
pythonInterpreter = python;
enablePython = true;
});
vtk_8 = toPythonModule (pkgs.vtk_8.override {
pythonInterpreter = python;
enablePython = true;
});
vtk_9 = toPythonModule (pkgs.vtk_9.override {
pythonInterpreter = python;
enablePython = true; enablePython = true;
}); });