lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

Project import generated by Copybara.

Browse source 
GitOrigin-RevId: 2f47650c2f28d87f86ab807b8a339c684d91ec56
This commit is contained in:
Default email 2020-12-27 15:24:52 +01:00
parent 7d0493cacd
commit 63d5dadb9d
94 changed files with 4121 additions and 1680 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix vendored Normal file
View file

@ -0,0 +1,27 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkOption mkIf types;
cfg = config.hardware.keyboard.zsa;
in
{
# TODO: make group configurable like in https://github.com/NixOS/nixpkgs/blob/0b2b4b8c4e729535a61db56468809c5c2d3d175c/pkgs/tools/security/nitrokey-app/udev-rules.nix ?
options.hardware.keyboard.zsa = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enables udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I.
You need it when you want to flash a new configuration on the keyboard
or use their live training in the browser.
Access to the keyboard is granted to users in the "plugdev" group.
You may want to install the wally-cli package.
'';
};
};
config = mkIf cfg.enable {
services.udev.packages = [ pkgs.zsa-udev-rules ];
users.groups.plugdev = {};
};
}

1
third_party/nixpkgs/nixos/modules/module-list.nix vendored
View file

@ -47,6 +47,7 @@
./hardware/digitalbitbox.nix
./hardware/device-tree.nix
./hardware/sensor/iio.nix
./hardware/keyboard/zsa.nix
./hardware/ksm.nix
./hardware/ledger.nix
./hardware/logitech.nix

4
third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix vendored
View file

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

9
third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix vendored
View file

@ -126,6 +126,13 @@ let
</IfModule>
'';
luaSetPaths = ''
<IfModule mod_lua.c>
LuaPackageCPath ${cfg.package.lua5}/lib/lua/${cfg.package.lua5.lua.luaversion}/?.so
LuaPackagePath ${cfg.package.lua5}/share/lua/${cfg.package.lua5.lua.luaversion}/?.lua
</IfModule>
'';
mkVHostConf = hostOpts:
let
adminAddr = if hostOpts.adminAddr != null then hostOpts.adminAddr else cfg.adminAddr;
@ -326,6 +333,8 @@ let
${sslConf}
${if cfg.package.luaSupport then luaSetPaths else ""}
# Fascist default - deny access to everything.
<Directory />
Options FollowSymLinks

4
third_party/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix vendored
View file

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

6
third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix vendored
View file

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

2309
third_party/nixpkgs/pkgs/applications/audio/netease-music-tui/cargo-lock.patch vendored Normal file
View file

File diff suppressed because it is too large Load diff

28
third_party/nixpkgs/pkgs/applications/audio/netease-music-tui/default.nix vendored Normal file
View file

@ -0,0 +1,28 @@
{ fetchFromGitHub, rustPlatform, lib, alsaLib, pkg-config, openssl }:
rustPlatform.buildRustPackage rec {
pname = "netease-music-tui";
version = "v0.1.2";
src = fetchFromGitHub {
owner = "betta-cyber";
repo = "netease-music-tui";
rev = "${version}";
sha256 = "0m5b3q493d32kxznm4apn56216l07b1c49km236i03mpfvdw7m1f";
};
cargoPatches = [ ./cargo-lock.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsaLib openssl ];
cargoSha256 = "1kfbnwy3lkbhz0ggxwr5n6qd1plipkr1ycr3z2r7c0amrzzbkc7l";
verifyCargoDeps = true;
meta = with lib; {
homepage = "https://github.com/betta-cyber/netease-music-tui";
description = "netease cloud music terminal client by rust";
maintainers = with maintainers; [ vonfry ];
license = licenses.mit;
};
}

33
third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix vendored 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
third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix vendored
View file

@ -1,4 +1,4 @@
{ channel, pname, version, build, sha256Hash }:
{ channel, pname, version, build ? null, sha256Hash }:
{ alsaLib
, bash
@ -53,11 +53,13 @@
let
drvName = "android-studio-${channel}-${version}";
filename = "android-studio-" + (if (build != null) then "ide-${build}" else version) + "-linux.tar.gz";
androidStudio = stdenv.mkDerivation {
name = "${drvName}-unwrapped";
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz";
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/${filename}";
sha256 = sha256Hash;
};

11
third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix vendored
View file

@ -14,14 +14,13 @@ let
sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os=";
};
betaVersion = {
version = "4.2.0.17"; # "Android Studio 4.2 Beta 1"
build = "202.6987402";
sha256Hash = "07qr0b1zdzpc1nsi6593518dxp89dcjfp4lznb1d3id8vbqla4i7";
version = "4.2.0.18"; # "Android Studio 4.2 Beta 2"
build = "202.7008469";
sha256Hash = "0323i4mcib84z7bsy801640gadd2k8ps7vr9jbdpb6i9gma6klmh";
};
latestVersion = { # canary & dev
version = "2020.3.1.2"; # "Android Studio Arctic Fox Canary 2"
build = "202.7006259";
sha256Hash = "1d4brfx1fh1vlcjkb0x8hjj2qgz2dl5wbaiy8dj8w03vcf493nc5";
version = "2020.3.1.3"; # "Android Studio Arctic Fox Canary 3"
sha256Hash = "1nx78j3pqr8qgwprnzfy17w9jmkgiqnlbsw91jnslr9p9fd0ixcx";
};
in {
# Attributes are named by their corresponding release channels

5
third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix vendored
View file

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.115.0";
version = "1.118.2";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
sha256 = "0q7gfpzc97fvyvabjdb9a4d3c2qhm4zf5bqgnsj73vkly80kgww8";
sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm";
};
patches = [
@ -106,6 +106,7 @@ stdenv.mkDerivation rec {
Search and replace with RegEx. Extendable by Python plugins and themes.
'';
homepage = "http://www.uvviewsoft.com/cudatext/";
changelog = "http://uvviewsoft.com/cudatext/history.txt";
license = licenses.mpl20;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;

20
third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json vendored
View file

@ -11,18 +11,18 @@
},
"ATFlatControls": {
"owner": "Alexey-T",
"rev": "2020.09.20",
"sha256": "09svn8yyqp6znvfpcxrsybkclh828h5rvah7nhbhk7nrfzj8i63x"
"rev": "2020.11.02",
"sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy"
},
"ATSynEdit": {
"owner": "Alexey-T",
"rev": "2020.10.12",
"sha256": "07vznwwfa3c1jr1cd32yppw0mmmm1ja9bmsxhxlcbnc2nb30n9zr"
"rev": "6560bc35a2cf31399be8713ac189216afabf9f01",
"sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x"
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
"rev": "2020.10.11",
"sha256": "11vx685i85izp7wzb34dalcwlkmkbz1vzva5j9cf2yz1jff1v4qw"
"rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433",
"sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr"
},
"EControl": {
"owner": "Alexey-T",
@ -36,8 +36,8 @@
},
"Python-for-Lazarus": {
"owner": "Alexey-T",
"rev": "2020.07.31",
"sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j"
"rev": "2020.10.23",
"sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn"
},
"Emmet-Pascal": {
"owner": "Alexey-T",
@ -51,7 +51,7 @@
},
"bgrabitmap": {
"owner": "bgrabitmap",
"rev": "v11.2.4",
"sha256": "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md"
"rev": "v11.3.1",
"sha256": "1f95rdpfwqy9fipzybi17nbhq46zj45yjps21p2hplhinrr49n2p"
}
}

4
third_party/nixpkgs/pkgs/applications/kde/yakuake.nix vendored
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdoctools, extra-cmake-modules,
karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications,
knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras
knotifyconfig, konsole, kparts, kwayland, kwindowsystem, qtx11extras
}:
mkDerivation {
@ -9,7 +9,7 @@ mkDerivation {
buildInputs = [
karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
knotifyconfig kparts kwindowsystem qtx11extras
knotifyconfig kparts kwayland kwindowsystem qtx11extras
];
propagatedBuildInputs = [

2
third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix vendored
View file

@ -223,7 +223,7 @@ let
};
in
stdenv.mkDerivation rec {
name = "k3s";
pname = "k3s";
version = k3sVersion;
# Important utilities used by the kubelet, see

16
third_party/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix vendored
View file

@ -1,19 +1,23 @@
{ stdenv, fetchFromGitHub, python3Packages, }:
python3Packages.buildPythonApplication rec {
version = "0.9.7";
version = "0.9.8";
pname = "canto-daemon";
src = fetchFromGitHub {
owner = "themoken";
repo = "canto-next";
rev = "v${version}";
sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n";
sha256 = "0fmsdn28z09bvivdkqcla5bnalky7k744iir25z70bv4pz1jcvnk";
};
propagatedBuildInputs = with python3Packages; [ feedparser ];
meta = {
doCheck = false;
pythonImportsCheck = [ "canto_next" ];
meta = with stdenv.lib; {
description = "Daemon for the canto Atom/RSS feed reader";
longDescription = ''
Canto is an Atom/RSS feed reader for the console that is meant to be
@ -24,8 +28,8 @@ python3Packages.buildPythonApplication rec {
and extensibility using the excellent Python programming language.
'';
homepage = "https://codezen.org/canto-ng/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.devhell ];
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers;[ devhell ];
};
}

4
third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix vendored
View file

@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "mlarchive2maildir";
version = "0.0.8";
version = "0.0.9";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "1din3yay2sas85178v0xr0hbm2396y4dalkcqql1ny9vdm94h6sp";
sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs";
};
nativeBuildInputs = with python3.pkgs; [ setuptools_scm ];

62
third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix vendored Normal file
View file

@ -0,0 +1,62 @@
{ lib, stdenv, fetchFromGitHub
, avahi
, cups
, gnutls
, libjpeg
, libpng
, libusb1
, pkg-config
, withPAMSupport ? true, pam
, zlib
}:
stdenv.mkDerivation rec {
pname = "pappl";
version = "1.0.0";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = pname;
rev = "v${version}";
sha256 = "1cg06v8hxska0hnybnmfda1v4h3ifjir24nx2iqx80kb6jq0hayb";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
pkg-config
];
buildInputs = [
cups
libjpeg
libpng
libusb1
zlib
] ++ lib.optionals (!stdenv.isDarwin) [
# upstream mentions these are not needed for Mac
# see: https://github.com/michaelrsweet/pappl#requirements
avahi
gnutls
] ++ lib.optionals withPAMSupport [
pam
];
# testing requires some networking
# doCheck = true;
doInstallCheck = true;
installCheckPhase = ''
$out/bin/pappl-makeresheader --help
'';
enableParallelBuilding = true;
meta = with lib; {
description = "C-based framework/library for developing CUPS Printer Applications";
homepage = "https://github.com/michaelrsweet/pappl";
license = licenses.asl20;
platforms = platforms.linux; # should also work for darwin, but requires additional work
maintainers = with maintainers; [ jonringer ];
};
}

15
third_party/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix vendored
View file

@ -1,22 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
{ stdenv, fetchFromGitHub, cmake, pkg-config
, uhd, boost, soapysdr
} :
let
version = "0.3.6";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "soapyuhd";
inherit version;
version = "0.4.1";
src = fetchFromGitHub {
owner = "pothosware";
repo = "SoapyUHD";
rev = "soapy-uhd-${version}";
sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7";
sha256 = "14rk9ap9ayks2ma6mygca08yfds9bgfmip8cvwl87l06hwhnlwhj";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ uhd boost soapysdr ];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
@ -28,7 +25,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://github.com/pothosware/SoapyAirspy";
description = "SoapySDR plugin for UHD devices";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ markuskowa ];
platforms = platforms.linux;
};

6
third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix vendored
View file

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

14
third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json vendored
View file

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

2
third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile vendored
View file

@ -1,7 +1,7 @@
source 'https://rubygems.org'
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 'activesupport', '~> 6.0.3.3'
gem 'rdoc', '~> 6.0'

6
third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock vendored
View file

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

20
third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix vendored
View file

@ -4,6 +4,18 @@
, libgit2, openssl, zlib, pcre, http-parser }:
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 {
name = "gitaly-env";
inherit ruby;
@ -21,17 +33,17 @@ let
};
};
in buildGoModule rec {
version = "13.6.1";
version = "13.7.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "02w7pf7l9sr2nk8ky9b0d5b4syx3d9my65h2kzvh2afk7kv35h5y";
sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb";
};
vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r";
vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187";
passthru = {
inherit rubyEnv;
@ -39,7 +51,7 @@ in buildGoModule rec {
buildFlags = [ "-tags=static,system_libgit2" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ];
doCheck = false;
postInstall = ''

8
third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix vendored
View file

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

4
third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix vendored
View file

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

6
third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix vendored
View file

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

24
third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile vendored
View file

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

68
third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock vendored
View file

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

118
third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix vendored
View file

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

44
third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py vendored
View file

@ -1,5 +1,5 @@
#!/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_log
@ -83,10 +83,10 @@ def _get_data_json():
return json.load(f)
def _call_update_source_version(pkg, version):
"""calls update-source-version from nixpkgs root dir"""
def _call_nix_update(pkg, version):
"""calls nix-update from nixpkgs root dir"""
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)
@ -168,20 +168,10 @@ def update_gitaly():
with open(gitaly_dir / fn, 'w') as f:
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(['bundix'], cwd=gitaly_dir)
os.environ['GOROOT'] = ""
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)
_call_nix_update('gitaly', gitaly_server_version)
@cli.command('update-gitlab-shell')
@ -189,42 +179,22 @@ def update_gitlab_shell():
"""Update gitlab-shell"""
data = _get_data_json()
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')
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')
def update_gitlab_workhorse():
"""Update gitlab-workhorse"""
data = _get_data_json()
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')
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')
@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'')
@click.pass_context

96
third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix vendored
View file

@ -786,19 +786,27 @@
};
}
{
name = "_gitlab_svgs___svgs_1.175.0.tgz";
name = "_gitlab_svgs___svgs_1.177.0.tgz";
path = fetchurl {
name = "_gitlab_svgs___svgs_1.175.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz";
sha1 = "734f341784af1cd1d62d160a17bcdfb61ff7b04d";
name = "_gitlab_svgs___svgs_1.177.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz";
sha1 = "e481ed327a11d3834c8b1668d7485b9eefef97f5";
};
}
{
name = "_gitlab_ui___ui_23.9.0.tgz";
name = "_gitlab_tributejs___tributejs_1.0.0.tgz";
path = fetchurl {
name = "_gitlab_ui___ui_23.9.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz";
sha1 = "e21966130b41e624dbe4505911a79afb731c2d6b";
name = "_gitlab_tributejs___tributejs_1.0.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz";
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 {
name = "_toast_ui_editor___editor_2.5.0.tgz";
url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.0.tgz";
sha1 = "02779b119eaa6dd7601249d75ca031e0b98400f1";
name = "_toast_ui_editor___editor_2.5.1.tgz";
url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.1.tgz";
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 {
name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz";
url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.0.tgz";
sha1 = "8094136588b0f726241b5f89d0754a7169f2ffee";
name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz";
url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.1.tgz";
sha1 = "0a221d74d5305c8ca20cb11d9eb8ff9206455cfc";
};
}
{
@ -4394,11 +4402,11 @@
};
}
{
name = "dompurify___dompurify_2.2.2.tgz";
name = "dompurify___dompurify_2.2.4.tgz";
path = fetchurl {
name = "dompurify___dompurify_2.2.2.tgz";
url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz";
sha1 = "cb8c2b1a2f3c8a0b565127504ae4eedec176a972";
name = "dompurify___dompurify_2.2.4.tgz";
url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz";
sha1 = "a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410";
};
}
{
@ -7433,6 +7441,14 @@
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";
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 {
name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz";
url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.4.0.tgz";
sha1 = "556a6090b1816dbf07e51093b652aca84aee979e";
name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz";
url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.5.0.tgz";
sha1 = "8f0d6a1ba0d349ebde87a1dcd85c7fd353076922";
};
}
{
@ -12657,14 +12673,6 @@
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";
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 {
name = "vue_loader___vue_loader_15.9.3.tgz";
url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz";
sha1 = "0de35d9e555d3ed53969516cac5ce25531299dda";
name = "vue_loader___vue_loader_15.9.5.tgz";
url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz";
sha1 = "7a960dc420a3439deaacdda038fdcdbf7c432706";
};
}
{
name = "vue_router___vue_router_3.4.5.tgz";
name = "vue_router___vue_router_3.4.9.tgz";
path = fetchurl {
name = "vue_router___vue_router_3.4.5.tgz";
url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz";
sha1 = "d396ec037b35931bdd1e9b7edd86f9788dc15175";
name = "vue_router___vue_router_3.4.9.tgz";
url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz";
sha1 = "c016f42030ae2932f14e4748b39a1d9a0e250e66";
};
}
{
@ -13538,11 +13546,11 @@
};
}
{
name = "vuex___vuex_3.5.1.tgz";
name = "vuex___vuex_3.6.0.tgz";
path = fetchurl {
name = "vuex___vuex_3.5.1.tgz";
url = "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz";
sha1 = "f1b8dcea649bc25254cf4f4358081dbf5da18b3d";
name = "vuex___vuex_3.6.0.tgz";
url = "https://registry.yarnpkg.com/vuex/-/vuex-3.6.0.tgz";
sha1 = "95efa56a58f7607c135b053350833a09e01aa813";
};
}
{

2
third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix vendored
View file

@ -28,7 +28,7 @@ mkXfceDerivation {
# Fix build with libical 3.0
(fetchpatch {
name = "fix-libical3.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f";
url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10";
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
})
];

4
third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix vendored
View file

@ -46,7 +46,7 @@ with builtins;
let
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";
@ -119,7 +119,7 @@ let
}
) // overrideModAttrs modArgs) else "";
package = go.stdenv.mkDerivation (args // {
package = stdenv.mkDerivation (args // {
nativeBuildInputs = [ go ] ++ nativeBuildInputs;
inherit (go) GOOS GOARCH;

15
third_party/nixpkgs/pkgs/development/libraries/boost/1.75.nix vendored Normal file
View file

@ -0,0 +1,15 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.75.0";
src = fetchurl {
urls = [
"mirror://sourceforge/boost/boost_1_75_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_75_0.html
sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb";
};
})

21
third_party/nixpkgs/pkgs/development/libraries/entt/default.nix vendored Normal file
View file

@ -0,0 +1,21 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "entt";
version = "3.5.2";
src = fetchFromGitHub {
owner = "skypjack";
repo = "entt";
rev = "v${version}";
sha256 = "1p09p1wn8cbj17z83iyyy2498wy1gzyi2mmqi5i2cxglslbm6hy0";
};
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
homepage = "https://github.com/skypjack/entt";
description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++";
maintainers = with maintainers; [ twey ];
license = licenses.mit;
};
}

4
third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix vendored
View file

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

58
third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix vendored
View file

@ -1,53 +1,69 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig
, gobject-introspection, glib, systemd, libgudev, vala
, usbutils, which, python3 }:
{ stdenv
, docbook_xsl
, fetchurl
, glib
, gobject-introspection
, gtk-doc
, libgudev
, meson
, ninja
, pkg-config
, python3
, systemd
, usbutils
, vala
, which
}:
stdenv.mkDerivation rec {
pname = "umockdev";
version = "0.13.1";
version = "0.15.2";
outputs = [ "bin" "out" "dev" "doc" ];
src = fetchurl {
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla";
sha256 = "19f21qb9ckwvlm7yzpnc0vcp092qbkms2yrafc26b9a63v4imj52";
};
patches = [
./fix-test-paths.patch
# https://github.com/NixOS/nixpkgs/commit/9960a2be9b32a6d868046c5bfa188b9a0dd66682#commitcomment-34734461
./disable-failed-test.patch
# https://github.com/martinpitt/umockdev/pull/93
(fetchpatch {
url = "https://github.com/abbradar/umockdev/commit/ce22f893bf50de0b32760238a3e2cfb194db89e9.patch";
sha256 = "01q3qhs30x8hl23iigimsa2ikbiw8y8y0bpmh02mh1my87shpwnx";
})
mesonFlags = [
"-Dgtk_doc=true"
];
# autoreconfHook complains if we try to build the documentation
postPatch = ''
echo 'EXTRA_DIST =' > docs/gtk-doc.make
'';
preCheck = ''
patchShebangs tests/test-static-code
'';
buildInputs = [ glib systemd libgudev ];
nativeBuildInputs = [ pkgconfig vala gobject-introspection ];
nativeBuildInputs = [
docbook_xsl
gobject-introspection
gtk-doc
meson
ninja
pkg-config
vala
];
checkInputs = [ python3 which usbutils ];
enableParallelBuilding = true;
# Test fail with libusb 1.0.24
# https://github.com/NixOS/nixpkgs/issues/107420
# https://github.com/martinpitt/umockdev/issues/115
doCheck = false;
postInstall = ''
mkdir -p $doc/share/doc/umockdev/
mv docs/reference $doc/share/doc/umockdev/
'';
meta = with stdenv.lib; {
description = "Mock hardware devices for creating unit tests";
license = licenses.lgpl2;
maintainers = with maintainers; [];
maintainers = with maintainers; [ flokli ];
platforms = with platforms; linux;
};
}

73
third_party/nixpkgs/pkgs/development/libraries/vtk/7.x.nix vendored
View file

@ -1,74 +1,9 @@
{ 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;
import ./generic.nix {
majorVersion = "7.1";
minorVersion = "1";
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 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
};
patches = [
(fetchpatch {
sourceSha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
patchesToFetch = [{
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
third_party/nixpkgs/pkgs/development/libraries/vtk/8.x.nix vendored 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
third_party/nixpkgs/pkgs/development/libraries/vtk/9.x.nix vendored
View file

@ -1,95 +1,5 @@
{ stdenv, mkDerivation, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
, 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;
import ./generic.nix {
majorVersion = "9.0";
minorVersion = "1";
version = "${majorVersion}.${minorVersion}";
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;
};
sourceSha256 = "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v";
}

75
third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix vendored
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
third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix vendored 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
third_party/nixpkgs/pkgs/development/libraries/xed/default.nix vendored 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
third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix vendored
View file

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

4
third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix vendored
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "0.14.0";
version = "0.15.0";
disabled = isPy27;
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
sha256 = "0k5dhhlypilpa7h6ncqldvc14bv70c8mb2bbj7vyzfwahy57zb29";
sha256 = "0w34xs9qpf1x4rq2ri4fhx3yi8h4inzavv9hjsx8mlkzid7gdx1b";
};
propagatedBuildInputs = [

4
third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix vendored
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "ciscomobilityexpress";
version = "0.3.9";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0kj0i1963afxqw9apk0yxzj1f7kpi1949ggnkzkb8v90kxpgymma";
sha256 = "fd3fe893d8a44f5ac1d46580af88e07f1066e73744763aca4ef2226f87d575ff";
};
propagatedBuildInputs = [ requests ];

12
third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix vendored
View file

@ -14,6 +14,7 @@
, python-baseconv
, pyyaml
, uvicorn
, httpx
# Check Inputs
, pytestCheckHook
, pytestrunner
@ -26,13 +27,13 @@
buildPythonPackage rec {
pname = "datasette";
version = "0.46";
version = "0.53";
src = fetchFromGitHub {
owner = "simonw";
repo = "datasette";
rev = version;
sha256 = "0g4dfq5ykifa9628cb4i7gvx98p8hvb99gzfxk3bkvq1v9p4kcqq";
sha256 = "1rsgxkvav1qy2ia2csm1jvabd8klh3ly8719979gdlx2il1cjjkz";
};
nativeBuildInputs = [ pytestrunner ];
@ -52,6 +53,8 @@ buildPythonPackage rec {
pyyaml
uvicorn
setuptools
httpx
asgiref
];
checkInputs = [
@ -59,7 +62,6 @@ buildPythonPackage rec {
pytest-asyncio
aiohttp
beautifulsoup4
asgiref
];
postConfigure = ''
@ -75,9 +77,9 @@ buildPythonPackage rec {
# takes 30-180 mins to run entire test suite, not worth the cpu resources, slows down reviews
# with pytest-xdist, it still takes around 10mins with 32 cores
# just run the messages tests, as this should give some indictation of correctness
# just run the csv tests, as this should give some indictation of correctness
pytestFlagsArray = [
"tests/test_messages.py"
"tests/test_csv.py"
];
disabledTests = [
"facet"

4
third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix vendored
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-storages";
version = "1.11";
version = "1.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "7af56611c62a1c174aab4e862efb7fdd98296dccf76f42135f5b6851fc313c97";
sha256 = "c823dbf56c9e35b0999a13d7e05062b837bae36c518a40255d522fbe3750fbb4";
};
propagatedBuildInputs = [ django ];

7
third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix vendored
View file

@ -2,19 +2,18 @@
, buildPythonPackage
, fetchPypi
, django
, six
}:
buildPythonPackage rec {
pname = "django-contrib-comments";
version = "1.9.2";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "d1232bade3094de07dcc205fc833204384e71ba9d30caadcb5bb2882ce8e8d31";
sha256 = "26350b2c353816570a74b7fb19c558ce00288625ac32886a5274f4f931c098f9";
};
propagatedBuildInputs = [ django six ];
propagatedBuildInputs = [ django ];
meta = with stdenv.lib; {
homepage = "https://github.com/django/django-contrib-comments";

4
third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix vendored
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-Testing";
version = "0.8.0";
version = "0.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "1rkkqgmrzmhpv6y1xysqh0ij03xniic8h631yvghksqwxd9vyjfq";
sha256 = "0a734d7b68e63a9410b413cd7b1f96456f9a858bd09a6222d465650cc782eb01";
};
postPatch = ''

6
third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix vendored
View file

@ -12,6 +12,7 @@
, sympy
, matplotlib
, reportlab
, sphinx
, pytest
, pytest-randomly
, glibcLocales
@ -19,14 +20,14 @@
buildPythonPackage rec {
pname = "fonttools";
version = "4.14.0";
version = "4.18.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in";
sha256 = "0h750gvwpsp7fpmgfwkx93gkaf0m1s698g6r7n4xlaji563nlkiv";
};
# all dependencies are optional, but
@ -53,6 +54,7 @@ buildPythonPackage rec {
matplotlib
# pens
reportlab
sphinx
];
preCheck = ''

2
third_party/nixpkgs/pkgs/development/python-modules/macropy/default.nix vendored
View file

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

9
third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix vendored
View file

@ -2,6 +2,7 @@
, nixosTests
, buildPythonPackage
, fetchPypi
, substituteAll
, pkgs
, argcomplete
, pyyaml
@ -23,6 +24,13 @@ buildPythonPackage rec {
sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl";
};
patches = [
(substituteAll {
src = ./jq-path.patch;
jq = "${lib.getBin pkgs.jq}/bin/jq";
})
];
postPatch = ''
substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
'';
@ -39,7 +47,6 @@ buildPythonPackage rec {
pytest
coverage
flake8
pkgs.jq
toml
];

26
third_party/nixpkgs/pkgs/development/python-modules/yq/jq-path.patch vendored Normal file
View file

@ -0,0 +1,26 @@
diff --git a/test/test.py b/test/test.py
index a81f41b..9e80f04 100755
--- a/test/test.py
+++ b/test/test.py
@@ -112,7 +112,7 @@ class TestYq(unittest.TestCase):
tf2.seek(0)
self.assertEqual(self.run_yq("", ["-y", arg, tf.name, self.fd_path(tf2)]), '1\n...\n')
- @unittest.skipIf(subprocess.check_output(["jq", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6")
+ @unittest.skipIf(subprocess.check_output(["@jq@", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6")
def test_jq16_arg_passthrough(self):
self.assertEqual(self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]),
"a:\n- a\n- b\n")
diff --git a/yq/__init__.py b/yq/__init__.py
index afeb42c..a0d7970 100755
--- a/yq/__init__.py
+++ b/yq/__init__.py
@@ -146,7 +146,7 @@ def yq(input_streams=None, output_stream=None, input_format="yaml", output_forma
try:
# Note: universal_newlines is just a way to induce subprocess to make stdin a text buffer and encode it for us
- jq = subprocess.Popen(["jq"] + list(jq_args),
+ jq = subprocess.Popen(["@jq@"] + list(jq_args),
stdin=subprocess.PIPE,
stdout=subprocess.PIPE if converting_output else None,
universal_newlines=True)

10
third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix vendored
View file

@ -2,21 +2,21 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.27.0";
version = "0.36.10";
src = fetchFromGitHub {
owner = "liamg";
owner = "tfsec";
repo = pname;
rev = "v${version}";
sha256 = "12n6l18g0kg28clzyzwc2lq9rnch3vshp07isgvfp7193bhf8hyv";
sha256 = "11kv13d4cw515r79azfha1ksmvsha1rvg0jak9nvz9ggivyn0s7a";
};
goPackagePath = "github.com/liamg/tfsec";
goPackagePath = "github.com/tfsec/tfsec";
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ];
meta = with lib; {
homepage = "https://github.com/liamg/tfsec";
homepage = "https://github.com/tfsec/tfsec";
description = "Static analysis powered security scanner for your terraform code";
license = licenses.mit;
maintainers = [ maintainers.marsam ];

24
third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix vendored
View file

@ -1,8 +1,8 @@
{ lib, python3Packages, fetchpatch }:
{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "litecli";
version = "1.4.1";
version = "1.5.0";
# Python 2 won't have prompt_toolkit 2.x.x
# See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408
@ -10,17 +10,9 @@ python3Packages.buildPythonApplication rec {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w=";
sha256 = "b09f0804d26b018360b240778612390810e8e00ea0f79d5412fd0d4775c0e3cd";
};
patches = [
# Fix compatibility with sqlparse >= 0.4.0. Remove with the next release
(fetchpatch {
url = "https://github.com/dbcli/litecli/commit/37957e401d22f88800bbdec2c690e731f2cc13bd.patch";
sha256 = "1x82s2h1rzflyiahyd8pfya30rzs6yx6ij4a4s16f8iix5x35zv9";
})
];
propagatedBuildInputs = with python3Packages; [
cli-helpers
click
@ -31,23 +23,17 @@ python3Packages.buildPythonApplication rec {
];
checkInputs = with python3Packages; [
pytest
pytestCheckHook
mock
];
preCheck = ''
export XDG_CONFIG_HOME=$TMP
# add missing file
mkdir -p tests/data
echo -e "t1,11\nt2,22\n" > tests/data/import_data.csv
'';
meta = with lib; {
description = "Command-line interface for SQLite";
longDescription = ''
A command-line client for SQLite databases that has auto-completion and syntax highlighting.
'';
homepage = "https://litecli.com";
changelog = "https://github.com/dbcli/litecli/blob/v${version}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ Scriptkiddi ];
};

63
third_party/nixpkgs/pkgs/development/tools/database/pgcli/default.nix vendored
View file

@ -1,52 +1,61 @@
{ buildPythonApplication, lib, fetchPypi, isPy3k, fetchpatch
, cli-helpers, click, configobj, humanize, prompt_toolkit, psycopg2
, pygments, sqlparse, pgspecial, setproctitle, keyring, pytest, mock
{ stdenv
, buildPythonApplication
, fetchPypi
, isPy3k
, cli-helpers
, click
, configobj
, humanize
, prompt_toolkit
, psycopg2
, pygments
, sqlparse
, pgspecial
, setproctitle
, keyring
, pendulum
, pytestCheckHook
, mock
}:
buildPythonApplication rec {
pname = "pgcli";
version = "3.0.0";
version = "3.1.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "10j01bd031fys1vcihibsi5rrfd8w1kgahpcsbk4l07871c24829";
sha256 = "d5b2d803f7e4e7fe679306a000bde5d14d15ec590ddd108f3dc4c0ecad169d2b";
};
propagatedBuildInputs = [
cli-helpers click configobj humanize prompt_toolkit psycopg2
pygments sqlparse pgspecial setproctitle keyring
cli-helpers
click
configobj
humanize
prompt_toolkit
psycopg2
pygments
sqlparse
pgspecial
setproctitle
keyring
pendulum
];
patches = [
(fetchpatch {
name = "enable-sqlparse-4.patch";
url = "https://github.com/dbcli/pgcli/pull/1224/commits/55d534d41051887c637b6300e08a9f70e6656020.patch";
sha256 = "01r8qc7qzb6mz0xq2xnrgyackbapf43ng6l88qpzd9lw2pwksc8w";
includes = [ "pgcli/packages/parseutils/ctes.py" "tests/test_sqlcompletion.py" "setup.py" ];
})
];
checkInputs = [ pytestCheckHook mock ];
postPatch = ''
substituteInPlace setup.py \
--replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit"
'';
disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ];
checkInputs = [ pytest mock ];
# `test_application_name_db_uri` fails: https://github.com/dbcli/pgcli/issues/1104
checkPhase = ''
pytest --deselect=tests/test_main.py::test_application_name_db_uri
'';
meta = with lib; {
meta = with stdenv.lib; {
description = "Command-line interface for PostgreSQL";
longDescription = ''
Rich command-line interface for PostgreSQL with auto-completion and
syntax highlighting.
'';
homepage = "https://pgcli.com";
changelog = "https://github.com/dbcli/pgcli/blob/v${version}/changelog.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ dywedir ];
};

6
third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix vendored
View file

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

19
third_party/nixpkgs/pkgs/games/osu-lazer/default.nix vendored
View file

@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
version = "2020.1204.0";
version = "2020.1225.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "1yr9rkkmm15lgbfbrvpyp0d66i5v2xs39abw8yv6qlf70qh4bsg5";
sha256 = "BISczC4xYcF6m5l3ye/bdZxs/aK0Jz6sFVFOgNDo0v0=";
};
patches = [ ./bypass-tamper-detection.patch ];
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
export HOME=$(mktemp -d)
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 init "$nugetDeps" "$PWD/nixos"
@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
mkdir -p $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
'';
@ -59,6 +59,7 @@ in stdenv.mkDerivation rec {
dotnet build osu.Desktop \
--no-restore \
--configuration Release \
--runtime ${runtimeId} \
-p:Version=${version}
runHook postBuild
'';
@ -69,10 +70,9 @@ in stdenv.mkDerivation rec {
dotnet publish osu.Desktop \
--no-build \
--configuration Release \
--runtime ${runtimeId} \
--no-self-contained \
--output $out/lib/osu
shopt -s extglob
rm -r $out/lib/osu/runtimes/!(${runtimeId})
makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \
--set DOTNET_ROOT "${dotnet-netcore}" \
@ -93,6 +93,13 @@ in stdenv.mkDerivation rec {
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.
dontStrip = true;

758
third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix generated vendored
View file

File diff suppressed because it is too large Load diff

9
third_party/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json vendored Normal file
View file

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

4
third_party/nixpkgs/pkgs/games/osu-lazer/update.sh vendored
View file

@ -5,7 +5,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
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)"
if [[ "$new_version" == "$old_version" ]]; then
echo "Up to date"
@ -36,7 +36,7 @@ cat >./nuget_tmp.config <<EOF
</configuration>
EOF
dotnet restore osu.Desktop --configfile ./nuget_tmp.config
dotnet restore osu.Desktop --configfile ./nuget_tmp.config --runtime linux-x64
echo "{ fetchNuGet }: [" >"$deps_file"
while read pkg_spec; do

33
third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix vendored
View file

@ -1,27 +1,44 @@
{ stdenv
, fetchFromGitHub
, python2Packages
, fetchpatch
, pythonPackages
}:
python2Packages.buildPythonApplication rec {
pythonPackages.buildPythonApplication rec {
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)" ];
src = fetchFromGitHub {
owner = "wykurz";
owner = "lpechacek";
repo = "cpuset";
rev = "v${version}";
sha256 = "19fl2sn470yrnm2q508giggjwy5b6r2gd94gvwfbdlhf0r9dsbbm";
sha256 = "0ig0ml2zd5542d0989872vmy7cs3qg7nxwa93k42bdkm50amhar4";
};
checkPhase = ''
cd t
make
'';
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";
homepage = "https://github.com/wykurz/cpuset";
homepage = "https://github.com/lpechacek/cpuset";
license = licenses.gpl2;
maintainers = with maintainers; [ wykurz ];
maintainers = with maintainers; [ thiagokokada wykurz ];
};
}

84
third_party/nixpkgs/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch vendored Normal file
View file

@ -0,0 +1,84 @@
From 55d499f4cd5667c04c21f7201d7f10484e187907 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 27 Dec 2020 13:03:12 +0100
Subject: [PATCH] unit/test-dbus: pick up dbus-daemon from $PATH
This allows running the unit tests in environments where `dbus-daemon`
isn't in /usr/bin, but in $PATH.
Signed-off-by: Florian Klink <flokli@flokli.de>
---
unit/test-dbus-message-fds.c | 4 ++--
unit/test-dbus-properties.c | 4 ++--
unit/test-dbus.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c
index 6f68bae..4b5662e 100644
--- a/unit/test-dbus-message-fds.c
+++ b/unit/test-dbus-message-fds.c
@@ -51,7 +51,7 @@ static bool start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -68,7 +68,7 @@ static bool start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c
index b435062..049f0f4 100644
--- a/unit/test-dbus-properties.c
+++ b/unit/test-dbus-properties.c
@@ -49,7 +49,7 @@ static bool start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -66,7 +66,7 @@ static bool start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
diff --git a/unit/test-dbus.c b/unit/test-dbus.c
index 67f0a7b..582847e 100644
--- a/unit/test-dbus.c
+++ b/unit/test-dbus.c
@@ -45,7 +45,7 @@ static void start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -62,7 +62,7 @@ static void start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
--
2.29.2

3
third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix vendored
View file

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
};
patches = [
./fix-dbus-tests.patch
# Sent upstream in https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/
./0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
];
nativeBuildInputs = [

65
third_party/nixpkgs/pkgs/os-specific/linux/ell/fix-dbus-tests.patch vendored
View file

@ -1,65 +0,0 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,6 +140,7 @@
ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES)
AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \
+ -DDBUS_DAEMON=\""$(DBUS_DAEMONDIR)/dbus-daemon"\" \
-DCERTDIR=\""$(top_builddir)/unit/"\"
pkgconfigdir = $(libdir)/pkgconfig
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,8 @@
AC_PREFIX_DEFAULT(/usr/local)
+PKG_PROG_PKG_CONFIG
+
COMPILER_FLAGS
AC_LANG_C
@@ -131,6 +133,10 @@
AC_CHECK_PROG(have_xxd, [xxd], [yes], [no])
fi
+PKG_CHECK_MODULES(DBUS, dbus-1, dummy=yes,
+ AC_MSG_ERROR(D-Bus is required for running tests))
+PKG_CHECK_VAR(DBUS_DAEMONDIR, dbus-1, daemondir)
+
AM_CONDITIONAL(DBUS_TESTS, test "${little_endian}" = "yes")
AM_CONDITIONAL(CERT_TESTS, test "${have_openssl}" = "yes")
--- a/unit/test-dbus-message-fds.c
+++ b/unit/test-dbus-message-fds.c
@@ -51,7 +51,7 @@
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = DBUS_DAEMON;
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
--- a/unit/test-dbus-properties.c
+++ b/unit/test-dbus-properties.c
@@ -48,7 +48,7 @@
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = DBUS_DAEMON;
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
--- a/unit/test-dbus.c
+++ b/unit/test-dbus.c
@@ -45,7 +45,7 @@
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = DBUS_DAEMON;
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";

12
third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix vendored
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig }:
stdenv.mkDerivation {
pname = "raspberrypi-tools";
@ -13,6 +13,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkgconfig ];
patches = [
(fetchpatch {
# https://github.com/raspberrypi/userland/pull/670
url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
})
];
preConfigure = ''
cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
@ -23,7 +31,7 @@ stdenv.mkDerivation {
description = "Userland tools for the Raspberry Pi board";
homepage = "https://github.com/raspberrypi/userland";
license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
platforms = [ "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ dezgeg tavyc ];
};
}

12
third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix vendored
View file

@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "0gzpdgfwzlqj2n3amf2zhi2hlpa412878yphgx79y6b5gn1y1lm2";
};
outputs = [ "out" "man" "test" ];
outputs = [ "out" "man" ]
++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test";
nativeBuildInputs = [
autoreconfHook
@ -38,7 +39,9 @@ stdenv.mkDerivation rec {
checkInputs = [ openssl ];
pythonPath = [
# wrapPython wraps the scripts in $test. They pull in gobject-introspection,
# which doesn't cross-compile.
pythonPath = stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
python3Packages.dbus-python
python3Packages.pygobject3
];
@ -61,11 +64,12 @@ stdenv.mkDerivation rec {
doCheck = true;
postInstall = ''
mkdir -p $test/bin
cp -a test/* $test/bin/
mkdir -p $out/share
cp -a doc $out/share/
cp -a README AUTHORS TODO $out/share/doc/
'' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
mkdir -p $test/bin
cp -a test/* $test/bin/
'';
preFixup = ''

33
third_party/nixpkgs/pkgs/os-specific/linux/zsa-udev-rules/default.nix vendored Normal file
View file

@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "zsa-udev-rules";
version = "unstable-2020-12-16";
# TODO: use version and source from nixpkgs/pkgs/development/tools/wally-cli/default.nix after next release
src = fetchFromGitHub {
owner = "zsa";
repo = "wally";
rev = "e5dde3c700beab39fb941c6941e55535bf9b2af6";
sha256 = "0pkybi32r1hrmpa1mc8qlzhv7xy5n5rr5ah25lbr0cipp1bda417";
};
# it only installs files
dontConfigure = true;
dontBuild = true;
dontFixup = true;
installPhase = ''
mkdir -p $out/lib/udev/rules.d
cp dist/linux64/50-oryx.rules $out/lib/udev/rules.d/
cp dist/linux64/50-wally.rules $out/lib/udev/rules.d/
'';
meta = with stdenv.lib; {
description = "udev rules for ZSA devices";
license = licenses.mit;
maintainers = with maintainers; [ davidak ];
platforms = platforms.linux;
homepage = "https://github.com/zsa/wally/wiki/Linux-install#2-create-a-udev-rule-file";
};
}

4
third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix vendored
View file

@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "20.11.0.1";
version = "20.11.2.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "0f750wlvm48j5b2fkvhy47zyagxfl6kbn2m9lx0spxwyn9qgh6bn";
sha256 = "02vz386ix28yr2lrn9z0hycqmw1d0npvwvx51fhp2mav66rrx79p";
};
outputs = [ "out" "dev" ];

2
third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix vendored
View file

@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
inherit apr aprutil sslSupport proxySupport ldapSupport;
inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5;
};
meta = with stdenv.lib; {

4
third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix vendored
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "nfs-ganesha";
version = "3.3";
version = "3.4";
src = fetchFromGitHub {
owner = "nfs-ganesha";
repo = "nfs-ganesha";
rev = "V${version}";
sha256 = "1w48rqrbqah0hnirvjdz8lyr9ah8b73j3cgsppb04gnrmpssgmb6";
sha256 = "1qi617ppjjl38mqpbxiqhpxanq9qgqshb87cajs30rqkv9nj811k";
};
patches = [ ./sysstatedir.patch ];

13
third_party/nixpkgs/pkgs/servers/nfs-ganesha/sysstatedir.patch vendored
View file

@ -1,15 +1,22 @@
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 51697310b..2b5f91075 100644
index 2a5795e9f..7314e0594 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -72,8 +72,8 @@
@@ -71,13 +71,13 @@
#cmakedefine HAVE_URCU_REF_GET_UNLESS_ZERO 1
#define NFS_GANESHA 1
#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
-#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
-#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid"
-#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha"
+#define GANESHA_CONFIG_PATH "/etc/ganesha/ganesha.conf"
+#define GANESHA_PIDFILE_PATH "/run/ganesha.pid"
+#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha"
/**
* @brief Default value for krb5_param.ccache_dir
*/
-#define DEFAULT_NFS_CCACHE_DIR "@SYSSTATEDIR@/run/ganesha"
+#define DEFAULT_NFS_CCACHE_DIR "/run/ganesha"
/* We're LGPL'd */
#define _LGPL_SOURCE 1

8
third_party/nixpkgs/pkgs/servers/xandikos/default.nix vendored
View file

@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, python3Packages
, installShellFiles
}:
python3Packages.buildPythonApplication rec {
@ -24,10 +25,17 @@ python3Packages.buildPythonApplication rec {
prometheus_client
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage xandikos.1
'';
meta = with stdenv.lib; {
description = "Lightweight CalDAV/CardDAV server";
homepage = "https://github.com/jelmer/xandikos";
license = licenses.gpl3Plus;
changelog = "https://github.com/jelmer/xandikos/blob/v${version}/NEWS";
maintainers = with maintainers; [ _0x4A6F ];
};
}

7
third_party/nixpkgs/pkgs/tools/admin/clair/default.nix vendored
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clair";
version = "2.1.4";
version = "4.0.0";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
sha256 = "1bvwh3ghxb3ynq8a07ka9i0rzaqg1aikxvqxmpjkwjvhwk63lwqd";
sha256 = "10kgg2i5yzdfhylrdkmh8rsc4cgdnhcgfa8fa4dm8m3licjciwam";
};
vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a";
vendorSha256 = "1l3b86f5xmyc6lskvb4ab30adcgzb69ayccc0wcz2f28sda3i80r";
doCheck = false;
@ -25,6 +25,7 @@ buildGoModule rec {
meta = with lib; {
description = "Vulnerability Static Analysis for Containers";
homepage = "https://github.com/quay/clair";
changelog = "https://github.com/quay/clair/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ marsam ];
};

44
third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix vendored Normal file
View file

@ -0,0 +1,44 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "credhub-cli";
version = "2.9.0";
src = fetchFromGitHub {
owner = "cloudfoundry-incubator";
repo = "credhub-cli";
rev = version;
sha256 = "1j0i0b79ph2i52cj0qln8wvp6gwhl73akkn026h27vvmlw9sndc2";
};
# these tests require network access that we're not going to give them
postPatch = ''
rm commands/api_test.go
rm commands/socks5_test.go
'';
__darwinAllowLocalNetworking = true;
vendorSha256 = null;
buildFlagsArray = [
"-ldflags="
"-s"
"-w"
"-X code.cloudfoundry.org/credhub-cli/version.Version=${version}"
];
postInstall = ''
ln -s $out/bin/credhub-cli $out/bin/credhub
'';
preCheck = ''
export HOME=$TMPDIR
'';
meta = with stdenv.lib; {
description = "Provides a command line interface to interact with CredHub servers";
homepage = "https://github.com/cloudfoundry-incubator/credhub-cli";
maintainers = with maintainers; [ ris ];
license = licenses.asl20;
};
}

4
third_party/nixpkgs/pkgs/tools/backup/borg/default.nix vendored
View file

@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "borgbackup";
version = "1.1.14";
version = "1.1.15";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "1fpdj73cgp96xwasdcifxl7q2pr1my2f4vfdjpv771llri3hgfvx";
sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9";
};
nativeBuildInputs = with python3.pkgs; [

5
third_party/nixpkgs/pkgs/tools/graphics/jhead/default.nix vendored
View file

@ -43,5 +43,10 @@ stdenv.mkDerivation rec {
license = licenses.publicDomain;
maintainers = with maintainers; [ rycee ];
platforms = platforms.all;
# https://github.com/NixOS/nixpkgs/issues/90828
knownVulnerabilities = [
"CVE-2020-6624"
"CVE-2020-6625"
];
};
}

5
third_party/nixpkgs/pkgs/tools/misc/kermit/default.nix vendored
View file

@ -16,12 +16,12 @@ stdenv.mkDerivation {
tar xvzf $src
'';
patchPhase = ''
postPatch = ''
sed -i -e 's@-I/usr/include/ncurses@@' \
-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 = ''
mkdir -p $out/bin
@ -35,6 +35,5 @@ stdenv.mkDerivation {
license = licenses.bsd3;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux;
broken = true;
};
}

4
third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix vendored
View file

@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "you-get";
version = "0.4.1488";
version = "0.4.1500";
# Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway.
@ -10,7 +10,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
sha256 = "28aec2f15e86ea1cbf9900827ade41388aa3f1ac43b4ab49999bce48f37cf9c3";
sha256 = "5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92";
};
meta = with stdenv.lib; {

4
third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix vendored
View file

@ -18,11 +18,11 @@ buildPythonPackage rec {
# 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
# to the latest stable release.
version = "2020.12.22";
version = "2020.12.26";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0v7pyrdii8yqcx9pjl6r46qj7ljjmwmwkrd5sghf1vmgfwacx5fc";
sha256 = "1kqfrci4qg6bx7ywzppidjqxsx1c4l5psmwqcylw66bs0s442fwy";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

4
third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix vendored
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z-lua";
version = "1.8.7";
version = "1.8.10";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "z.lua";
rev = version;
sha256 = "14n1abv7gh4zajq471bgzpcv8l1159g00h9x83h719i9kxxsa2ba";
sha256 = "0q0qs07kmkpjv68j2bjgsrv6shl76mssnchfv82vjf8abkf8343b";
};
dontBuild = true;

3
third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix vendored
View file

@ -1,4 +1,5 @@
{ stdenv
, pkgs
, fetchurl
, fetchpatch
, zlib
@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]
++ optional (hpnSupport || withGssapiPatches) autoreconfHook
++ optional withKerberos kerberos.dev;
++ optional withKerberos pkgs.kerberos.dev;
buildInputs = [ zlib openssl libedit pam ]
++ optional withFIDO libfido2
++ optional withKerberos kerberos;

31
third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix vendored Normal file
View file

@ -0,0 +1,31 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
}:
buildGoModule rec {
pname = "proxify";
version = "0.0.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "proxify";
rev = "v${version}";
sha256 = "15j2q9zrs8bdf72jgldkai3xbi4irk69wyjzv48r74rdgf2k49gn";
};
vendorSha256 = "1x78n88ri8kph827k03x1q06zpbbbp7793xsvc376ljda5n6bqig";
meta = with stdenv.lib; {
description = "Proxy tool for HTTP/HTTPS traffic capture";
longDescription = ''
This tool supports multiple operations such as request/response dump, filtering
and manipulation via DSL language, upstream HTTP/Socks5 proxy. Additionally a
replay utility allows to import the dumped traffic (request/responses with correct
domain name) into other tools by simply setting the upstream proxy to proxify.
'';
homepage = "https://github.com/projectdiscovery/proxify";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

38
third_party/nixpkgs/pkgs/tools/security/naabu/default.nix vendored 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 ];
};
}

30
third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix vendored
View file

@ -1,19 +1,35 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ stdenv
, lib
, fetchFromGitHub
, buildGoModule
, pcsclite
, PCSC
, pkg-config
}:
buildGoPackage rec {
buildGoModule rec {
pname = "step-ca";
version = "0.13.3";
goPackagePath = "github.com/smallstep/certificates";
version = "0.15.6";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
sha256 = "1i42j7v5a5qqqb9ng8irblfyzykhyws0394q3zac290ymjijxbnq";
sha256 = "0n26692ph4q4cmrqammfazmx1k9p2bydwqc57q4hz5ni6jd31zbz";
};
goDeps = ./deps.nix;
vendorSha256 = "0w0phyqymcg2h2jjasxmkf4ryn4y1bqahcy94rs738cqr5ifyfbg";
nativeBuildInputs = [ pkg-config ];
buildInputs =
lib.optional stdenv.isLinux (lib.getDev pcsclite)
++ lib.optional stdenv.isDarwin PCSC;
# Tests fail on darwin with
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered]
# probably some sandboxing issue
doCheck = stdenv.isLinux;
meta = with lib; {
description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH";

291
third_party/nixpkgs/pkgs/tools/security/step-ca/deps.nix generated vendored
View file

@ -1,291 +0,0 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/AndreasBriese/bbloom";
fetch = {
type = "git";
url = "https://github.com/AndreasBriese/bbloom";
rev = "e2d15f34fcf99d5dbb871c820ec73f710fca9815";
sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds";
};
}
{
goPackagePath = "github.com/chzyer/readline";
fetch = {
type = "git";
url = "https://github.com/chzyer/readline";
rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
};
}
{
goPackagePath = "github.com/dgraph-io/badger";
fetch = {
type = "git";
url = "https://github.com/dgraph-io/badger";
rev = "391b6d3b93e6014fe8c2971fcc0c1266e47dbbd9";
sha256 = "13zyd6irxagwfv4azgmpk2qg8f80plhxrcjl8x89jzsjkl0a0pkx";
};
}
{
goPackagePath = "github.com/dgryski/go-farm";
fetch = {
type = "git";
url = "https://github.com/dgryski/go-farm";
rev = "6a90982ecee230ff6cba02d5bd386acc030be9d3";
sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
};
}
{
goPackagePath = "github.com/go-chi/chi";
fetch = {
type = "git";
url = "https://github.com/go-chi/chi";
rev = "0ebf7795c516423a110473652e9ba3a59a504863";
sha256 = "18hwj6vni19ykp3bsmg9ggnl6y2hawym0vbsigdgx8craqbp7jb1";
};
}
{
goPackagePath = "github.com/go-sql-driver/mysql";
fetch = {
type = "git";
url = "https://github.com/go-sql-driver/mysql";
rev = "72cd26f257d44c1114970e19afddcd812016007e";
sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "aa810b61a9c79d51363740d207bb46cf8e620ed5";
sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
};
}
{
goPackagePath = "github.com/juju/ansiterm";
fetch = {
type = "git";
url = "https://github.com/juju/ansiterm";
rev = "720a0952cc2ac777afc295d9861263e2a4cf96a1";
sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h";
};
}
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
type = "git";
url = "https://github.com/konsorten/go-windows-terminal-sequences";
rev = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242";
sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
};
}
{
goPackagePath = "github.com/lunixbochs/vtclean";
fetch = {
type = "git";
url = "https://github.com/lunixbochs/vtclean";
rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41";
sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf";
};
}
{
goPackagePath = "github.com/manifoldco/promptui";
fetch = {
type = "git";
url = "https://github.com/manifoldco/promptui";
rev = "157c96fb638a14d268b305cf2012582431fcc410";
sha256 = "0zha48i5f529q4j1qycybdzza4l9706hijiqws36ikd5jzg8i7wz";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
};
}
{
goPackagePath = "github.com/mmcloughlin/avo";
fetch = {
type = "git";
url = "https://github.com/mmcloughlin/avo";
rev = "2e7d06bc7ada2979f17ccf8ebf486dba23b84fc7";
sha256 = "0fna1hhg193zy428lkj24a8853g3qviqs2c9xi96mji6ldprna5d";
};
}
{
goPackagePath = "github.com/newrelic/go-agent";
fetch = {
type = "git";
url = "https://github.com/newrelic/go-agent";
rev = "f5bce3387232559bcbe6a5f8227c4bf508dac1ba";
sha256 = "1zbp1cqhxp0sz3faymam6h1f91r1gl8dnnjx7qg8r06bd5fbzllb";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
goPackagePath = "github.com/rs/xid";
fetch = {
type = "git";
url = "https://github.com/rs/xid";
rev = "15d26544def341f036c5f8dca987a4cbe575032c";
sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j";
};
}
{
goPackagePath = "github.com/samfoo/ansi";
fetch = {
type = "git";
url = "https://github.com/samfoo/ansi";
rev = "b6bd2ded7189ce35bc02233b554eb56a5146af73";
sha256 = "0sw2d7c6l2ry34x0n4j37ydr8s7hxnax76yh6n35gb2g6f1h46sz";
};
}
{
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
rev = "86672fcb3f950f35f2e675df2240550f2a50762f";
sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "ad15b42461921f1fb3529b058c6786c6a45d5162";
sha256 = "02xdfcp4f6dqvpavwf1vvr794qgz2fx8929paam7wnvcxy7ib606";
};
}
{
goPackagePath = "github.com/smallstep/assert";
fetch = {
type = "git";
url = "https://github.com/smallstep/assert";
rev = "de77670473b5492f5d0bce155b5c01534c2d13f7";
sha256 = "15z2b4qyylnwgq2pzlaxsdabqxh8dbna4ddprk9rzmsvnfkpds16";
};
}
{
goPackagePath = "github.com/smallstep/cli";
fetch = {
type = "git";
url = "https://github.com/smallstep/cli";
rev = "eeecaac062cb548ee2ab7c7563bc3c2f2160f019";
sha256 = "1khhd1vgwqb08vki1nh0k4i2yk6jjdqmnq4f8anqn125zsj7hvdk";
};
}
{
goPackagePath = "github.com/smallstep/nosql";
fetch = {
type = "git";
url = "https://github.com/smallstep/nosql";
rev = "f80b3f432de0662f07ebd58fe52b0a119fe5dcd9";
sha256 = "155blxdgaprl1py5g8p52gipp0ckz3k6v41hgsp83nay01yynafb";
};
}
{
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b";
sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h";
};
}
{
goPackagePath = "go.etcd.io/bbolt";
fetch = {
type = "git";
url = "https://github.com/etcd-io/bbolt";
rev = "63597a96ec0ad9e6d43c3fc81e809909e0237461";
sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06";
sha256 = "0sbsgjm6wqa162ssrf1gnpv62ak5wjn1bn8v7sxwwfg8a93z1028";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89";
sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75";
sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "54a98f90d1c46b7731eb8fb305d2a321c30ef610";
sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll";
};
}
{
goPackagePath = "gopkg.in/square/go-jose.v2";
fetch = {
type = "git";
url = "https://github.com/square/go-jose";
rev = "730df5f748271903322feb182be83b43ebbbe27d";
sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3";
};
}
]

23
third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix vendored
View file

@ -1,19 +1,26 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
}:
buildGoPackage rec {
buildGoModule rec {
pname = "step-cli";
version = "0.13.3";
goPackagePath = "github.com/smallstep/cli";
version = "0.15.3-22-g3ddc5aa";
# 0.15.3 isn't enough, because we need https://github.com/smallstep/cli/pull/394
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
rev = "v${version}";
sha256 = "0b5hk9a8yq1nyh8m1gmf28yiha95xwsc4dk321g84hvai7g47pbr";
rev = "3ddc5aaafccb23ba9a20abfa70109a2923f298e3";
sha256 = "1kd04hi764xa3f9p6aw6k9f6wa4y6xsmzby5jxvvkhim4w78brw0";
};
goDeps = ./deps.nix;
preCheck = ''
# Tries to connect to smallstep.com
rm command/certificate/remote_test.go
'';
vendorSha256 = "04hckq78g1p04b2q0rq4xw6d880hqhkabbx1pc3pf8r1m6jxwz10";
meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

453
third_party/nixpkgs/pkgs/tools/security/step-cli/deps.nix generated vendored
View file

@ -1,453 +0,0 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/AndreasBriese/bbloom";
fetch = {
type = "git";
url = "https://github.com/AndreasBriese/bbloom";
rev = "e2d15f34fcf99d5dbb871c820ec73f710fca9815";
sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds";
};
}
{
goPackagePath = "github.com/ThomasRooney/gexpect";
fetch = {
type = "git";
url = "https://github.com/ThomasRooney/gexpect";
rev = "5482f03509440585d13d8f648989e05903001842";
sha256 = "04zan78ndabxlwsw2hdcqbz32435pw2s04ljza07jlxnxzjp4kws";
};
}
{
goPackagePath = "github.com/asaskevich/govalidator";
fetch = {
type = "git";
url = "https://github.com/asaskevich/govalidator";
rev = "ccb8e960c48f04d6935e72476ae4a51028f9e22f";
sha256 = "1sih4yb6fqmdp5g6594yyida0qm7dvvqcfvf8pgikydkxyqb8g0k";
};
}
{
goPackagePath = "github.com/boombuler/barcode";
fetch = {
type = "git";
url = "https://github.com/boombuler/barcode";
rev = "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d";
sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd";
};
}
{
goPackagePath = "github.com/chzyer/readline";
fetch = {
type = "git";
url = "https://github.com/chzyer/readline";
rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
};
}
{
goPackagePath = "github.com/corpix/uarand";
fetch = {
type = "git";
url = "https://github.com/corpix/uarand";
rev = "2b8494104d86337cdd41d0a49cbed8e4583c0ab4";
sha256 = "06ml5m8l9wbr96gvyg6z1syawn797f8kmq74nhgry3vqpngyb6yn";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/dgraph-io/badger";
fetch = {
type = "git";
url = "https://github.com/dgraph-io/badger";
rev = "391b6d3b93e6014fe8c2971fcc0c1266e47dbbd9";
sha256 = "13zyd6irxagwfv4azgmpk2qg8f80plhxrcjl8x89jzsjkl0a0pkx";
};
}
{
goPackagePath = "github.com/dgryski/go-farm";
fetch = {
type = "git";
url = "https://github.com/dgryski/go-farm";
rev = "6a90982ecee230ff6cba02d5bd386acc030be9d3";
sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
};
}
{
goPackagePath = "github.com/go-chi/chi";
fetch = {
type = "git";
url = "https://github.com/go-chi/chi";
rev = "0ebf7795c516423a110473652e9ba3a59a504863";
sha256 = "18hwj6vni19ykp3bsmg9ggnl6y2hawym0vbsigdgx8craqbp7jb1";
};
}
{
goPackagePath = "github.com/go-sql-driver/mysql";
fetch = {
type = "git";
url = "https://github.com/go-sql-driver/mysql";
rev = "72cd26f257d44c1114970e19afddcd812016007e";
sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30";
sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
};
}
{
goPackagePath = "github.com/google/certificate-transparency-go";
fetch = {
type = "git";
url = "https://github.com/google/certificate-transparency-go";
rev = "3629d6846518309d22c16fee15d1007262a459d2";
sha256 = "16vsq7dd2kbbk3vwlrhm3jrlg5kq16wf4iz6d1gnyc32s5fcy9d7";
};
}
{
goPackagePath = "github.com/icrowley/fake";
fetch = {
type = "git";
url = "https://github.com/icrowley/fake";
rev = "4178557ae428460c3780a381c824a1f3aceb6325";
sha256 = "1mv4bxfphaqbvacy49v4lf4gf2nmadzpmjq0jbdx93wi5bnkc977";
};
}
{
goPackagePath = "github.com/juju/ansiterm";
fetch = {
type = "git";
url = "https://github.com/juju/ansiterm";
rev = "720a0952cc2ac777afc295d9861263e2a4cf96a1";
sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h";
};
}
{
goPackagePath = "github.com/kballard/go-shellquote";
fetch = {
type = "git";
url = "https://github.com/kballard/go-shellquote";
rev = "95032a82bc518f77982ea72343cc1ade730072f0";
sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80";
};
}
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
type = "git";
url = "https://github.com/konsorten/go-windows-terminal-sequences";
rev = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242";
sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
};
}
{
goPackagePath = "github.com/kr/pty";
fetch = {
type = "git";
url = "https://github.com/kr/pty";
rev = "db8e3cd836b82e82e0a9c8edc6896967dd31374f";
sha256 = "0knzlvndfgjm2k23vhp2xj1cv3fm31vbg5b20gdl1vnxk7rh549h";
};
}
{
goPackagePath = "github.com/lunixbochs/vtclean";
fetch = {
type = "git";
url = "https://github.com/lunixbochs/vtclean";
rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41";
sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf";
};
}
{
goPackagePath = "github.com/manifoldco/promptui";
fetch = {
type = "git";
url = "https://github.com/manifoldco/promptui";
rev = "157c96fb638a14d268b305cf2012582431fcc410";
sha256 = "0zha48i5f529q4j1qycybdzza4l9706hijiqws36ikd5jzg8i7wz";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
};
}
{
goPackagePath = "github.com/mmcloughlin/avo";
fetch = {
type = "git";
url = "https://github.com/mmcloughlin/avo";
rev = "2e7d06bc7ada2979f17ccf8ebf486dba23b84fc7";
sha256 = "0fna1hhg193zy428lkj24a8853g3qviqs2c9xi96mji6ldprna5d";
};
}
{
goPackagePath = "github.com/newrelic/go-agent";
fetch = {
type = "git";
url = "https://github.com/newrelic/go-agent";
rev = "f5bce3387232559bcbe6a5f8227c4bf508dac1ba";
sha256 = "1zbp1cqhxp0sz3faymam6h1f91r1gl8dnnjx7qg8r06bd5fbzllb";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/pquerna/otp";
fetch = {
type = "git";
url = "https://github.com/pquerna/otp";
rev = "b7b89250c468c06871d3837bee02e2d5c155ae19";
sha256 = "0gsl9rh8awira21z6cj26c6swasskx03z66q72yjc1mpbvyg6han";
};
}
{
goPackagePath = "github.com/rs/xid";
fetch = {
type = "git";
url = "https://github.com/rs/xid";
rev = "15d26544def341f036c5f8dca987a4cbe575032c";
sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j";
};
}
{
goPackagePath = "github.com/samfoo/ansi";
fetch = {
type = "git";
url = "https://github.com/samfoo/ansi";
rev = "b6bd2ded7189ce35bc02233b554eb56a5146af73";
sha256 = "0sw2d7c6l2ry34x0n4j37ydr8s7hxnax76yh6n35gb2g6f1h46sz";
};
}
{
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
rev = "86672fcb3f950f35f2e675df2240550f2a50762f";
sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "ad15b42461921f1fb3529b058c6786c6a45d5162";
sha256 = "02xdfcp4f6dqvpavwf1vvr794qgz2fx8929paam7wnvcxy7ib606";
};
}
{
goPackagePath = "github.com/smallstep/assert";
fetch = {
type = "git";
url = "https://github.com/smallstep/assert";
rev = "de77670473b5492f5d0bce155b5c01534c2d13f7";
sha256 = "15z2b4qyylnwgq2pzlaxsdabqxh8dbna4ddprk9rzmsvnfkpds16";
};
}
{
goPackagePath = "github.com/smallstep/certificates";
fetch = {
type = "git";
url = "https://github.com/smallstep/certificates";
rev = "effb490d276f33b8cdab661df8b57a8ded67e082";
sha256 = "1i76bbm4rbpv4cw2ln36v0x74jjkss6j8pdh49hfvb75j2n32790";
};
}
{
goPackagePath = "github.com/smallstep/certinfo";
fetch = {
type = "git";
url = "https://github.com/smallstep/certinfo";
rev = "78e21b44234ef6ddeb58f5e8aad2ed09975b694a";
sha256 = "0zrxql9173vzn7zirv4299j0vw2mzwknivrg8rzhdbkhvbfiql9q";
};
}
{
goPackagePath = "github.com/smallstep/nosql";
fetch = {
type = "git";
url = "https://github.com/smallstep/nosql";
rev = "a0934e12468769d8cbede3ed316c47a4b88de4ca";
sha256 = "08bg0sgrhkzflyl0ybi8v2vmk8bfk5pmcyfrizpxssyql7k27fam";
};
}
{
goPackagePath = "github.com/smallstep/truststore";
fetch = {
type = "git";
url = "https://github.com/smallstep/truststore";
rev = "e16045d94a61ca04b60d5d246da3117e7eeb1ecf";
sha256 = "15cv3dkn2npf6rwhkb575sdq089rf70rha8wrym4ygc8rjbgwbab";
};
}
{
goPackagePath = "github.com/smallstep/zcrypto";
fetch = {
type = "git";
url = "https://github.com/smallstep/zcrypto";
rev = "6bab21fcaafc3d150cf793b6d5f25fe32f49c80e";
sha256 = "129az7k556lmnhh14ayrwzrp1y205zdgwk3rj1xcmgisx5irliqp";
};
}
{
goPackagePath = "github.com/smallstep/zlint";
fetch = {
type = "git";
url = "https://github.com/smallstep/zlint";
rev = "d84eaafe274f9dc1f811ebfbb073e18c466e2a44";
sha256 = "1xm7b1wvbify20vk9f3kmgmi5mnj5x2z3czc0r4zylcqcwwjkfd6";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
};
}
{
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b";
sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h";
};
}
{
goPackagePath = "github.com/weppos/publicsuffix-go";
fetch = {
type = "git";
url = "https://github.com/weppos/publicsuffix-go";
rev = "386050f8211b04c965721c3591e7d96650a1ea86";
sha256 = "17nvc0m0azm418w4mcyk7r1qcik0099vjpn455ia0lxhbqbl701b";
};
}
{
goPackagePath = "go.etcd.io/bbolt";
fetch = {
type = "git";
url = "https://github.com/etcd-io/bbolt";
rev = "63597a96ec0ad9e6d43c3fc81e809909e0237461";
sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06";
sha256 = "0sbsgjm6wqa162ssrf1gnpv62ak5wjn1bn8v7sxwwfg8a93z1028";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89";
sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75";
sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "54a98f90d1c46b7731eb8fb305d2a321c30ef610";
sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll";
};
}
{
goPackagePath = "gopkg.in/square/go-jose.v2";
fetch = {
type = "git";
url = "https://github.com/square/go-jose";
rev = "730df5f748271903322feb182be83b43ebbbe27d";
sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3";
};
}
{
goPackagePath = "howett.net/plist";
fetch = {
type = "git";
url = "https://gitlab.howett.net/go/plist.git";
rev = "591f970eefbbeb04d7b37f334a0c4c3256e32876";
sha256 = "1gr74rf6m8bgayf6mxcfaxb3cc49ldlhydzqfafx7di5nds5hxk9";
};
}
]

33
third_party/nixpkgs/pkgs/tools/security/teler/default.nix vendored Normal file
View file

@ -0,0 +1,33 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
}:
buildGoModule rec {
pname = "teler";
version = "1.0.1";
src = fetchFromGitHub {
owner = "kitabisa";
repo = "teler";
rev = "v${version}";
sha256 = "07pfqgms5cj4y6zm984qjmmw1c8j9yjbgrp2spi9vzk96s3k3qn3";
};
vendorSha256 = "06szi2jw3nayd7pljjlww2gsllgnfg8scnjmc6qv5xl6gf797kdz";
# test require internet access
doCheck = false;
meta = with stdenv.lib; {
description = "Real-time HTTP Intrusion Detection";
longDescription = ''
teler is an real-time intrusion detection and threat alert
based on web log that runs in a terminal with resources that
we collect and provide by the community.
'';
homepage = "https://github.com/kitabisa/teler";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

43
third_party/nixpkgs/pkgs/top-level/all-packages.nix vendored
View file

@ -1886,6 +1886,10 @@ in
cppclean = callPackage ../development/tools/cppclean {};
credhub-cli = callPackage ../tools/admin/credhub-cli {
buildGoModule = buildGo114Module;
};
crex = callPackage ../tools/misc/crex { };
cri-tools = callPackage ../tools/virtualization/cri-tools {};
@ -2609,7 +2613,9 @@ in
statserial = callPackage ../tools/misc/statserial { };
step-ca = callPackage ../tools/security/step-ca { };
step-ca = callPackage ../tools/security/step-ca {
inherit (darwin.apple_sdk.frameworks) PCSC;
};
step-cli = callPackage ../tools/security/step-cli { };
@ -5327,6 +5333,8 @@ in
mxisd = callPackage ../servers/mxisd { };
naabu = callPackage ../tools/security/naabu { };
nagstamon = callPackage ../tools/misc/nagstamon {
pythonPackages = python3Packages;
};
@ -6433,6 +6441,8 @@ in
papertrail = callPackage ../tools/text/papertrail { };
pappl = callPackage ../applications/printing/pappl { };
par2cmdline = callPackage ../tools/networking/par2cmdline { };
parallel = callPackage ../tools/misc/parallel { };
@ -6729,6 +6739,8 @@ in
proxychains = callPackage ../tools/networking/proxychains { };
proxify = callPackage ../tools/networking/proxify { };
proxytunnel = callPackage ../tools/misc/proxytunnel {
openssl = openssl_1_0_2;
};
@ -7691,6 +7703,8 @@ in
pythonPackages = python3Packages;
};
teler = callPackage ../tools/security/teler { };
termius = callPackage ../applications/networking/termius { };
termplay = callPackage ../tools/misc/termplay { };
@ -12501,7 +12515,8 @@ in
boost172 = callPackage ../development/libraries/boost/1.72.nix { };
boost173 = callPackage ../development/libraries/boost/1.73.nix { };
boost174 = callPackage ../development/libraries/boost/1.74.nix { };
boost17x = boost174;
boost175 = callPackage ../development/libraries/boost/1.75.nix { };
boost17x = boost175;
boost = boost16x;
boost_process = callPackage ../development/libraries/boost-process { };
@ -12807,6 +12822,8 @@ in
enet = callPackage ../development/libraries/enet { };
entt = callPackage ../development/libraries/entt { };
epoxy = callPackage ../development/libraries/epoxy {};
libesmtp = callPackage ../development/libraries/libesmtp { };
@ -16426,16 +16443,14 @@ in
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.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT;
};
vtk_7 = callPackage ../development/libraries/vtk/7.x.nix {
stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv;
vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
@ -16451,6 +16466,9 @@ in
CoreText IOSurface ImageIO OpenGL GLUT;
};
vtk = vtk_8;
vtkWithQt5 = vtk.override { enableQt = true; };
vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
@ -16458,8 +16476,6 @@ in
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
vtkWithQt5 = vtk.override { qtLib = qt515; };
vxl = callPackage ../development/libraries/vxl {
libpng = libpng12;
stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
@ -16468,6 +16484,7 @@ in
waffle = callPackage ../development/libraries/waffle { };
wally-cli = callPackage ../development/tools/wally-cli { };
zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { };
wavpack = callPackage ../development/libraries/wavpack { };
@ -16573,6 +16590,8 @@ in
xdo = callPackage ../tools/misc/xdo { };
xed = callPackage ../development/libraries/xed { };
xineLib = callPackage ../development/libraries/xine-lib { };
xautolock = callPackage ../misc/screensavers/xautolock { };
@ -18059,7 +18078,9 @@ in
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 { };
@ -19905,6 +19926,8 @@ in
national-park-typeface = callPackage ../data/fonts/national-park { };
netease-music-tui = callPackage ../applications/audio/netease-music-tui { };
nordic = callPackage ../data/themes/nordic { };
nordic-polar = callPackage ../data/themes/nordic-polar { };
@ -23123,6 +23146,8 @@ in
station = callPackage ../applications/networking/station { };
stochas = callPackage ../applications/audio/stochas { };
synapse = callPackage ../applications/misc/synapse { };
synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {

31
third_party/nixpkgs/pkgs/top-level/perl-packages.nix vendored
View file

@ -13499,6 +13499,22 @@ let
};
};
MojoSAML = buildPerlModule {
pname = "Mojo-SAML";
version = "0.07";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-SAML-0.07.tar.gz";
sha256 = "03biykpz281z9nmd846jlxwzbaqlqwvh987aw9spl7bgvfn4rhkj";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ CryptOpenSSLRSA CryptOpenSSLX509 DataGUID Mojolicious XMLCanonicalizeXML ];
meta = {
description = "A SAML2 toolkit using the Mojo toolkit";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
MojoSQLite = buildPerlModule {
pname = "Mojo-SQLite";
version = "3.004";
@ -22888,6 +22904,21 @@ let
};
};
XMLCanonicalizeXML = buildPerlPackage {
pname = "XML-CanonicalizeXML";
version = "0.10";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SJ/SJZASADA/XML-CanonicalizeXML-0.10.tar.gz";
sha256 = "1vl6wbqmq91mc0hkgfwlndbxcv2jm01hj7kpzprw3d6bh144ca77";
};
buildInputs = [ pkgs.libxml2 ];
meta = {
description = "Perl extension for inclusive (1.0 and 1.1) and exclusive canonicalization of XML using libxml2";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};
XMLDescent = buildPerlModule {
pname = "XML-Descent";
version = "1.04";

13
third_party/nixpkgs/pkgs/top-level/python-packages.nix vendored
View file

@ -7746,8 +7746,17 @@ in {
vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { };
vtk = toPythonModule (pkgs.vtk_7.override {
inherit (self) python;
vtk = self.vtk_7;
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;
});