ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-01-05 16:10:35 +01:00
commit 981b94442b
146 changed files with 3509 additions and 1340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maintainers/maintainer-list.nix
View File

@ -2277,6 +2277,12 @@
githubId = 2512008;
name = "Even Brenden";
};
evils = {
email = "evils.devils@protonmail.com";
github = "evils-devils";
githubId = 30512529;
name = "Evils";
};
exfalso = {
email = "0slemi0@gmail.com";
github = "exfalso";
@ -3554,6 +3560,16 @@
githubId = 87115;
name = "Wael Nasreddine";
};
kamadorueda = {
name = "Kevin Amado";
email = "kamadorueda@gmail.com";
github = "kamadorueda";
githubId = 47480384;
keys = [{
longkeyid = "rsa4096/0x04D0CEAF916A9A40";
fingerprint = "2BE3 BAFD 793E A349 ED1F F00F 04D0 CEAF 916A 9A40";
}];
};
kamilchm = {
email = "kamil.chm@gmail.com";
github = "kamilchm";

14
nixos/doc/manual/configuration/xfce.xml
View File

@ -13,15 +13,15 @@
</programlisting>
</para>
<para>
Optionally, <emphasis>compton</emphasis> can be enabled for nice graphical
Optionally, <emphasis>picom</emphasis> can be enabled for nice graphical
effects, some example settings:
<programlisting>
<link linkend="opt-services.compton.enable">services.compton</link> = {
<link linkend="opt-services.compton.enable">enable</link> = true;
<link linkend="opt-services.compton.fade">fade</link> = true;
<link linkend="opt-services.compton.inactiveOpacity">inactiveOpacity</link> = "0.9";
<link linkend="opt-services.compton.shadow">shadow</link> = true;
<link linkend="opt-services.compton.fadeDelta">fadeDelta</link> = 4;
<link linkend="opt-services.picom.enable">services.picom</link> = {
<link linkend="opt-services.picom.enable">enable</link> = true;
<link linkend="opt-services.picom.fade">fade</link> = true;
<link linkend="opt-services.picom.inactiveOpacity">inactiveOpacity</link> = "0.9";
<link linkend="opt-services.picom.shadow">shadow</link> = true;
<link linkend="opt-services.picom.fadeDelta">fadeDelta</link> = 4;
};
</programlisting>
</para>

25
nixos/doc/manual/man-nixos-install.xml
View File

@ -55,6 +55,13 @@
<replaceable>path</replaceable>
</arg>
<arg>
<arg choice='plain'>
<option>--channel</option>
</arg>
<replaceable>channel</replaceable>
</arg>
<arg>
<arg choice='plain'>
<option>--no-channel-copy</option>
@ -126,6 +133,12 @@
specified in <filename>/mnt/etc/nixos/configuration.nix</filename>.
</para>
</listitem>
<listitem>
<para>
It installs the current channel <quote>nixos</quote> in the target channel
profile (unless <option>--no-channel-copy</option> is specified).
</para>
</listitem>
<listitem>
<para>
It installs the GRUB boot loader on the device specified in the option
@ -202,6 +215,18 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>--channel</option>
</term>
<listitem>
<para>
If this option is provided, do not copy the current
<quote>nixos</quote> channel to the target host. Instead, use the
specified derivation.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>-I</option>

2
nixos/modules/module-list.nix
View File

@ -854,7 +854,7 @@
./services/x11/extra-layouts.nix
./services/x11/clight.nix
./services/x11/colord.nix
./services/x11/compton.nix
./services/x11/picom.nix
./services/x11/unclutter.nix
./services/x11/unclutter-xfixes.nix
./services/x11/desktop-managers/default.nix

17
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -178,6 +178,8 @@ let
then "/etc/nginx/nginx.conf"
else configFile;
execCommand = "${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}'";
vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost:
let
onlySSL = vhost.onlySSL || vhost.enableSSL;
@ -682,10 +684,10 @@ in
stopIfChanged = false;
preStart = ''
${cfg.preStart}
${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}' -t
${execCommand} -t
'';
serviceConfig = {
ExecStart = "${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}'";
ExecStart = execCommand;
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
Restart = "always";
RestartSec = "10s";
@ -706,11 +708,18 @@ in
};
systemd.services.nginx-config-reload = mkIf cfg.enableReload {
wantedBy = [ "nginx.service" ];
wants = [ "nginx.service" ];
wantedBy = [ "multi-user.target" ];
restartTriggers = [ configFile ];
# commented, because can cause extra delays during activate for this config:
# services.nginx.virtualHosts."_".locations."/".proxyPass = "http://blabla:3000";
# stopIfChanged = false;
serviceConfig.Type = "oneshot";
serviceConfig.TimeoutSec = 60;
script = ''
if ${pkgs.systemd}/bin/systemctl -q is-active nginx.service ; then
${pkgs.systemd}/bin/systemctl reload nginx.service
${execCommand} -t && \
${pkgs.systemd}/bin/systemctl reload nginx.service
fi
'';
serviceConfig.RemainAfterExit = true;

32
nixos/modules/services/x11/compton.nix → nixos/modules/services/x11/picom.nix
View File

@ -5,7 +5,7 @@ with builtins;
let
cfg = config.services.compton;
cfg = config.services.picom;
pairOf = x: with types; addCheck (listOf x) (y: length y == 2);
@ -31,20 +31,24 @@ let
(key: value: "${toString key}=${mkValueString value};")
v)
+ " }"
else abort "compton.mkValueString: unexpected type (v = ${v})";
else abort "picom.mkValueString: unexpected type (v = ${v})";
in "${escape [ sep ] k}${sep}${mkValueString v};")
attrs);
configFile = pkgs.writeText "compton.conf" (toConf cfg.settings);
configFile = pkgs.writeText "picom.conf" (toConf cfg.settings);
in {
options.services.compton = {
imports = [
(mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ])
];
options.services.picom = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether of not to enable Compton as the X.org composite manager.
Whether of not to enable Picom as the X.org composite manager.
'';
};
@ -85,7 +89,7 @@ in {
];
description = ''
List of conditions of windows that should not be faded.
See <literal>compton(1)</literal> man page for more examples.
See <literal>picom(1)</literal> man page for more examples.
'';
};
@ -125,7 +129,7 @@ in {
];
description = ''
List of conditions of windows that should have no shadow.
See <literal>compton(1)</literal> man page for more examples.
See <literal>picom(1)</literal> man page for more examples.
'';
};
@ -192,7 +196,7 @@ in {
apply = x:
let
res = x != "none";
msg = "The type of services.compton.vSync has changed to bool:"
msg = "The type of services.picom.vSync has changed to bool:"
+ " interpreting ${x} as ${boolToString res}";
in
if isBool x then x
@ -222,13 +226,13 @@ in {
type = loaOf (types.either configTypes (loaOf (types.either configTypes (loaOf configTypes))));
default = {};
description = ''
Additional Compton configuration.
Additional Picom configuration.
'';
};
};
config = mkIf cfg.enable {
services.compton.settings = let
services.picom.settings = let
# Hard conversion to float, literally lib.toInt but toFloat
toFloat = str: let
may_be_float = builtins.fromJSON str;
@ -264,8 +268,8 @@ in {
refresh-rate = mkDefault cfg.refreshRate;
};
systemd.user.services.compton = {
description = "Compton composite manager";
systemd.user.services.picom = {
description = "Picom composite manager";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
@ -275,13 +279,13 @@ in {
};
serviceConfig = {
ExecStart = "${pkgs.compton}/bin/compton --config ${configFile}";
ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}";
RestartSec = 3;
Restart = "always";
};
};
environment.systemPackages = [ pkgs.compton ];
environment.systemPackages = [ pkgs.picom ];
};
meta.maintainers = with lib.maintainers; [ rnhmjoj ];

20
nixos/tests/nginx.nix
View File

@ -7,7 +7,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "nginx";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mbbx6spp ];
maintainers = [ mbbx6spp danbst ];
};
nodes = {
@ -59,6 +59,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
{
services.nginx.package = pkgs.nginxUnstable;
}
{
services.nginx.package = pkgs.nginxUnstable;
services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";
}
];
};
@ -68,6 +73,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
etagSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-1";
justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-2";
reloadRestartSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-3";
reloadWithErrorsSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-4";
in ''
url = "http://localhost/index.html"
@ -110,5 +116,17 @@ import ./make-test-python.nix ({ pkgs, ... }: {
)
webserver.wait_for_unit("nginx")
webserver.succeed("journalctl -u nginx | grep -q -i stopped")
with subtest("nixos-rebuild --switch should fail when there are configuration errors"):
webserver.fail(
"${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"
)
webserver.succeed("[[ $(systemctl is-failed nginx-config-reload) == failed ]]")
webserver.succeed("[[ $(systemctl is-failed nginx) == active ]]")
# just to make sure operation is idempotent. During development I had a situation
# when first time it shows error, but stops showing it on subsequent rebuilds
webserver.fail(
"${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"
)
'';
})

1
pkgs/applications/audio/airwave/default.nix
View File

@ -22,6 +22,7 @@ let
};
nativeBuildInputs = [ unzip ];
installPhase = "cp -r . $out";
meta.license = stdenv.lib.licenses.unfree;
};
wine-wow64 = wine.override {

4
pkgs/applications/blockchains/pivx.nix
View File

@ -10,13 +10,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "pivx-${version}";
version = "3.4.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "PIVX-Project";
repo= "PIVX";
rev = "v${version}";
sha256 = "1fqccdqhbwyvix0ihhbgg2w048i6bhfmazr36h2cn4j65n1fgmi2";
sha256 = "0m85nc7c8cppdysqz4m12rgmzacrcbwnvf7wy90wzfvfr3xkbapd";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];

4
pkgs/applications/editors/texmaker/default.nix
View File

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "texmaker";
version = "5.0.3";
version = "5.0.4";
src = fetchurl {
url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
sha256 = "0vrj9w5lk3vf6138n5bz8phmy3xp5kv4dq1rgirghcf4hbxdyx30";
sha256 = "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx";
};
buildInputs = [ qtbase qtscript poppler zlib ];

6
pkgs/applications/graphics/pdfcpu/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pdfcpu";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "pdfcpu";
repo = pname;
rev = "v${version}";
sha256 = "13i9hz7gg82s17ky715a6czpisn4fpx2xjbmydq7j81b44x7m3vc";
sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4";
};
modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs";
modSha256 = "0ak34wr5cbcvblndslsxdd24vfj3h02xqjqnj5amkll5iqn5mzi1";
subPackages = [ "cmd/pdfcpu" ];

4
pkgs/applications/misc/vym/default.nix
View File

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "vym";
version = "2.7.0";
version = "2.7.1";
src = fetchurl {
url = "mirror://sourceforge/project/vym/${version}/${pname}-${version}.tar.bz2";
sha256 = "1rnrfqlff7wv6yni8bvff8n90pmn82k82zd4sn1jsx9r1n3qsfkh";
sha256 = "0lyf0m4y5kn5s47z4sg10215f3jsn3k1bl389jfbh2f5v4srav4g";
};
# Hardcoded paths scattered about all have form share/vym

770
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

3
pkgs/applications/networking/browsers/next/default.nix
View File

@ -61,6 +61,9 @@ stdenv.mkDerivation rec {
unix-opts
];
# This reference is unfortunately not detected by Nix
propagatedBuildInputs = [ next-gtk-webkit ];
prePatch = ''
substituteInPlace source/ports/gtk-webkit.lisp \
--replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit"

83
pkgs/applications/networking/flexget/default.nix
View File

@ -1,34 +1,12 @@
{ lib, python3 }:
{ lib, python3Packages }:
# Flexget have been a trouble maker in the past,
# if you see flexget breaking when updating packages, don't worry.
# The current state is that we have no active maintainers for this package.
# -- Mic92
let
python' = python3.override { inherit packageOverrides; };
packageOverrides = self: super: {
guessit = super.guessit.overridePythonAttrs (old: rec {
version = "3.0.3";
src = old.src.override {
inherit version;
sha256 = "1q06b3k31bfb8cxjimpf1rkcrwnc596a9cppjw15minvdangl32r";
};
});
};
in
with python'.pkgs;
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
version = "2.21.25";
version = "3.0.31";
src = fetchPypi {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0l77fgg0w5dca1bwk4fcc1yz1g7njb0x07yx4bazyg821gl15rc9";
sha256 = "b9edd905556c77b40046b5d7a27151b76a1c9a8c43a4e4153279ad42a784844e";
};
postPatch = ''
@ -43,29 +21,42 @@ buildPythonApplication rec {
# ~400 failures
doCheck = false;
propagatedBuildInputs = [
propagatedBuildInputs = with python3Packages; [
# See https://github.com/Flexget/Flexget/blob/master/requirements.in
feedparser sqlalchemy pyyaml
beautifulsoup4 html5lib
PyRSS2Gen pynzb rpyc jinja2
requests dateutil jsonschema
pathpy guessit rebulk APScheduler
terminaltables colorclass
cherrypy flask flask-restful
flask-restplus flask-compress
flask_login flask-cors
pyparsing zxcvbn future
APScheduler
beautifulsoup4
cherrypy
colorclass
feedparser
flask-compress
flask-cors
flask_login
flask-restful
flask-restplus
flask
guessit
html5lib
jinja2
jsonschema
loguru
progressbar
# Optional requirements
deluge-client
# Plugins
transmissionrpc
] ++ lib.optional (pythonOlder "3.4") pathlib;
pynzb
pyparsing
PyRSS2Gen
dateutil
pyyaml
rebulk
requests
rpyc
sqlalchemy
terminaltables
zxcvbn
];
meta = with lib; {
homepage = https://flexget.com/;
description = "Multipurpose automation tool for content like torrents";
homepage = "https://flexget.com/";
description = "Multipurpose automation tool for all of your media";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ marsam ];
};
}

39
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -1,27 +1,26 @@
{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xorgproto, libSM
, libICE, qca2, pkgconfig, which, glib
, libXScrnSaver
{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca2-qt5, libXScrnSaver, hunspell
}:
stdenv.mkDerivation rec {
name = "psi-0.15";
src = fetchurl {
url = "mirror://sourceforge/psi/${name}.tar.bz2";
sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6";
pname = "psi";
version = "1.4";
src = fetchFromGitHub {
owner = "psi-im";
repo = pname;
rev = version;
sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4";
fetchSubmodules = true;
};
buildInputs =
[ enchant qt4 zlib sox libX11 xorgproto libSM libICE
qca2 pkgconfig which glib libXScrnSaver
];
NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
NIX_LDFLAGS="-lqca";
patches = [
./fix-cmake-hunspell-1.7.patch
];
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [
qtbase qtmultimedia qtx11extras qttools qtwebengine
libidn qca2-qt5 libXScrnSaver hunspell
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Psi, an XMPP (Jabber) client";
maintainers = [ maintainers.raskin ];

12
pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/cmake/modules/FindHunspell.cmake b/cmake/modules/FindHunspell.cmake
index a2d180b3..3a5aef3a 100644
--- a/cmake/modules/FindHunspell.cmake
+++ b/cmake/modules/FindHunspell.cmake
@@ -64,6 +64,7 @@ set(HUNSPELL_NAMES
hunspell-1.4
hunspell-1.5
hunspell-1.6
+ hunspell-1.7
libhunspell${d}
)
find_library(

6
pkgs/applications/networking/instant-messengers/rambox/bare.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "rambox-bare";
version = "0.6.9";
version = "0.7.3";
src = fetchFromGitHub {
owner = "ramboxapp";
repo = "community-edition";
rev = version;
sha256 = "1h44srl2gzkhjaazpwz1pwy4dp5x776fc685kahlvjlsfls0fvy9";
sha256 = "03pwzyij2i5m23qzhyqdcipixmqj46qbjmq626swwqy03a0p91qv";
};
nativeBuildInputs = [ nodejs-10_x ruby sencha ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit src;
nodejs = nodejs-10_x;
sha256 = "1zw3pjj3z29n9s08xyid41yq765d4c16lgml79m24zw36qaji6h1";
sha256 = "05vb0r0q3ckg2g87fsm22j0cbfvk81q5z43zwmrzh3pb3zh54xj1";
};
patches = [ ./isDev.patch ];

8
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
View File

@ -20,13 +20,13 @@ let
pname = "wire-desktop";
version = {
x86_64-darwin = "3.10.3215";
x86_64-linux = "3.11.2912";
x86_64-darwin = "3.12.3490";
x86_64-linux = "3.12.2916";
}.${system} or throwSystem;
sha256 = {
x86_64-darwin = "0ygm3fgy9k1dp2kjfwsrrwq1i88wgxc6k8y80yz61ivdawgph9wa";
x86_64-linux = "1d2wa13d750dd2vslnvzf0ibwjmf5s299pxq0rs2x98y2sabw3sl";
x86_64-darwin = "0xvhx3r99fl1v1cdqj6sk46kzxv9qi7j754amkhv7knrpmgyp55z";
x86_64-linux = "0xx03cpy6kapbjpygwranxjg1a0p8s1xq3cpapvi55rnkbk0qvjw";
}.${system} or throwSystem;
meta = with stdenv.lib; {

4
pkgs/applications/networking/mullvad-vpn/default.nix
View File

@ -40,11 +40,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2019.8";
version = "2019.10";
src = fetchurl {
url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
sha256 = "0cjc8j8pqgdhnax4mvwmvnxfcygjsp805hxalfaj8wa5adph96hz";
sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq";
};
nativeBuildInputs = [

4
pkgs/applications/networking/p2p/tixati/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tixati";
version = "2.64";
version = "2.66";
src = fetchurl {
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
sha256 = "0xz2b2vasfc39wqv9lak2wdli7pr5b1vcm1lgpqx6kz7j5ba6jqp";
sha256 = "1qwmxfkgc5q7v6ickxr29khil6mh9crv5mwdm72bp6k64w0akbs7";
};
installPhase = ''

4
pkgs/applications/networking/protonmail-bridge/default.nix
View File

@ -2,7 +2,7 @@
, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, mkDerivation }:
let
version = "1.2.2-1";
version = "1.2.3-1";
description = ''
An application that runs on your computer in the background and seamlessly encrypts
@ -16,7 +16,7 @@ in mkDerivation {
src = fetchurl {
url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
sha256 = "16hfa07wdqcns79395wjdglg2cjyblqgz1hx8rl15qm7n5f24ckl";
sha256 = "032ggk9fvd19fbsqkzwzwh0hpyg8gpkrin71di7zsx6ias5innw1";
};
sourceRoot = ".";

4
pkgs/applications/office/qownnotes/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "qownnotes";
version = "19.11.14";
version = "19.12.15";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
sha256 = "8faa67720443fc9a116feae3e7d641922a08814b9af4d973d348ff8a0ee0e35d";
sha256 = "11i3cn1j365nwinaksfpi1hn7j6bqgjzhawkl6c294lzahngba9w";
};
nativeBuildInputs = [ qmake qttools ];

11
pkgs/applications/radio/soapysdr/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, lib, lndir, makeWrapper
, fetchFromGitHub, cmake
, libusb, pkgconfig
, python, swig2, numpy, ncurses
, usePython ? false
, python, ncurses, swig2
, extraPackages ? []
} :
@ -24,12 +25,14 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
buildInputs = [ libusb ncurses numpy python swig2 ];
buildInputs = [ libusb ncurses ]
++ lib.optionals usePython [ python swig2 ];
propagatedBuildInputs = lib.optional usePython python.pkgs.numpy;
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DUSE_PYTHON_CONFIG=ON"
];
] ++ lib.optional usePython "-DUSE_PYTHON_CONFIG=ON";
postFixup = lib.optionalString (lib.length extraPackages != 0) ''
# Join all plugins via symlinking

4
pkgs/applications/science/chemistry/marvin/default.nix
View File

@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "marvin";
version = "19.23.0";
version = "19.27.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
sha256 = "1m28jki2qan6gdzs544y1v72ybp4vyj66ri5sy44jqi94xg1mb5f";
sha256 = "10pzprr43pklf4yl14m9q921ynalsil1dsfbl6lx8r1jmyjgl3w7";
};
nativeBuildInputs = [ dpkg makeWrapper ];

130
pkgs/applications/science/electronics/kicad/base.nix Normal file
View File

@ -0,0 +1,130 @@
{ lib, stdenv, fetchFromGitLab, cmake, libGLU, libGL, zlib, wxGTK
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages
, pname ? "kicad"
, stable ? true
, baseName ? "kicad"
, versions ? { }
, oceSupport ? false, opencascade
, withOCCT ? true, opencascade-occt
, ngspiceSupport ? true, libngspice
, scriptingSupport ? true, swig, python, pythonPackages, wxPython
, debug ? false, valgrind
, withI18n ? true
}:
assert ngspiceSupport -> libngspice != null;
with lib;
let
versionConfig = versions.${baseName};
baseVersion = "${versions.${baseName}.kicadVersion.version}";
# oce on aarch64 fails a test
withOCE = oceSupport && !stdenv.isAarch64;
withOCC = (withOCCT && !withOCE) || (oceSupport && stdenv.isAarch64);
kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion;
in
stdenv.mkDerivation rec {
inherit pname;
version = "base-${baseVersion}";
src = fetchFromGitLab (
{
group = "kicad";
owner = "code";
repo = "kicad";
rev = baseVersion;
} // versionConfig.kicadVersion.src
);
# quick fix for #72248
# should be removed if a a more permanent fix is published
patches = [
(
fetchpatch {
url = "https://github.com/johnbeard/kicad/commit/dfb1318a3989e3d6f9f2ac33c924ca5030ea273b.patch";
sha256 = "00ifd3fas8lid8svzh1w67xc8kyx89qidp7gm633r014j3kjkgcd";
}
)
];
# tagged releases don't have "unknown"
# kicad nightlies use git describe --dirty
# nix removes .git, so its approximated here
postPatch = ''
substituteInPlace CMakeModules/KiCadVersion.cmake \
--replace "unknown" ${builtins.substring 0 10 src.rev}
'';
makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
cmakeFlags =
optionals (scriptingSupport) [
"-DKICAD_SCRIPTING=ON"
"-DKICAD_SCRIPTING_MODULES=ON"
"-DKICAD_SCRIPTING_PYTHON3=ON"
"-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
]
++ optional (!scriptingSupport)
"-DKICAD_SCRIPTING=OFF"
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
++ optional (!withOCE) "-DKICAD_USE_OCE=OFF"
++ optional (!withOCC) "-DKICAD_USE_OCC=OFF"
++ optionals (withOCE) [
"-DKICAD_USE_OCE=ON"
"-DOCE_DIR=${opencascade}"
]
++ optionals (withOCC) [
"-DKICAD_USE_OCC=ON"
"-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
]
++ optionals (debug) [
"-DCMAKE_BUILD_TYPE=Debug"
"-DKICAD_STDLIB_DEBUG=ON"
"-DKICAD_USE_VALGRIND=ON"
]
;
nativeBuildInputs = [ cmake doxygen pkgconfig lndir ];
buildInputs = [
libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext
glew glm libpthreadstubs cairo curl openssl boost
]
++ optionals (scriptingSupport) [ swig python wxPython ]
++ optional (ngspiceSupport) libngspice
++ optional (withOCE) opencascade
++ optional (withOCC) opencascade-occt
++ optional (debug) valgrind
;
# debug builds fail all but the python test
# 5.1.x fails the eeschema test
doInstallCheck = !debug && !stable;
installCheckTarget = "test";
dontStrip = debug;
postInstall = optional (withI18n) ''
mkdir -p $out/share
lndir ${kicad-libraries.i18n}/share $out/share
'';
meta = {
description = "Just the built source without the libraries";
longDescription = ''
Just the build products, optionally with the i18n linked in
the libraries are passed via an env var in the wrapper, default.nix
'';
homepage = "https://www.kicad-pcb.org/";
license = licenses.agpl3;
maintainers = with maintainers; [ evils kiwi berce ];
platforms = with platforms; linux;
};
}

258
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -1,121 +1,175 @@
{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU, libGL, zlib
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp
, wrapGAppsHook
, oceSupport ? true, opencascade
{ lib, stdenv, gnome3, pkgs, wxGTK30, wxGTK31
, gsettings-desktop-schemas, hicolor-icon-theme
, callPackage, callPackages
, librsvg, cups
, pname ? "kicad"
, oceSupport ? false, opencascade
, withOCCT ? true, opencascade-occt
, ngspiceSupport ? true, libngspice
, swig, python, pythonPackages
, lndir
, scriptingSupport ? true, swig, python3, python3Packages
, debug ? false, valgrind
, with3d ? true
, withI18n ? true
}:
assert ngspiceSupport -> libngspice != null;
with lib;
let
mkLib = version: name: sha256: attrs: stdenv.mkDerivation ({
name = "kicad-${name}-${version}";
src = fetchFromGitHub {
owner = "KiCad";
repo = "kicad-${name}";
rev = version;
inherit sha256 name;
stable = pname != "kicad-unstable";
baseName = if (stable) then "kicad" else "kicad-unstable";
versions = {
"kicad" = {
kicadVersion = {
version = "5.1.5";
src.sha256 = "15h3rwisjss3fdc9bam9n2wq94slhacc3fbg14bnzf4n5agsnv5b";
};
libVersion = {
version = "5.1.5";
libSources = {
i18n.sha256 = "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3";
symbols.sha256 = "048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h";
templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g";
footprints.sha256 = "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j";
packages3d.sha256 = "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz";
};
};
};
nativeBuildInputs = [
cmake
];
} // attrs);
in stdenv.mkDerivation rec {
pname = "kicad";
series = "5.0";
version = "5.1.4";
src = fetchurl {
url = "https://launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz";
sha256 = "1r60dgh6aalbpq1wsmpyxkz0nn4ck8ydfdjcrblpl69k5rks5k2j";
};
postPatch = ''
substituteInPlace CMakeModules/KiCadVersion.cmake \
--replace no-vcs-found ${version}
'';
cmakeFlags = [
"-DKICAD_SCRIPTING=ON"
"-DKICAD_SCRIPTING_MODULES=ON"
"-DKICAD_SCRIPTING_WXPYTHON=ON"
# nix installs wxPython headers in wxPython package, not in wxwidget
# as assumed. We explicitely set the header location.
"-DCMAKE_CXX_FLAGS=-I${pythonPackages.wxPython}/include/wx-3.0"
"-DwxPYTHON_INCLUDE_DIRS=${pythonPackages.wxPython}/include/wx-3.0"
] ++ optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON";
nativeBuildInputs = [
cmake
doxygen
pkgconfig
wrapGAppsHook
pythonPackages.wrapPython
lndir
];
pythonPath = [ pythonPackages.wxPython ];
propagatedBuildInputs = [ pythonPackages.wxPython ];
buildInputs = [
libGLU libGL zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
cairo curl openssl boost
swig (python.withPackages (ps: with ps; [ wxPython ]))
] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice;
# this breaks other applications in kicad
dontWrapGApps = true;
passthru = {
i18n = mkLib version "i18n" "1dk7wis4cncmihl8fnic3jyhqcdzpifchzsp7hmf214h0vp199zr" {
buildInputs = [
gettext
];
meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3
};
symbols = mkLib version "symbols" "1lna4xlvzrxif3569pkp6mrg7fj62z3a3ri5j97lnmnnzhiddnh3" {
meta.license = licenses.cc-by-sa-40;
};
footprints = mkLib version "footprints" "0c0kcywxlaihzzwp9bi0dsr2v9j46zcdr85xmfpivmrk19apss6a" {
meta.license = licenses.cc-by-sa-40;
};
templates = mkLib version "templates" "1bagb0b94cjh7zp9z0h23b60j45kwxbsbb7b2bdk98dmph8lmzbb" {
meta.license = licenses.cc-by-sa-40;
};
packages3d = mkLib version "packages3d" "0h2qjj8vf33jz6jhqdz90c80h5i1ydgfqnns7rn0fqphlnscb45g" {
hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store
meta.license = licenses.cc-by-sa-40;
"kicad-unstable" = {
kicadVersion = {
version = "2019-12-31";
src = {
rev = "eaaa4eb63acb289047dfbb6cc275579dea58f12b";
sha256 = "1v2hf2slphjdh14y56pmzlpi6mqidrd8198if1fi0cch72v37zch";
};
};
libVersion = {
version = "unstable";
libSources = {
i18n.rev = "e7439fd76f27cfc26e269c4e6c4d56245345c28b";
i18n.sha256 = "1nqm1kx5b4f7s0f9q8bg4rdhqnp0128yp6bgnrkia1kwmfnf5gmy";
symbols.rev = "1bc5ff11c76bcbfda227e534b0acf737edddde8f";
symbols.sha256 = "05kv93790wi4dpbn2488p587b83yz1zw9h62lkv41h7vn2r1mmb7";
templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c";
templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g";
footprints.rev = "454126c125edd3fa8633f301421a7d9c4de61b77";
footprints.sha256 = "00nli4kx2i68bk852rivbirzcgpsdlpdk34g1q892952jsbh7fy6";
packages3d.rev = "c2b92a411adc93ddeeed74b36b542e1057f81a2a";
packages3d.sha256 = "05znc6y2lc31iafspg308cxdda94zg6c7mwslmys76npih1pb8qc";
};
};
};
};
versionConfig = versions.${baseName};
modules = with passthru; [ i18n symbols footprints templates ];
wxGTK = if (stable)
# wxGTK3x may default to withGtk2 = false, see #73145
then wxGTK30.override { withGtk2 = false; }
# wxGTK31 currently introduces an issue with opening the python interpreter in pcbnew
# but brings high DPI support?
else wxGTK31.override { withGtk2 = false; };
postInstall = ''
mkdir -p $out/share
for module in $modules; do
lndir $module/share $out/share
done
'';
pythonPackages = python3Packages;
python = python3;
wxPython = python3Packages.wxPython_4_0;
preFixup = ''
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion;
kicad-base = callPackage ./base.nix {
pname = baseName;
inherit versions stable baseName;
inherit wxGTK python wxPython;
inherit debug withI18n withOCCT oceSupport ngspiceSupport scriptingSupport;
};
wrapGApp "$out/bin/kicad" --prefix LD_LIBRARY_PATH : "${libngspice}/lib"
'';
in
stdenv.mkDerivation rec {
inherit pname;
version = versions.${baseName}.kicadVersion.version;
src = kicad-base;
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
dontFixup = true;
pythonPath = optionals (scriptingSupport)
[ wxPython pythonPackages.six ];
nativeBuildInputs = optionals (scriptingSupport)
[ pythonPackages.wrapPython ];
# wrapGAppsHook added the equivalent to ${kicad-base}/share
# though i noticed no difference without it
makeWrapperArgs = [
"--prefix XDG_DATA_DIRS : ${kicad-base}/share"
"--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share"
"--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}"
"--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
# wrapGAppsHook did these two as well, no idea if it matters...
"--prefix XDG_DATA_DIRS : ${cups}/share"
"--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules"
"--set KISYSMOD ${kicad-libraries.footprints}/share/kicad/modules"
"--set KICAD_SYMBOL_DIR ${kicad-libraries.symbols}/share/kicad/library"
"--set KICAD_TEMPLATE_DIR ${kicad-libraries.templates}/share/kicad/template"
"--prefix KICAD_TEMPLATE_DIR : ${kicad-libraries.symbols}/share/kicad/template"
"--prefix KICAD_TEMPLATE_DIR : ${kicad-libraries.footprints}/share/kicad/template"
]
++ optionals (with3d) [ "--set KISYS3DMOD ${kicad-libraries.packages3d}/share/kicad/modules/packages3d" ]
++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ]
# infinisil's workaround for #39493
++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ]
;
# dunno why i have to add $makeWrapperArgs manually...
# $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set?
# not sure if anything has to be done with the other stuff in kicad-base/bin
# dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest
installPhase =
optionalString (scriptingSupport) '' buildPythonPath "${kicad-base} $pythonPath"
'' +
'' makeWrapper ${kicad-base}/bin/kicad $out/bin/kicad $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
'' +
'' makeWrapper ${kicad-base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
'' +
'' makeWrapper ${kicad-base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
'' +
'' makeWrapper ${kicad-base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
'' +
'' makeWrapper ${kicad-base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
'' +
'' makeWrapper ${kicad-base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
'' +
'' makeWrapper ${kicad-base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
''
;
meta = {
description = "Free Software EDA Suite";
homepage = http://www.kicad-pcb.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ berce ];
description = if (stable)
then "Open Source Electronics Design Automation Suite"
else "Open Source EDA Suite, Development Build";
homepage = "https://www.kicad-pcb.org/";
longDescription = ''
KiCad is an open source software suite for Electronic Design Automation.
The Programs handle Schematic Capture, and PCB Layout with Gerber output.
'';
license = licenses.agpl3;
# berce seems inactive...
maintainers = with maintainers; [ evils kiwi berce ];
# kicad's cross-platform, not sure what to fill in here
platforms = with platforms; linux;
broken = stdenv.isAarch64;
};
}

64
pkgs/applications/science/electronics/kicad/libraries.nix Normal file
View File

@ -0,0 +1,64 @@
{ lib, stdenv, cmake, gettext
, fetchFromGitHub, fetchFromGitLab
, version, libSources
}:
# callPackage libraries {
# version = "unstable";
# libs.symbols = {
# rev = "09f9..";
# sha256 = "...";
# };
# };
with lib;
let
mkLib = name: attrs:
stdenv.mkDerivation (
{
pname = "kicad-${name}";
version = "${version}";
src = fetchFromGitHub (
{
owner = "KiCad";
repo = "kicad-${name}";
rev = version;
inherit name;
} // (libSources.${name} or { })
);
nativeBuildInputs = [ cmake ];
meta.license = licenses.cc-by-sa-40;
} // attrs
);
in
{
symbols = mkLib "symbols" { };
templates = mkLib "templates" { };
footprints = mkLib "footprints" { };
packages3d = mkLib "packages3d" {
hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store
};
# i18n is a special case, not actually a library
# more a part of kicad proper, but also optional and separate
# since their move to gitlab they're keeping it in a separate path
# kicad has no way to find i18n except through a path relative to its install path
# therefore this is being linked into ${kicad-base}/share/
# and defined here to make use of the rev & sha256's brought here for the libs
i18n = let name = "i18n"; in
stdenv.mkDerivation {
pname = "kicad-${name}";
version = "${version}";
src = fetchFromGitLab (
{
group = "kicad";
owner = "code";
repo = "kicad-${name}";
rev = version;
inherit name;
} // (libSources.${name} or { })
);
buildInputs = [ gettext ];
nativeBuildInputs = [ cmake ];
meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3
};
}

57
pkgs/applications/science/electronics/kicad/unstable.nix
View File

@ -1,57 +0,0 @@
{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp
, oceSupport ? true, opencascade
, ngspiceSupport ? true, libngspice
, scriptingSupport ? true, swig, python, wxPython
}:
assert ngspiceSupport -> libngspice != null;
with lib;
stdenv.mkDerivation rec {
pname = "kicad-unstable";
version = "2018-06-12";
src = fetchFromGitHub {
owner = "KICad";
repo = "kicad-source-mirror";
rev = "bc7bd107d980da147ad515aeae0469ddd55c2368";
sha256 = "11nsx52pd3jr2wbzr11glmcs1a9r7z1mqkqx6yvlm0awbgd8qlv8";
};
postPatch = ''
substituteInPlace CMakeModules/KiCadVersion.cmake \
--replace no-vcs-found ${version}
'';
cmakeFlags =
optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
++ optionals (scriptingSupport) [
"-DKICAD_SCRIPTING=ON"
"-DKICAD_SCRIPTING_MODULES=ON"
"-DKICAD_SCRIPTING_WXPYTHON=ON"
# nix installs wxPython headers in wxPython package, not in wxwidget
# as assumed. We explicitely set the header location.
"-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0"
];
nativeBuildInputs = [ cmake doxygen pkgconfig ];
buildInputs = [
libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
cairo curl openssl boost
] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice
++ optionals (scriptingSupport) [ swig python wxPython ];
meta = {
description = "Free Software EDA Suite, Nightly Development Build";
homepage = http://www.kicad-pcb.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ berce ];
platforms = with platforms; linux;
broken = true;
};
}

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

@ -8,13 +8,13 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
version = "1.10.1";
version = "1.10.2";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
sha256 = "1b1vmixc94kzfnd266r3hx25lcm3h4ywqg7d9kif83ixm612cj3g";
sha256 = "04ksalhpf47wzjfhx295kf4rbamxbb3s9946vfda358lm360adic";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''

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

@ -1,13 +1,13 @@
{
"version": "12.5.5",
"repo_hash": "1vafy31s2sbs6xc2cp457k535yyawz630i8ks22ypyg2m2gy5n5m",
"version": "12.6.2",
"repo_hash": "0bchamvr3f0ph49f7xa76gsp2mjj1ajy4q0wy1hjvr9bayxx94av",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.5.5-ee",
"rev": "v12.6.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "1.72.1",
"GITALY_SERVER_VERSION": "a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83",
"GITLAB_PAGES_VERSION": "1.12.0",
"GITLAB_SHELL_VERSION": "10.2.0",
"GITLAB_WORKHORSE_VERSION": "8.14.1"
"GITLAB_SHELL_VERSION": "10.3.0",
"GITLAB_WORKHORSE_VERSION": "8.18.0"
}
}

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

@ -43,7 +43,14 @@ let
pname = "gitlab-assets";
inherit version src;
nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn ];
nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git ];
# Since version 12.6.0, the rake tasks need the location of git,
# so we have to apply the location patches here too.
patches = [ ./remove-hardcoded-locations.patch ];
# One of the patches uses this variable - if it's unset, execution
# of rake tasks fails.
GITLAB_LOG_PATH = "log";
configurePhase = ''
runHook preConfigure

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

@ -99,7 +99,7 @@ GEM
licensee (8.9.2)
rugged (~> 0.24)
listen (0.5.3)
loofah (2.3.0)
loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
@ -111,7 +111,7 @@ GEM
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.3.0)
msgpack (1.3.1)
multi_json (1.13.1)
multipart-post (2.0.0)
nokogiri (1.10.5)
@ -176,7 +176,7 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.0)
rugged (0.28.3.1)
rugged (0.28.4.1)
safe_yaml (1.0.5)
sanitize (4.6.6)
crass (~> 1.0.2)

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

@ -17,16 +17,20 @@ let
};
};
in buildGoPackage rec {
version = "1.72.1";
version = "a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "0gnhw7p8fgy3w15828qjgkkxcd4dg7gf1hpanc3xqawb8jqpfc91";
rev = version;
sha256 = "1pxmhq1nrc8q2kk83bz5afx14hshqgzqm6j4vgmyjvbmdvgl80wv";
};
# Fix a check which assumes that hook files are writeable by their
# owner.
patches = [ ./fix-executable-check.patch ];
goPackagePath = "gitlab.com/gitlab-org/gitaly";
passthru = {

59
pkgs/applications/version-management/gitlab/gitaly/deps.nix generated
View File

@ -86,8 +86,8 @@
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
rev = "v1.0.0";
sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
rev = "v1.0.1";
sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7";
};
}
{
@ -108,6 +108,15 @@
sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
};
}
{
goPackagePath = "github.com/client9/reopen";
fetch = {
type = "git";
url = "https://github.com/client9/reopen";
rev = "v1.0.0";
sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s";
};
}
{
goPackagePath = "github.com/cloudflare/tableflip";
fetch = {
@ -338,8 +347,8 @@
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "v0.2.0";
sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
rev = "v0.3.0";
sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
};
}
{
@ -581,8 +590,8 @@
fetch = {
type = "git";
url = "https://github.com/konsorten/go-windows-terminal-sequences";
rev = "v1.0.1";
sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
rev = "v1.0.2";
sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
};
}
{
@ -639,6 +648,15 @@
sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0";
};
}
{
goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
rev = "v1.2.0";
sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz";
};
}
{
goPackagePath = "github.com/libgit2/git2go";
fetch = {
@ -833,8 +851,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
rev = "v0.0.2";
sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
rev = "v0.0.3";
sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y";
};
}
{
@ -846,6 +864,15 @@
sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
};
}
{
goPackagePath = "github.com/sebest/xff";
fetch = {
type = "git";
url = "https://github.com/sebest/xff";
rev = "6c115e0ffa35";
sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h";
};
}
{
goPackagePath = "github.com/sergi/go-diff";
fetch = {
@ -869,8 +896,8 @@
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "v1.2.0";
sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
rev = "v1.3.0";
sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk";
};
}
{
@ -1067,8 +1094,8 @@
fetch = {
type = "git";
url = "https://gitlab.com/gitlab-org/labkit.git";
rev = "0c3fc7cdd57c";
sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i";
rev = "3253d7975ca7";
sha256 = "1q7vqcbwzgwk4n09jnzdh2filv1aqclw9bgf3qjr5qrfk7hby58s";
};
}
{
@ -1139,8 +1166,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
rev = "v0.3.2";
sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
};
}
{
@ -1202,8 +1229,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "20d25e280405";
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
rev = "788fd7840127";
sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
};
}
{

13
pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/internal/config/config.go b/internal/config/config.go
index 037c9602..3d5409dc 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -185,7 +185,7 @@ func checkExecutable(path string) error {
return err
}
- if fi.Mode()&0755 < 0755 {
+ if fi.Mode()&0555 < 0555 {
return fmt.Errorf("not executable: %v", path)
}

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

@ -418,10 +418,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x";
sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd";
type = "gem";
};
version = "2.3.0";
version = "2.3.1";
};
memoizable = {
dependencies = ["thread_safe"];
@ -490,10 +490,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn";
sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
type = "gem";
};
version = "1.3.0";
version = "1.3.1";
};
multi_json = {
source = {
@ -791,10 +791,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx";
type = "gem";
};
version = "0.28.3.1";
version = "0.28.4.1";
};
safe_yaml = {
groups = ["default" "development" "test"];

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

@ -2,12 +2,12 @@
buildGoPackage rec {
pname = "gitlab-shell-go";
version = "10.2.0";
version = "10.3.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "1mpzsdqd8mlsh8wccz4s8415w080z55lnifn7l7vd5rflpnyfhcj";
sha256 = "0kxbw2n5kabh0876xqn1dcjbxyrp82ms566rw065nqrb32g8c2hk";
};
buildInputs = [ ruby ];

17
pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix generated
View File

@ -387,22 +387,13 @@
sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k";
};
}
{
goPackagePath = "github.com/otiai10/curr";
fetch = {
type = "git";
url = "https://github.com/otiai10/curr";
rev = "f5a3d24e5776";
sha256 = "01k33ifs9n0pnhwhbfb9ws3q5sa37fi7dhir5vjakpfzdin07y4w";
};
}
{
goPackagePath = "github.com/otiai10/mint";
fetch = {
type = "git";
url = "https://github.com/otiai10/mint";
rev = "v1.2.4";
sha256 = "1mf7b8h3akxbpj1rf3nk0ccqk5idd6z2gh9gm31phr7ll4gykn2m";
rev = "v1.2.3";
sha256 = "00slgv9mw2m22ix5prz2a98ji6kpzr0ap6bqs568rfdmk6hm5f0k";
};
}
{
@ -662,8 +653,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/DataDog/dd-trace-go.v1";
rev = "v1.9.0";
sha256 = "1zfbsmm8fbcwhd6j28q3ijyswn1d3dyhydx3ckqpkkp6qiam3c2j";
rev = "v1.7.0";
sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq";
};
}
{

18
pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
View File

@ -1,7 +1,7 @@
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
diff --git a/internal/config/config.go b/internal/config/config.go
index 2231851..c869930 100644
--- a/go/internal/config/config.go
+++ b/go/internal/config/config.go
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -3,7 +3,6 @@ package config
import (
"io/ioutil"
@ -29,10 +29,10 @@ index 2231851..c869930 100644
}
func newFromFile(filename string) (*Config, error) {
diff --git a/go/internal/keyline/key_line.go b/go/internal/keyline/key_line.go
index f92f50b..160e287 100644
--- a/go/internal/keyline/key_line.go
+++ b/go/internal/keyline/key_line.go
diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go
index c29a320..c44b701 100644
--- a/internal/keyline/key_line.go
+++ b/internal/keyline/key_line.go
@@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi
}
@ -43,10 +43,10 @@ index f92f50b..160e287 100644
return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value)
}
diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb
index 1416488..90a5f79 100644
index 52ac5ee..d96baa3 100644
--- a/support/gitlab_config.rb
+++ b/support/gitlab_config.rb
@@ -4,7 +4,7 @@ class GitlabConfig
@@ -7,7 +7,7 @@ class GitlabConfig
attr_reader :config
def initialize

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

@ -3,13 +3,13 @@
buildGoPackage rec {
pname = "gitlab-workhorse";
version = "8.14.1";
version = "8.18.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "19flb9b9l9214ykwgjphcqrinncnfvhis7nrvcr4ns6rlpxnc9dl";
sha256 = "0qsbz8gv9r9wfvxsh9mpspgs2gyyidxdz5n9n7ibfy7z129mx4ak";
};
goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";

575
pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix generated
View File

@ -27,6 +27,42 @@
sha256 = "14cfngdy0n5rg7nrvxg1ydcjd18v0s8h33jx9wkln5ms0d59kfly";
};
}
{
goPackagePath = "github.com/Joker/hpp";
fetch = {
type = "git";
url = "https://github.com/Joker/hpp";
rev = "6893e659854a";
sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5";
};
}
{
goPackagePath = "github.com/Joker/jade";
fetch = {
type = "git";
url = "https://github.com/Joker/jade";
rev = "v1.0.0";
sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf";
};
}
{
goPackagePath = "github.com/Shopify/goreferrer";
fetch = {
type = "git";
url = "https://github.com/Shopify/goreferrer";
rev = "ec9c9a553398";
sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn";
};
}
{
goPackagePath = "github.com/ajg/form";
fetch = {
type = "git";
url = "https://github.com/ajg/form";
rev = "v1.5.1";
sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a";
};
}
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
@ -45,6 +81,15 @@
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}
{
goPackagePath = "github.com/aymerick/raymond";
fetch = {
type = "git";
url = "https://github.com/aymerick/raymond";
rev = "v2.0.2";
sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3";
};
}
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
@ -99,6 +144,15 @@
sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
};
}
{
goPackagePath = "github.com/codegangsta/inject";
fetch = {
type = "git";
url = "https://github.com/codegangsta/inject";
rev = "33e0aa1cb7c0";
sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
@ -117,6 +171,33 @@
sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
};
}
{
goPackagePath = "github.com/eknkc/amber";
fetch = {
type = "git";
url = "https://github.com/eknkc/amber";
rev = "cdade1c07385";
sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
};
}
{
goPackagePath = "github.com/fatih/structs";
fetch = {
type = "git";
url = "https://github.com/fatih/structs";
rev = "v1.1.0";
sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q";
};
}
{
goPackagePath = "github.com/flosch/pongo2";
fetch = {
type = "git";
url = "https://github.com/flosch/pongo2";
rev = "bbf5a6c351f4";
sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq";
};
}
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
@ -126,6 +207,15 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/gavv/monotime";
fetch = {
type = "git";
url = "https://github.com/gavv/monotime";
rev = "30dba4353424";
sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g";
};
}
{
goPackagePath = "github.com/getsentry/raven-go";
fetch = {
@ -135,6 +225,51 @@
sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
};
}
{
goPackagePath = "github.com/getsentry/sentry-go";
fetch = {
type = "git";
url = "https://github.com/getsentry/sentry-go";
rev = "v0.3.0";
sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1";
};
}
{
goPackagePath = "github.com/gin-contrib/sse";
fetch = {
type = "git";
url = "https://github.com/gin-contrib/sse";
rev = "5545eab6dad3";
sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5";
};
}
{
goPackagePath = "github.com/gin-gonic/gin";
fetch = {
type = "git";
url = "https://github.com/gin-gonic/gin";
rev = "v1.4.0";
sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d";
};
}
{
goPackagePath = "github.com/go-check/check";
fetch = {
type = "git";
url = "https://github.com/go-check/check";
rev = "788fd7840127";
sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
rev = "v1.0.1";
sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
};
}
{
goPackagePath = "github.com/go-kit/kit";
fetch = {
@ -153,6 +288,15 @@
sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
};
}
{
goPackagePath = "github.com/go-martini/martini";
fetch = {
type = "git";
url = "https://github.com/go-martini/martini";
rev = "22fa46961aab";
sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh";
};
}
{
goPackagePath = "github.com/go-stack/stack";
fetch = {
@ -212,8 +356,8 @@
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "v1.3.1";
sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
rev = "v1.3.2";
sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
};
}
{
@ -234,6 +378,15 @@
sha256 = "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1";
};
}
{
goPackagePath = "github.com/google/go-querystring";
fetch = {
type = "git";
url = "https://github.com/google/go-querystring";
rev = "v1.0.0";
sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
};
}
{
goPackagePath = "github.com/google/renameio";
fetch = {
@ -261,6 +414,15 @@
sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
};
}
{
goPackagePath = "github.com/gorilla/schema";
fetch = {
type = "git";
url = "https://github.com/gorilla/schema";
rev = "v1.1.0";
sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9";
};
}
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
@ -297,6 +459,51 @@
sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
};
}
{
goPackagePath = "github.com/imkira/go-interpol";
fetch = {
type = "git";
url = "https://github.com/imkira/go-interpol";
rev = "v1.1.0";
sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph";
};
}
{
goPackagePath = "github.com/iris-contrib/blackfriday";
fetch = {
type = "git";
url = "https://github.com/iris-contrib/blackfriday";
rev = "v2.0.0";
sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im";
};
}
{
goPackagePath = "github.com/iris-contrib/formBinder";
fetch = {
type = "git";
url = "https://github.com/iris-contrib/formBinder";
rev = "v5.0.0";
sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg";
};
}
{
goPackagePath = "github.com/iris-contrib/go.uuid";
fetch = {
type = "git";
url = "https://github.com/iris-contrib/go.uuid";
rev = "v2.0.0";
sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35";
};
}
{
goPackagePath = "github.com/iris-contrib/httpexpect";
fetch = {
type = "git";
url = "https://github.com/iris-contrib/httpexpect";
rev = "ebe99fcebbce";
sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c";
};
}
{
goPackagePath = "github.com/jfbus/httprs";
fetch = {
@ -333,6 +540,33 @@
sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
};
}
{
goPackagePath = "github.com/juju/errors";
fetch = {
type = "git";
url = "https://github.com/juju/errors";
rev = "089d3ea4e4d5";
sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r";
};
}
{
goPackagePath = "github.com/juju/loggo";
fetch = {
type = "git";
url = "https://github.com/juju/loggo";
rev = "584905176618";
sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4";
};
}
{
goPackagePath = "github.com/juju/testing";
fetch = {
type = "git";
url = "https://github.com/juju/testing";
rev = "472a3e8b2073";
sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4";
};
}
{
goPackagePath = "github.com/julienschmidt/httprouter";
fetch = {
@ -342,6 +576,42 @@
sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
};
}
{
goPackagePath = "github.com/k0kubun/colorstring";
fetch = {
type = "git";
url = "https://github.com/k0kubun/colorstring";
rev = "9440f1994b88";
sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj";
};
}
{
goPackagePath = "github.com/kataras/golog";
fetch = {
type = "git";
url = "https://github.com/kataras/golog";
rev = "99c81de45f40";
sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p";
};
}
{
goPackagePath = "github.com/kataras/iris";
fetch = {
type = "git";
url = "https://github.com/kataras/iris";
rev = "v11.1.1";
sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg";
};
}
{
goPackagePath = "github.com/kataras/pio";
fetch = {
type = "git";
url = "https://github.com/kataras/pio";
rev = "ea782b38602d";
sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj";
};
}
{
goPackagePath = "github.com/kelseyhightower/envconfig";
fetch = {
@ -360,6 +630,24 @@
sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
};
}
{
goPackagePath = "github.com/klauspost/compress";
fetch = {
type = "git";
url = "https://github.com/klauspost/compress";
rev = "v1.4.0";
sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s";
};
}
{
goPackagePath = "github.com/klauspost/cpuid";
fetch = {
type = "git";
url = "https://github.com/klauspost/cpuid";
rev = "e7e905edc00e";
sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf";
};
}
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
@ -405,6 +693,24 @@
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
};
}
{
goPackagePath = "github.com/labstack/echo";
fetch = {
type = "git";
url = "https://github.com/labstack/echo";
rev = "v4.1.10";
sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h";
};
}
{
goPackagePath = "github.com/labstack/gommon";
fetch = {
type = "git";
url = "https://github.com/labstack/gommon";
rev = "v0.3.0";
sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0";
};
}
{
goPackagePath = "github.com/libgit2/git2go";
fetch = {
@ -423,6 +729,33 @@
sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "v0.1.2";
sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "v0.0.9";
sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
};
}
{
goPackagePath = "github.com/mattn/goveralls";
fetch = {
type = "git";
url = "https://github.com/mattn/goveralls";
rev = "v0.0.2";
sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp";
};
}
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
@ -432,6 +765,15 @@
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
{
goPackagePath = "github.com/microcosm-cc/bluemonday";
fetch = {
type = "git";
url = "https://github.com/microcosm-cc/bluemonday";
rev = "v1.0.2";
sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2";
};
}
{
goPackagePath = "github.com/mitchellh/copystructure";
fetch = {
@ -468,6 +810,15 @@
sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
};
}
{
goPackagePath = "github.com/moul/http2curl";
fetch = {
type = "git";
url = "https://github.com/moul/http2curl";
rev = "v1.0.0";
sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0";
};
}
{
goPackagePath = "github.com/mwitkow/go-conntrack";
fetch = {
@ -482,8 +833,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
rev = "v1.7.0";
sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
rev = "v1.10.1";
sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d";
};
}
{
@ -491,8 +842,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
rev = "v1.4.3";
sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
rev = "v1.7.0";
sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y";
};
}
{
@ -513,13 +864,22 @@
sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
};
}
{
goPackagePath = "github.com/pingcap/errors";
fetch = {
type = "git";
url = "https://github.com/pingcap/errors";
rev = "v0.11.1";
sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "v0.8.0";
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
rev = "v0.8.1";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
@ -585,6 +945,15 @@
sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
};
}
{
goPackagePath = "github.com/ryanuber/columnize";
fetch = {
type = "git";
url = "https://github.com/ryanuber/columnize";
rev = "v2.1.0";
sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
};
}
{
goPackagePath = "github.com/sebest/xff";
fetch = {
@ -594,6 +963,24 @@
sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h";
};
}
{
goPackagePath = "github.com/sergi/go-diff";
fetch = {
type = "git";
url = "https://github.com/sergi/go-diff";
rev = "v1.0.0";
sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
};
}
{
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
rev = "v1.0.0";
sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
@ -635,8 +1022,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.3.0";
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
rev = "v1.4.0";
sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
};
}
{
@ -675,13 +1062,130 @@
sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q";
};
}
{
goPackagePath = "github.com/ugorji/go";
fetch = {
type = "git";
url = "https://github.com/ugorji/go";
rev = "v1.1.4";
sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
};
}
{
goPackagePath = "github.com/urfave/negroni";
fetch = {
type = "git";
url = "https://github.com/urfave/negroni";
rev = "v1.0.0";
sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp";
};
}
{
goPackagePath = "github.com/valyala/bytebufferpool";
fetch = {
type = "git";
url = "https://github.com/valyala/bytebufferpool";
rev = "v1.0.0";
sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
};
}
{
goPackagePath = "github.com/valyala/fasthttp";
fetch = {
type = "git";
url = "https://github.com/valyala/fasthttp";
rev = "v1.4.0";
sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956";
};
}
{
goPackagePath = "github.com/valyala/fasttemplate";
fetch = {
type = "git";
url = "https://github.com/valyala/fasttemplate";
rev = "v1.0.1";
sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq";
};
}
{
goPackagePath = "github.com/valyala/tcplisten";
fetch = {
type = "git";
url = "https://github.com/valyala/tcplisten";
rev = "ceec8f93295a";
sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf";
};
}
{
goPackagePath = "github.com/xeipuuv/gojsonpointer";
fetch = {
type = "git";
url = "https://github.com/xeipuuv/gojsonpointer";
rev = "df4f5c81cb3b";
sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn";
};
}
{
goPackagePath = "github.com/xeipuuv/gojsonreference";
fetch = {
type = "git";
url = "https://github.com/xeipuuv/gojsonreference";
rev = "bd5ef7bd5415";
sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
};
}
{
goPackagePath = "github.com/xeipuuv/gojsonschema";
fetch = {
type = "git";
url = "https://github.com/xeipuuv/gojsonschema";
rev = "v1.1.0";
sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg";
};
}
{
goPackagePath = "github.com/yalp/jsonpath";
fetch = {
type = "git";
url = "https://github.com/yalp/jsonpath";
rev = "5cc68e5049a0";
sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b";
};
}
{
goPackagePath = "github.com/yudai/gojsondiff";
fetch = {
type = "git";
url = "https://github.com/yudai/gojsondiff";
rev = "v1.0.0";
sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2";
};
}
{
goPackagePath = "github.com/yudai/golcs";
fetch = {
type = "git";
url = "https://github.com/yudai/golcs";
rev = "ecda9a501e82";
sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq";
};
}
{
goPackagePath = "github.com/yudai/pp";
fetch = {
type = "git";
url = "https://github.com/yudai/pp";
rev = "v2.0.1";
sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk";
};
}
{
goPackagePath = "gitlab.com/gitlab-org/gitaly";
fetch = {
type = "git";
url = "https://gitlab.com/gitlab-org/gitaly.git";
rev = "v1.57.0";
sha256 = "0mgawp5afcv9s4y8fq3mc4dn6hhdg1shbns8vmjwklh9bia988cy";
rev = "v1.74.0";
sha256 = "1gmrpzm4ijw8g1xj8b3vmvg4cmis7shvwxp5vl2r47a8mh2ql5pd";
};
}
{
@ -689,8 +1193,8 @@
fetch = {
type = "git";
url = "https://gitlab.com/gitlab-org/labkit.git";
rev = "905271af7abb";
sha256 = "144w5dikd82wz53drml9khlx39pmp6kgqccc5c0xfzpijbj7krbd";
rev = "3253d7975ca7";
sha256 = "1q7vqcbwzgwk4n09jnzdh2filv1aqclw9bgf3qjr5qrfk7hby58s";
};
}
{
@ -707,8 +1211,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "20be4c3c3ed5";
sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb";
rev = "4def268fd1a4";
sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
};
}
{
@ -716,8 +1220,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/lint";
rev = "06c8688daad7";
sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
rev = "d0100b6bd8b3";
sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7";
};
}
{
@ -761,8 +1265,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "953cdadca894";
sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1";
rev = "fde4db37ae7a";
sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3";
};
}
{
@ -806,8 +1310,8 @@
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
rev = "v1.16.0";
sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg";
rev = "v1.24.0";
sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6";
};
}
{
@ -855,6 +1359,33 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "gopkg.in/go-playground/assert.v1";
fetch = {
type = "git";
url = "https://gopkg.in/go-playground/assert.v1";
rev = "v1.2.1";
sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm";
};
}
{
goPackagePath = "gopkg.in/go-playground/validator.v8";
fetch = {
type = "git";
url = "https://gopkg.in/go-playground/validator.v8";
rev = "v8.18.2";
sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55";
};
}
{
goPackagePath = "gopkg.in/mgo.v2";
fetch = {
type = "git";
url = "https://gopkg.in/mgo.v2";
rev = "9856a29383ce";
sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
};
}
{
goPackagePath = "gopkg.in/tomb.v1";
fetch = {

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

@ -22,6 +22,7 @@ gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.1'
gem 'faraday', '~> 0.12'
gem 'marginalia', '~> 1.8.0'
# Authentication libraries
gem 'devise', '~> 4.6'
@ -101,7 +102,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0'
# HAML
gem 'hamlit', '~> 2.8.8'
gem 'hamlit', '~> 2.11.0'
# Files attachments
gem 'carrierwave', '~> 1.3'
@ -135,11 +136,11 @@ gem 'aws-sdk'
gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '2.2.1'
gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
@ -170,8 +171,8 @@ group :unicorn do
end
group :puma do
gem 'puma', '~> 3.12', require: false
gem 'puma_worker_killer', require: false
gem 'gitlab-puma', '~> 4.3.1.gitlab.2', require: false
gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
gem 'rack-timeout', require: false
end
@ -273,8 +274,8 @@ gem 'mimemagic', '~> 0.3.2'
gem 'fast_blank'
# Parse time & duration
gem 'chronic', '~> 0.10.2'
gem 'gitlab_chronic_duration', '~> 0.10.6.1'
gem 'gitlab-chronic', '~> 0.10.5'
gem 'gitlab_chronic_duration', '~> 0.10.6.2'
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -312,8 +313,7 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development
gem 'batch-loader', '~> 1.4.0'
# Perf bar
# https://gitlab.com/gitlab-org/gitlab/issues/13996
gem 'gitlab-peek', '~> 0.0.1', require: 'peek'
gem 'peek', '~> 1.1'
# Snowplow events tracking
gem 'snowplow-tracker', '~> 0.6.1'
@ -347,20 +347,15 @@ group :development do
end
group :development, :test do
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
gem 'awesome_print', require: false
gem 'fuubar', '~> 2.2.0'
gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 5.1.0'
gem 'rspec-rails', '~> 3.8.0'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false
gem 'rspec-rails', '~> 4.0.0.beta3'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.11.0'
@ -368,10 +363,6 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.10'
gem 'capybara', '~> 3.22.0'
gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.141'
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
@ -382,7 +373,7 @@ group :development, :test do
gem 'rubocop-rspec', '~> 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.31.0', require: false
gem 'haml_lint', '~> 0.34.0', require: false
gem 'simplecov', '~> 0.16.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
@ -390,7 +381,7 @@ group :development, :test do
gem 'knapsack', '~> 1.17'
gem 'stackprof', '~> 0.2.10', require: false
gem 'stackprof', '~> 0.2.13', require: false
gem 'simple_po_parser', '~> 1.1.2', require: false
@ -403,6 +394,16 @@ group :development, :test, :omnibus do
end
group :test do
gem 'fuubar', '~> 2.2.0'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.22.0'
gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.142'
gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
@ -416,7 +417,7 @@ end
gem 'octokit', '~> 4.9'
gem 'mail_room', '~> 0.9.1'
gem 'mail_room', '~> 0.10.0'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -451,7 +452,7 @@ group :ed25519 do
end
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 1.70.0'
gem 'gitaly', '~> 1.73.0'
gem 'grpc', '~> 1.24.0'

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

@ -118,9 +118,9 @@ GEM
brakeman (4.2.1)
browser (2.5.3)
builder (3.2.3)
bullet (5.5.1)
bullet (6.0.2)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.10.0)
uniform_notifier (~> 1.11)
bundler-audit (0.5.0)
bundler (~> 1.2)
thor (~> 0.18)
@ -143,9 +143,7 @@ GEM
cause (0.1)
character_set (1.1.2)
charlock_holmes (0.7.6)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
childprocess (3.0.0)
chunky_png (1.3.5)
citrus (3.0.2)
claide (1.0.3)
@ -157,7 +155,7 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
colored2 (3.1.2)
commonmarker (0.17.13)
commonmarker (0.20.1)
ruby-enum (~> 0.5)
concord (0.1.5)
adamantium (~> 0.2.0)
@ -287,7 +285,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.10.0)
ffi (1.11.1)
ffi (1.11.3)
flipper (0.17.1)
flipper-active_record (0.17.1)
activerecord (>= 4.2, < 7)
@ -359,9 +357,11 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
git (1.5.0)
gitaly (1.70.0)
gitaly (1.73.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-labkit (0.7.0)
actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0)
@ -372,8 +372,11 @@ GEM
gitlab-license (1.0.0)
gitlab-markup (1.7.0)
gitlab-net-dns (0.9.1)
gitlab-peek (0.0.1)
railties (>= 4.0.0)
gitlab-puma (4.3.1.gitlab.2)
nio4r (~> 2.0)
gitlab-puma_worker_killer (0.1.1.gitlab.1)
get_process_mem (~> 0.2)
gitlab-puma (>= 2.7, < 5)
gitlab-sidekiq-fetcher (0.5.2)
sidekiq (~> 5)
gitlab-styles (2.8.0)
@ -381,8 +384,8 @@ GEM
rubocop-gitlab-security (~> 0.1.0)
rubocop-performance (~> 1.1.0)
rubocop-rspec (~> 1.19)
gitlab_chronic_duration (0.10.6.1)
numerizer (~> 0.1.1)
gitlab_chronic_duration (0.10.6.2)
numerizer (~> 0.2)
gitlab_omniauth-ldap (2.1.1)
net-ldap (~> 0.16)
omniauth (~> 1.3)
@ -460,17 +463,16 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
haml (5.0.4)
haml (5.1.2)
temple (>= 0.8.0)
tilt
haml_lint (0.31.0)
haml (>= 4.0, < 5.1)
haml_lint (0.34.0)
haml (>= 4.0, < 5.2)
rainbow
rake (>= 10, < 13)
rubocop (>= 0.50.0)
sysexits (~> 1.1)
hamlit (2.8.8)
temple (>= 0.8.0)
hamlit (2.11.0)
temple (>= 0.8.2)
thor
tilt
hangouts-chat (0.0.5)
@ -484,7 +486,7 @@ GEM
hipchat (1.5.2)
httparty
mimemagic
html-pipeline (2.8.4)
html-pipeline (2.12.2)
activesupport (>= 2)
nokogiri (>= 1.4)
html2text (0.2.0)
@ -591,9 +593,12 @@ GEM
lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
mail_room (0.9.1)
mail_room (0.10.0)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marginalia (1.8.0)
actionpack (>= 2.3)
activerecord (>= 2.3)
memoist (0.16.0)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
@ -622,7 +627,7 @@ GEM
net-ntp (2.1.3)
net-ssh (5.2.0)
netrc (0.11.0)
nio4r (2.3.1)
nio4r (2.5.2)
no_proxy_fix (0.1.2)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
@ -631,7 +636,7 @@ GEM
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
numerizer (0.1.1)
numerizer (0.2.0)
oauth (0.5.4)
oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0)
@ -724,6 +729,8 @@ GEM
parser (2.6.3.0)
ast (~> 2.4.0)
parslet (1.8.2)
peek (1.1.0)
railties (>= 4.0.0)
pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
@ -749,10 +756,6 @@ GEM
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.1.1)
puma (3.12.0)
puma_worker_killer (0.1.0)
get_process_mem (~> 0.2)
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6)
rack (2.0.7)
@ -881,14 +884,14 @@ GEM
proc_to_ast
rspec (>= 2.13, < 4)
unparser
rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-rails (4.0.0.beta3)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.8)
rspec-expectations (~> 3.8)
rspec-mocks (~> 3.8)
rspec-support (~> 3.8)
rspec-retry (0.6.1)
rspec-core (> 3.3)
rspec-set (0.1.3)
@ -927,7 +930,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.3.0)
rugged (0.28.3.1)
rugged (0.28.4.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@ -956,9 +959,9 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
selenium-webdriver (3.142.6)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
@ -1002,7 +1005,7 @@ GEM
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
sshkey (2.0.0)
stackprof (0.2.10)
stackprof (0.2.13)
state_machines (0.5.0)
state_machines-activemodel (0.7.1)
activemodel (>= 4.1)
@ -1017,7 +1020,7 @@ GEM
sys-filesystem (1.1.6)
ffi
sysexits (1.2.0)
temple (0.8.1)
temple (0.8.2)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
test-prof (0.10.0)
@ -1026,10 +1029,10 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.19.4)
thor (0.20.3)
thread_safe (0.3.6)
thrift (0.11.0.0)
tilt (2.0.9)
tilt (2.0.10)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
toml (0.2.0)
@ -1057,7 +1060,7 @@ GEM
unicorn-worker-killer (0.4.4)
get_process_mem (~> 0)
unicorn (>= 4, < 6)
uniform_notifier (1.10.0)
uniform_notifier (1.13.0)
unleash (0.1.5)
murmurhash3 (~> 0.1.6)
unparser (0.4.5)
@ -1139,14 +1142,13 @@ DEPENDENCIES
bootstrap_form (~> 4.2.0)
brakeman (~> 4.2)
browser (~> 2.5)
bullet (~> 5.5.0)
bullet (~> 6.0.2)
bundler-audit (~> 0.5.0)
capybara (~> 3.22.0)
capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
commonmarker (~> 0.17)
commonmarker (~> 0.20)
concurrent-ruby (~> 1.1)
connection_pool (~> 2.0)
countries (~> 3.0)
@ -1194,16 +1196,18 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 1.70.0)
gitaly (~> 1.73.0)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-labkit (~> 0.5)
gitlab-license (~> 1.0)
gitlab-markup (~> 1.7.0)
gitlab-net-dns (~> 0.9.1)
gitlab-peek (~> 0.0.1)
gitlab-puma (~> 4.3.1.gitlab.2)
gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
gitlab-sidekiq-fetcher (= 0.5.2)
gitlab-styles (~> 2.7)
gitlab_chronic_duration (~> 0.10.6.1)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
@ -1219,13 +1223,13 @@ DEPENDENCIES
grpc (~> 1.24.0)
gssapi
guard-rspec
haml_lint (~> 0.31.0)
hamlit (~> 2.8.8)
haml_lint (~> 0.34.0)
hamlit (~> 2.11.0)
hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes
health_check (~> 2.6.0)
hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html-pipeline (~> 2.12)
html2text
httparty (~> 0.16.4)
icalendar
@ -1243,7 +1247,8 @@ DEPENDENCIES
licensee (~> 8.9)
lograge (~> 0.5)
loofah (~> 2.2)
mail_room (~> 0.9.1)
mail_room (~> 0.10.0)
marginalia (~> 1.8.0)
memory_profiler (~> 0.9)
method_source (~> 0.8)
mimemagic (~> 0.3.2)
@ -1275,13 +1280,12 @@ DEPENDENCIES
omniauth_crowd (~> 2.2.0)
omniauth_openid_connect (~> 0.3.3)
org-ruby (~> 0.9.12)
peek (~> 1.1)
pg (~> 1.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.9.10)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
puma (~> 3.12)
puma_worker_killer
rack (~> 2.0.7)
rack-attack (~> 6.2.0)
rack-cors (~> 1.0.0)
@ -1307,7 +1311,7 @@ DEPENDENCIES
rouge (~> 3.11.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
rspec-rails (~> 3.8.0)
rspec-rails (~> 4.0.0.beta3)
rspec-retry (~> 0.6.1)
rspec-set (~> 0.1.3)
rspec_junit_formatter
@ -1325,7 +1329,7 @@ DEPENDENCIES
sassc-rails (~> 2.1.0)
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.141)
selenium-webdriver (~> 3.142)
sentry-raven (~> 2.9)
settingslogic (~> 2.0.9)
shoulda-matchers (~> 4.0.1)
@ -1339,7 +1343,7 @@ DEPENDENCIES
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0)
sshkey (~> 2.0)
stackprof (~> 0.2.10)
stackprof (~> 0.2.13)
state_machines-activerecord (~> 0.6.0)
sys-filesystem (~> 1.1.6)
test-prof (~> 0.10.0)

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

@ -545,10 +545,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pdq3ckmwxnwrdm2x89zfj68h0yhiln35y8wps2nkvam4kpivyr5";
sha256 = "1h16vrqblcdlizgbidk7bgmhcfb96a9y5jw117my5yhs07yp0i3s";
type = "gem";
};
version = "5.5.1";
version = "6.0.2";
};
bundler-audit = {
dependencies = ["thor"];
@ -639,25 +639,14 @@
version = "0.7.6";
};
childprocess = {
dependencies = ["ffi"];
groups = ["default" "development" "test"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5";
type = "gem";
};
version = "0.9.0";
};
chronic = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
type = "gem";
};
version = "0.10.2";
version = "3.0.0";
};
chunky_png = {
groups = ["default"];
@ -741,10 +730,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9";
sha256 = "19zd9na1g2d0zzbqhmfj8rjfzcxj34vja3i52gvv859i8fifa461";
type = "gem";
};
version = "0.17.13";
version = "0.20.1";
};
concord = {
dependencies = ["adamantium" "equalizer"];
@ -1385,10 +1374,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd";
type = "gem";
};
version = "1.11.1";
version = "1.11.3";
};
flipper = {
groups = ["default"];
@ -1655,10 +1644,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b705d2fmdisirf3hydakswdr8jq786wbqn053gvxgssrwcdlrq3";
sha256 = "1bls6aywjkvq1jw324criphzbzl710rx1nab4y22bvyi98qvdi38";
type = "gem";
};
version = "1.70.0";
version = "1.73.0";
};
github-markup = {
groups = ["default"];
@ -1670,6 +1659,17 @@
};
version = "1.7.0";
};
gitlab-chronic = {
dependencies = ["numerizer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xf857vj55r1jafbkdpdzq6c22r964rj9186m1q8hw4vd7f1h3zq";
type = "gem";
};
version = "0.10.5";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
groups = ["default"];
@ -1711,16 +1711,27 @@
};
version = "0.9.1";
};
gitlab-peek = {
dependencies = ["railties"];
groups = ["default"];
gitlab-puma = {
dependencies = ["nio4r"];
groups = ["puma"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r5a1cjhw8dyz1az9rhqh252rvsjhvbs28wnmk0lnqkvyydip4ql";
sha256 = "0a0kihx7ps6hc1a5xbpbssqnh1k0gzfvln7xkjinpqipvk53l094";
type = "gem";
};
version = "0.0.1";
version = "4.3.1.gitlab.2";
};
gitlab-puma_worker_killer = {
dependencies = ["get_process_mem" "gitlab-puma"];
groups = ["puma"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iagbqh4djbxfd18srvfg9qcxn845ibs3kf0q1sd57k27lxj0har";
type = "gem";
};
version = "0.1.1.gitlab.1";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
@ -1750,10 +1761,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rajna3aijqj8ap55xggawyh2xzh1vkrmzkjh3ja5x05qsf9csgs";
sha256 = "1yq5a4vs96xz5yxqkfwcvzw0riww7mf87j1s2s7rb6yagpz4rnkd";
type = "gem";
};
version = "0.10.6.1";
version = "0.10.6.2";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@ -1978,21 +1989,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac";
sha256 = "0dwarfbc04bblljs4xg9fy57b5y8xrck6slhssa6bd7x58bh222c";
type = "gem";
};
version = "5.0.4";
version = "5.1.2";
};
haml_lint = {
dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"];
dependencies = ["haml" "rainbow" "rubocop" "sysexits"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k6pvb2lc6d72nq01jqmi3mxpp80m9mmbc265kgaxmcnjxqhacb1";
sha256 = "1iaaa5as4nlblnbvy6pxj8z9k3jqspbh4f43il519f28lgi0llsn";
type = "gem";
};
version = "0.31.0";
version = "0.34.0";
};
hamlit = {
dependencies = ["temple" "thor" "tilt"];
@ -2000,10 +2011,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i";
sha256 = "13wkrvyldk21xlc9illam495fpgf7w7bksaj8y6n00y036wmbg60";
type = "gem";
};
version = "2.8.8";
version = "2.11.0";
};
hangouts-chat = {
groups = ["default"];
@ -2084,10 +2095,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2";
type = "gem";
};
version = "2.8.4";
version = "2.12.2";
};
html2text = {
dependencies = ["nokogiri"];
@ -2561,10 +2572,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16b8yjd1if665mwaindwys06nkkcs0jw3dcsqvn6qbp6alfigqaa";
sha256 = "0q06fkv6wka68gbva17jknm57jnjwk57f9ng1lvyvwki2v4jnkz4";
type = "gem";
};
version = "0.9.1";
version = "0.10.0";
};
marcel = {
dependencies = ["mimemagic"];
@ -2577,6 +2588,17 @@
};
version = "0.3.3";
};
marginalia = {
dependencies = ["actionpack" "activerecord"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1akbiibmg64liw8ya6xzf9lavh2n2707hxsnf9sfslsk36iwx0yn";
type = "gem";
};
version = "1.8.0";
};
memoist = {
groups = ["default"];
platforms = [];
@ -2835,14 +2857,14 @@
version = "0.11.0";
};
nio4r = {
groups = ["default" "development" "test"];
groups = ["default" "puma" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr";
sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c";
type = "gem";
};
version = "2.3.1";
version = "2.5.2";
};
no_proxy_fix = {
groups = ["default" "development"];
@ -2892,10 +2914,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h";
sha256 = "0ysxf30qcybh131r98frp38sqqkdhcjwpnajgrxl2w2kxvapd075";
type = "gem";
};
version = "0.1.1";
version = "0.2.0";
};
oauth = {
groups = ["default"];
@ -3263,6 +3285,17 @@
};
version = "1.8.2";
};
peek = {
dependencies = ["railties"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k1yggixrcj72jlc98hi3jjd04x71dpynn8dxpcdhinyijniwl6n";
type = "gem";
};
version = "1.1.0";
};
pg = {
groups = ["default" "development" "test"];
platforms = [];
@ -3388,27 +3421,6 @@
};
version = "3.1.1";
};
puma = {
groups = ["puma"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
type = "gem";
};
version = "3.12.0";
};
puma_worker_killer = {
dependencies = ["get_process_mem" "puma"];
groups = ["puma"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
type = "gem";
};
version = "0.1.0";
};
pyu-ruby-sasl = {
groups = ["default"];
platforms = [];
@ -3981,10 +3993,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1";
sha256 = "164dni69b9imgv33rxzsy3272ni10xny0f4dbx6k90zr1cgzmj5s";
type = "gem";
};
version = "3.8.2";
version = "4.0.0.beta3";
};
rspec-retry = {
dependencies = ["rspec-core"];
@ -4192,10 +4204,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx";
type = "gem";
};
version = "0.28.3.1";
version = "0.28.4.1";
};
safe_yaml = {
groups = ["default" "test"];
@ -4297,14 +4309,14 @@
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
groups = ["development" "test"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs";
sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb";
type = "gem";
};
version = "3.141.0";
version = "3.142.6";
};
sentry-raven = {
dependencies = ["faraday"];
@ -4522,10 +4534,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski";
sha256 = "1wck8lqmlndaic2c8z678ylxkkyqlip9ikms9x6lplk298rrdybl";
type = "gem";
};
version = "0.2.10";
version = "0.2.13";
};
state_machines = {
groups = ["default"];
@ -4596,10 +4608,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09";
sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861";
type = "gem";
};
version = "0.8.1";
version = "0.8.2";
};
terminal-table = {
dependencies = ["unicode-display_width"];
@ -4644,14 +4656,14 @@
version = "1.7.2";
};
thor = {
groups = ["default" "development" "test"];
groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns";
sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
type = "gem";
};
version = "0.19.4";
version = "0.20.3";
};
thread_safe = {
groups = ["default" "development" "test"];
@ -4678,10 +4690,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
type = "gem";
};
version = "2.0.9";
version = "2.0.10";
};
timecop = {
groups = ["development" "test"];
@ -4846,10 +4858,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l";
sha256 = "0vm4aix8jmv42s1x58m3lj3xwkbxyn9qn6lzhhig0d1j8fv6j30c";
type = "gem";
};
version = "1.10.0";
version = "1.13.0";
};
unleash = {
dependencies = ["murmurhash3"];

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

@ -195,7 +195,7 @@ def update_gitlab_shell():
for fn in ['go.mod', 'go.sum']:
with open(gitlab_shell_dir / fn, 'w') as f:
f.write(repo.get_file(f"go/{fn}", f"v{gitlab_shell_version}"))
f.write(repo.get_file(fn, f"v{gitlab_shell_version}"))
subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir)

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

@ -257,6 +257,14 @@
sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5";
};
}
{
name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.7.5.tgz";
path = fetchurl {
name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.7.5.tgz";
url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.5.tgz";
sha1 = "f0835f044cef85b31071a924010a2a390add11d4";
};
}
{
name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz";
path = fetchurl {
@ -321,6 +329,14 @@
sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c";
};
}
{
name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.7.4.tgz";
path = fetchurl {
name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.7.4.tgz";
url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.7.4.tgz";
sha1 = "c91fdde6de85d2eb8906daea7b21944c3610c901";
};
}
{
name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
path = fetchurl {
@ -626,11 +642,11 @@
};
}
{
name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz";
name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz";
path = fetchurl {
name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.6.0.tgz";
sha1 = "1fd247d6ab477d53d4c330e05f007e3afa303689";
name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-2.0.0.tgz";
sha1 = "e30dbf2b170a7a4ca003a321de9f4170a2512510";
};
}
{
@ -650,35 +666,35 @@
};
}
{
name = "_gitlab_svgs___svgs_1.82.0.tgz";
name = "_gitlab_svgs___svgs_1.88.0.tgz";
path = fetchurl {
name = "_gitlab_svgs___svgs_1.82.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.82.0.tgz";
sha1 = "c059c460afc13ebfe9df370521ca8963fa5afb80";
name = "_gitlab_svgs___svgs_1.88.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.88.0.tgz";
sha1 = "0a9b72e9591264fcac592ebf9944665c70f48de2";
};
}
{
name = "_gitlab_ui___ui_7.11.0.tgz";
name = "_gitlab_ui___ui_8.8.0.tgz";
path = fetchurl {
name = "_gitlab_ui___ui_7.11.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-7.11.0.tgz";
sha1 = "b5c981f3b1edbf0ad75bcca8fa1cd81017676b3b";
name = "_gitlab_ui___ui_8.8.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-8.8.0.tgz";
sha1 = "c22b4dece89d224c525b3510970f3c61321a6765";
};
}
{
name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz";
name = "_gitlab_visual_review_tools___visual_review_tools_1.5.1.tgz";
path = fetchurl {
name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.2.0.tgz";
sha1 = "8d6757917193c1023012bb4a316dc1a97309a27a";
name = "_gitlab_visual_review_tools___visual_review_tools_1.5.1.tgz";
url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.5.1.tgz";
sha1 = "2552927cd7a376f1f06ef3293a69fe2ffcdddb52";
};
}
{
name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz";
name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz";
path = fetchurl {
name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz";
url = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.2.1.tgz";
sha1 = "f407b5aa710863e5b7f021f4a1f66160331ab263";
name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.3.0.tgz";
sha1 = "f21550d4ce406ee5f99447a02abf36250ecc922d";
};
}
{
@ -786,59 +802,59 @@
};
}
{
name = "_sentry_browser___browser_5.7.1.tgz";
name = "_sentry_browser___browser_5.10.2.tgz";
path = fetchurl {
name = "_sentry_browser___browser_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.1.tgz";
sha1 = "1f8435e2a325d7a09f830065ebce40a2b3c708a4";
name = "_sentry_browser___browser_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.10.2.tgz";
sha1 = "0bbb05505c58ea998c833cffec3f922fe4b4fa58";
};
}
{
name = "_sentry_core___core_5.7.1.tgz";
name = "_sentry_core___core_5.10.2.tgz";
path = fetchurl {
name = "_sentry_core___core_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.1.tgz";
sha1 = "3eb2b7662cac68245931ee939ec809bf7a639d0e";
name = "_sentry_core___core_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.10.2.tgz";
sha1 = "1cb64489e6f8363c3249415b49d3f1289814825f";
};
}
{
name = "_sentry_hub___hub_5.7.1.tgz";
name = "_sentry_hub___hub_5.10.2.tgz";
path = fetchurl {
name = "_sentry_hub___hub_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.1.tgz";
sha1 = "a52acd9fead7f3779d96e9965c6978aecc8b9cad";
name = "_sentry_hub___hub_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.10.2.tgz";
sha1 = "25d9f36b8f7c5cb65cf486737fa61dc9bf69b7e3";
};
}
{
name = "_sentry_minimal___minimal_5.7.1.tgz";
name = "_sentry_minimal___minimal_5.10.2.tgz";
path = fetchurl {
name = "_sentry_minimal___minimal_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.1.tgz";
sha1 = "56afc537737586929e25349765e37a367958c1e1";
name = "_sentry_minimal___minimal_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.10.2.tgz";
sha1 = "267c2f3aa6877a0fe7a86971942e83f3ee616580";
};
}
{
name = "_sentry_types___types_5.7.1.tgz";
name = "_sentry_types___types_5.10.0.tgz";
path = fetchurl {
name = "_sentry_types___types_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.1.tgz";
sha1 = "4c4c1d4d891b6b8c2c3c7b367d306a8b1350f090";
name = "_sentry_types___types_5.10.0.tgz";
url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.10.0.tgz";
sha1 = "4f0ba31b6e4d5371112c38279f11f66c73b43746";
};
}
{
name = "_sentry_utils___utils_5.7.1.tgz";
name = "_sentry_utils___utils_5.10.2.tgz";
path = fetchurl {
name = "_sentry_utils___utils_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.1.tgz";
sha1 = "cf37ad55f78e317665cd8680f202d307fa77f1d0";
name = "_sentry_utils___utils_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.10.2.tgz";
sha1 = "261f575079d30aaf604e59f5f4de0aa21db22252";
};
}
{
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz";
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.14.tgz";
path = fetchurl {
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz";
url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.13.tgz";
sha1 = "4fd5fe1e0088c63b2a26be231c5a2a4ca79b1596";
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.14.tgz";
url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.14.tgz";
sha1 = "e12b08371dc37bf4a468450b008c6e167705e1a8";
};
}
{
@ -921,14 +937,6 @@
sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a";
};
}
{
name = "_types_jquery___jquery_2.0.48.tgz";
path = fetchurl {
name = "_types_jquery___jquery_2.0.48.tgz";
url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.48.tgz";
sha1 = "3e90d8cde2d29015e5583017f7830cb3975b2eef";
};
}
{
name = "_types_minimatch___minimatch_3.0.3.tgz";
path = fetchurl {
@ -1601,6 +1609,14 @@
sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
};
}
{
name = "array_includes___array_includes_3.0.3.tgz";
path = fetchurl {
name = "array_includes___array_includes_3.0.3.tgz";
url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz";
sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d";
};
}
{
name = "array_union___array_union_1.0.2.tgz";
path = fetchurl {
@ -4322,19 +4338,19 @@
};
}
{
name = "es_abstract___es_abstract_1.13.0.tgz";
name = "es_abstract___es_abstract_1.16.2.tgz";
path = fetchurl {
name = "es_abstract___es_abstract_1.13.0.tgz";
url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz";
sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9";
name = "es_abstract___es_abstract_1.16.2.tgz";
url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz";
sha1 = "4e874331645e9925edef141e74fc4bd144669d34";
};
}
{
name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
path = fetchurl {
name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
sha1 = "edf72478033456e8dda8ef09e00ad9650707f377";
name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a";
};
}
{
@ -4418,11 +4434,11 @@
};
}
{
name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz";
name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz";
path = fetchurl {
name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz";
url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz";
sha1 = "546178dab5e046c8b562bbb50705e2456d7bda49";
name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz";
url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz";
sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c";
};
}
{
@ -4434,11 +4450,11 @@
};
}
{
name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz";
name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz";
path = fetchurl {
name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz";
sha1 = "97ac3e75d0791c4fac0e15ef388510217be7f66f";
name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz";
sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6";
};
}
{
@ -4458,11 +4474,11 @@
};
}
{
name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz";
name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz";
path = fetchurl {
name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.1.0.tgz";
sha1 = "d03b74224c5cfbc7fc0bdd12ce4eb400d09e0c0b";
name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.0.tgz";
sha1 = "fccdad84afa61baa4c0527dd6249cdcbfa0f74a8";
};
}
{
@ -5602,11 +5618,11 @@
};
}
{
name = "has_symbols___has_symbols_1.0.0.tgz";
name = "has_symbols___has_symbols_1.0.1.tgz";
path = fetchurl {
name = "has_symbols___has_symbols_1.0.0.tgz";
url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz";
sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
name = "has_symbols___has_symbols_1.0.1.tgz";
url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz";
sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8";
};
}
{
@ -8617,6 +8633,14 @@
sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
};
}
{
name = "object_inspect___object_inspect_1.7.0.tgz";
path = fetchurl {
name = "object_inspect___object_inspect_1.7.0.tgz";
url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz";
sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67";
};
}
{
name = "object_keys___object_keys_1.1.1.tgz";
path = fetchurl {
@ -8665,6 +8689,14 @@
sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
};
}
{
name = "object.values___object.values_1.1.0.tgz";
path = fetchurl {
name = "object.values___object.values_1.1.0.tgz";
url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz";
sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9";
};
}
{
name = "obuf___obuf_1.1.2.tgz";
path = fetchurl {
@ -10402,11 +10434,11 @@
};
}
{
name = "resolve___resolve_1.11.1.tgz";
name = "resolve___resolve_1.12.0.tgz";
path = fetchurl {
name = "resolve___resolve_1.11.1.tgz";
url = "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz";
sha1 = "ea10d8110376982fef578df8fc30b9ac30a07a3e";
name = "resolve___resolve_1.12.0.tgz";
url = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz";
sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6";
};
}
{
@ -11265,6 +11297,22 @@
sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff";
};
}
{
name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz";
path = fetchurl {
name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz";
url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634";
};
}
{
name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz";
path = fetchurl {
name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz";
url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58";
};
}
{
name = "string_decoder___string_decoder_1.1.1.tgz";
path = fetchurl {
@ -11457,6 +11505,14 @@
sha1 = "5bd9f6defc133859a044646d4743fabc28db7e2d";
};
}
{
name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz";
path = fetchurl {
name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz";
url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.24.3.tgz";
sha1 = "99754d11b0ddd314a1a50db850acb415e4b0a0c6";
};
}
{
name = "symbol_observable___symbol_observable_1.2.0.tgz";
path = fetchurl {
@ -11634,11 +11690,11 @@
};
}
{
name = "timeago.js___timeago.js_3.0.2.tgz";
name = "timeago.js___timeago.js_4.0.1.tgz";
path = fetchurl {
name = "timeago.js___timeago.js_3.0.2.tgz";
url = "https://registry.yarnpkg.com/timeago.js/-/timeago.js-3.0.2.tgz";
sha1 = "32a67e7c0d887ea42ca588d3aae26f77de5e76cc";
name = "timeago.js___timeago.js_4.0.1.tgz";
url = "https://registry.yarnpkg.com/timeago.js/-/timeago.js-4.0.1.tgz";
sha1 = "4be4aa19565ceaeb0da31fe14e01ce6ca4742da6";
};
}
{

4
pkgs/applications/video/obs-studio/default.nix
View File

@ -37,13 +37,13 @@ let
inherit (stdenv.lib) optional optionals;
in mkDerivation rec {
pname = "obs-studio";
version = "24.0.4";
version = "24.0.6";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = version;
sha256 = "0m15ch2ix9qrdf1a9mj7wcpl72z3h13zx60c9q72sb1435id2g1q";
sha256 = "07grnab5v4fd4lw25adhnlifs5c5phc3rsz7h80m663nbszy7abh";
};
nativeBuildInputs = [ cmake pkgconfig ];

24
pkgs/applications/video/shotcut/default.nix
View File

@ -3,34 +3,20 @@
, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools
}:
assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
let
# https://github.com/mltframework/shotcut/issues/771
fixVaapiRendering1 = fetchpatch {
url = "https://github.com/peti/shotcut/commit/038f6839298fc1e9e80ddf84fe168a78118bc625.patch";
sha256 = "153z1g6criszd6gdkw4f5zk0gmh0jar6l2g8fzwjhhcvkdz30vbp";
};
fixVaapiRendering2 = fetchpatch {
url = "https://github.com/peti/shotcut/commit/653c485f92d2847fdac517e3f797c9254826ffab.patch";
sha256 = "1qd0zgyahda72xh3avlg7lg0jq94wq5847154qlrgzj8b4n7vizw";
};
in
assert stdenv.lib.versionAtLeast libmlt.version "6.18.0";
assert stdenv.lib.versionAtLeast mlt.version "6.18.0";
mkDerivation rec {
pname = "shotcut";
version = "19.09.14";
version = "19.12.31";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn";
sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9";
};
patches = [ fixVaapiRendering1 fixVaapiRendering2 ];
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
@ -74,7 +60,7 @@ mkDerivation rec {
'';
homepage = https://shotcut.org;
license = licenses.gpl3;
maintainers = with maintainers; [ goibhniu woffs ];
maintainers = with maintainers; [ goibhniu woffs peti ];
platforms = platforms.linux;
};
}

6
pkgs/applications/virtualization/docker/default.nix
View File

@ -206,9 +206,9 @@ rec {
};
docker_19_03 = makeOverridable dockerGen {
version = "19.03.4";
rev = "9013bf583a215dc1488d941f9b6f7f11e1ea899f";
sha256 = "094d6d93jd7g1vw362cqbv9qbyv8h6pb6dj750pgqvnf1bn1mffb";
version = "19.03.5";
rev = "633a0ea838f10e000b7c6d6eed1623e6e988b5bc";
sha256 = "1cs38ffh5xn8c40rln4pvd53iahvi4kys9an6kpclvvciqfc2cxs";
runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657";
runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj";
containerdRev = "b34a5c8af56e510852c35414db4c1f4fa6172339";

13
pkgs/applications/window-managers/compton/default.nix → pkgs/applications/window-managers/picom/default.nix
View File

@ -3,15 +3,16 @@
, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev
, dbus, libconfig, libdrm, libGL, pcre, libX11
, libXinerama, libXext, xwininfo, libxdg_basedir }:
stdenv.mkDerivation rec {
pname = "compton";
version = "7.2";
pname = "picom";
version = "7.5";
src = fetchFromGitHub {
owner = "yshui";
repo = "compton";
repo = "picom";
rev = "v${version}";
sha256 = "1vwa5f0nifc1913diqd6cp5k1dlfyc2ijxbcdj1s37ywpx6c63c3";
sha256 = "1l48fxl04vkzr4r94sl37nbbw7a621rn8sxmkbdv4252i1gjxd4z";
fetchSubmodules = true;
};
@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$(out)" ];
postInstall = ''
wrapProgram $out/bin/compton-trans \
wrapProgram $out/bin/picom-trans \
--prefix PATH : ${lib.makeBinPath [ xwininfo ]}
'';
@ -57,7 +58,7 @@ stdenv.mkDerivation rec {
well-defined and proper place.
'';
license = licenses.mit;
homepage = "https://github.com/yshui/compton";
homepage = "https://github.com/yshui/picom";
maintainers = with maintainers; [ ertes enzime twey ];
platforms = platforms.linux;
};

4
pkgs/data/themes/obsidian2/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "theme-obsidian2";
version = "2.9";
version = "2.10";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "theme-obsidian-2";
rev = "v${version}";
sha256 = "1m89ws2a4nms4m8187d5cxi281b66i59xa5shlp3g1r2jc4312cy";
sha256 = "123f6hpz0h5xfmas44xa1ci68w8f3lcjj54jpnrqhsww66c9vs0i";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];

4
pkgs/desktops/xfce/applications/catfish/default.nix
View File

@ -5,11 +5,11 @@
python3Packages.buildPythonApplication rec {
pname = "catfish";
version = "1.4.11";
version = "1.4.12";
src = fetchurl {
url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "11fdzz3l5mydscs4a398siphxwr6xf3cfyimr0hgpkg3169syyv1";
sha256 = "0jhk4x97vip6h7rsw8hbwzfjmz55w6dpcj9v96m54xr15gh31yy3";
};
nativeBuildInputs = [

2
pkgs/development/compilers/llvm/8/llvm.nix
View File

@ -109,7 +109,7 @@ in stdenv.mkDerivation ({
"-DCAN_TARGET_i386=false"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DCMAKE_CROSSCOMPILING=True"
"-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen"
"-DLLVM_TABLEGEN=${buildPackages.llvm_8}/bin/llvm-tblgen"
];
postBuild = ''

2
pkgs/development/compilers/llvm/9/llvm.nix
View File

@ -126,7 +126,7 @@ in stdenv.mkDerivation (rec {
"-DCAN_TARGET_i386=false"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DCMAKE_CROSSCOMPILING=True"
"-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen"
"-DLLVM_TABLEGEN=${buildPackages.llvm_9}/bin/llvm-tblgen"
];
postBuild = ''

6
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -96472,7 +96472,7 @@ self: {
"git-annex" = callPackage
({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder
, bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
, bloomfilter, byteable, bytestring, Cabal, case-insensitive
, clientsession, concurrent-output, conduit, connection, containers
, crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq
, directory, disk-free-space, dlist, edit-distance, exceptions
@ -96524,7 +96524,7 @@ self: {
wai-extra warp warp-tls yesod yesod-core yesod-form yesod-static
];
executableSystemDepends = [
bup curl git gnupg lsof openssh perl rsync wget which
curl git gnupg lsof openssh perl rsync wget which
];
preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
postBuild = ''
@ -96537,7 +96537,7 @@ self: {
description = "manage files with git, without checking their contents into git";
license = stdenv.lib.licenses.agpl3;
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git;
}) {inherit (pkgs) curl; inherit (pkgs) git;
inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh;
inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget;
inherit (pkgs) which;};

44
pkgs/development/interpreters/micropython/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, libffi, python3, readline }:
stdenv.mkDerivation rec {
pname = "micropython";
version = "1.12";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
rev = "v${version}";
sha256 = "1fsigdahnv5yn0mc7dr1y6h7g8ywg084pcgj6d64kb39w641n8j5";
fetchSubmodules = true;
};
nativeBuildInputs = [ pkgconfig python3 ];
buildInputs = [ libffi readline ];
doCheck = true;
buildPhase = ''
make -C mpy-cross
make -C ports/unix
'';
checkPhase = ''
pushd tests
MICROPY_MICROPYTHON=../ports/unix/micropython ${python3.interpreter} ./run-tests
popd
'';
installPhase = ''
mkdir -p $out/bin
install -Dm755 ports/unix/micropython $out/bin/micropython
'';
meta = with lib; {
description = "A lean and efficient Python implementation for microcontrollers and constrained systems";
homepage = "https://micropython.org";
platforms = [ "x86_64-linux" ];
license = licenses.mit;
maintainers = with maintainers; [ sgo ];
};
}

4
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -239,11 +239,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
stdenv.mkDerivation rec {
pname = "ffmpeg-full";
version = "4.2.1";
version = "4.2.2";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "1m5nkc61ihgcf0b2wabm0zyqa8sj3c0w8fi6kr879lb0kdzciiyf";
sha256 = "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb";
};
patches = [ ./prefer-libdav1d-over-libaom.patch ];

4
pkgs/development/libraries/ffmpeg/2.8.nix
View File

@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (rec {
version = "${branch}.14";
version = "${branch}.15";
branch = "2.8";
sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn";
sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m";
} // args)

4
pkgs/development/libraries/ffmpeg/4.nix
View File

@ -5,8 +5,8 @@
}@args:
callPackage ./generic.nix (rec {
version = "4.2.1";
version = "4.2.2";
branch = "4.2";
sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8";
sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)

14
pkgs/development/libraries/flatbuffers/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
pname = "flatbuffers";
version = "1.11.0";
@ -34,4 +34,12 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.unix;
homepage = https://google.github.io/flatbuffers/;
};
}
} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl {
# Remove when updating to the next version.
patches = [
(fetchpatch {
url = "https://github.com/google/flatbuffers/commit/2b52494047fb6e97af03e1801b42adc7ed3fd78a.diff";
sha256 = "01k07ws0f4w7nnl8nli795wgjm4p94lxd3kva4yf7nf3pg4p8arx";
})
];
})

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

@ -10,7 +10,7 @@ let
sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c";
};
version = "2.2.0";
version = "2.2.1";
in stdenv.mkDerivation {
pname = "libbladeRF";
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
owner = "Nuand";
repo = "bladeRF";
rev = "libbladeRF_v${version}";
sha256 = "0mdj5dkqg69gp0xw6gkhp86nxnm9g7az5rplnncxkp4p1kr35rnl";
sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l";
};
nativeBuildInputs = [ pkgconfig ];

2
pkgs/development/libraries/libmad/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals stdenv.cc.isClang [
(fetchpatch {
url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff";
sha256 = "1wp60ywzk6nmxc3kq3v6i8b7s4cibvf5cjir859zv10y5aa1d0pk";
sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6";
})
];

9
pkgs/development/libraries/mlt/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "mlt";
version = "6.16.0";
version = "6.18.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx";
sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx";
};
buildInputs = [
@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
# Mostly taken from:
# http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
configureFlags = [
"--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3"
"--enable-opengl"
"--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl"
];
enableParallelBuilding = true;
@ -43,7 +42,7 @@ stdenv.mkDerivation rec {
description = "Open source multimedia framework, designed for television broadcasting";
homepage = https://www.mltframework.org;
license = licenses.gpl3;
maintainers = [ maintainers.tohl ];
maintainers = with maintainers; [ tohl peti ];
platforms = platforms.linux;
};
}

4
pkgs/development/libraries/mlt/qt-5.nix
View File

@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec {
pname = "mlt";
version = "6.16.0";
version = "6.18.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx";
sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx";
};
buildInputs = [

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

@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;
stdenv.mkDerivation rec {
pname = "ntl";
version = "11.4.2";
version = "11.4.3";
src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
sha256 = "11r3f37psdbjw926kf6bn5bp69aj88f5cchvv1xh2bhrcjdp4r1b";
sha256 = "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp";
};
buildInputs = [

37
pkgs/development/libraries/science/math/mkl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin }:
{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin, enableStatic ? false }:
/*
For details on using mkl as a blas provider for python packages such as numpy,
numexpr, scipy, etc., see the Python section of the NixPkgs manual.
@ -46,12 +46,28 @@ in stdenvNoCC.mkDerivation {
tar xzvf $f
done
'' else ''
rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm
# Common stuff
rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm
rpmextract rpm/intel-mkl-common-f-${rpm-ver}.noarch.rpm
# Dynamic libraries
rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-gnu-f-rt-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-gnu-rt-${rpm-ver}.x86_64.rpm
# Intel OpenMP runtime
rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm
'';
'' + (if enableStatic then ''
# Static libraries
rpmextract rpm/intel-mkl-cluster-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-gnu-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-gnu-f-${rpm-ver}.x86_64.rpm
'' else ''
# Take care of installing dynamic-only PkgConfig files during the installPhase
''
);
installPhase = ''
for f in $(find . -name 'mkl*.pc') ; do
@ -80,16 +96,21 @@ in stdenvNoCC.mkDerivation {
cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig
'' else ''
mkdir -p $out/lib
cp license.txt $out/lib/
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/
mkdir -p $out/lib/pkgconfig
'') +
(if enableStatic then ''
cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/
cp license.txt $out/lib/
mkdir -p $out/lib/pkgconfig
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/* $out/lib/pkgconfig
'');
'' else ''
cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/*.so* $out/lib/
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/*.so* $out/lib/
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/*dynamic*.pc $out/lib/pkgconfig
'');
# fixDarwinDylibName fails for libmkl_cdft_core.dylib because the
# larger updated load commands do not fit. Use install_name_tool

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

@ -4,13 +4,13 @@ assert readline != null -> ncurses != null;
stdenv.mkDerivation rec {
pname = "sqlcipher";
version = "4.2.0";
version = "4.3.0";
src = fetchFromGitHub {
owner = "sqlcipher";
repo = "sqlcipher";
rev = "v${version}";
sha256 = "1wpymql2ps4k2qkfa5mdifihb1n815xlz7imcd8ri1gn2qla8q8i";
sha256 = "0s1aiwl61nl3b4ym4v050wlbbx0iypknqsj3ar12dw5hljlzx6f8";
};
buildInputs = [ readline ncurses openssl tcl ];

4
pkgs/development/libraries/unicorn-emu/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
configurePhase = '' patchShebangs make.sh '';
buildPhase = '' ./make.sh '';
buildPhase = '' ./make.sh '' + stdenv.lib.optionalString stdenv.isDarwin "macos-universal-no";
installPhase = '' env PREFIX=$out ./make.sh install '';
nativeBuildInputs = [ pkgconfig python ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Lightweight multi-platform CPU emulator library";
homepage = "http://www.unicorn-engine.org";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wolfssl";
version = "4.2.0";
version = "4.3.0";
src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}-stable";
sha256 = "16s7jx2brgii6jbpmr30ggkc7rrf388jl26g357sm7ggwliiwask";
sha256 = "1gd613k4qh9yhl0d8yh0flqn2cvm9qb5pp2p0khk31b1fh1p4vin";
};
configureFlags = [ "--enable-all" ];

2
pkgs/development/node-packages/default-v10.nix
View File

@ -21,7 +21,7 @@ nodePackages // {
};
dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
buildInputs = [ nodePackages.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ];
};
dnschain = nodePackages.dnschain.override {

4
pkgs/development/ocaml-modules/csv/default.nix
View File

@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "csv";
version = "2.2";
version = "2.4";
src = fetchurl {
url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
sha256 = "1llwjdi14vvfy4966crapibq0djii71x47b0yxhjcl5jw4xnsaha";
sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk";
};
meta = {

12
pkgs/development/perl-modules/timedate-2020.patch Normal file
View File

@ -0,0 +1,12 @@
Index: TimeDate-2.30/t/getdate.t
===================================================================
--- TimeDate-2.30.orig/t/getdate.t
+++ TimeDate-2.30/t/getdate.t
@@ -156,7 +156,7 @@ Jul 22 10:00:00 UTC 2002 ;102733200
!;
require Time::Local;
-my $offset = Time::Local::timegm(0,0,0,1,0,70);
+my $offset = Time::Local::timegm(0,0,0,1,0,1970);
@data = split(/\n/, $data);

53
pkgs/development/python-modules/azure-identity/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ buildPythonPackage
, fetchPypi
, isPy38
, lib
# pythonPackages
, azure-common
, azure-core
, azure-nspkg
, cryptography
, mock
, msal
, msal-extensions
, msrest
, msrestazure
}:
buildPythonPackage rec {
pname = "azure-identity";
version = "1.1.0";
disabled = isPy38;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1xn4nwi4vly8n3mmphv0wbdg9k55gsgmk3fdwma8rm3m3c7593hc";
};
propagatedBuildInputs = [
azure-common
azure-core
azure-nspkg
cryptography
mock
msal
msal-extensions
msrest
msrestazure
];
# Requires checkout from mono-repo and a mock account:
# https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/identity/tests.yml
doCheck = false;
meta = with lib; {
description = "Microsoft Azure Identity Library for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
};
}

35
pkgs/development/python-modules/azure-keyvault-nspkg/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ buildPythonPackage
, fetchPypi
, lib
# pythonPackages
, azure-nspkg
}:
buildPythonPackage rec {
pname = "azure-keyvault-nspkg";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0hdnd6124hx7s16z1pssmq5m5mqqqz8s38ixl9aayv4wmf5bhs5c";
};
propagatedBuildInputs = [
azure-nspkg
];
# Just a namespace package, no tests exist:
# https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/keyvault/tests.yml
doCheck = false;
meta = with lib; {
description = "Microsoft Azure Key Vault Namespace Package [Internal]";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
};
}

44
pkgs/development/python-modules/bandit/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ buildPythonPackage
, fetchPypi
, lib
, isPy3k
# pythonPackages
, GitPython
, pbr
, pyyaml
, six
, stevedore
}:
buildPythonPackage rec {
pname = "bandit";
version = "1.6.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0rb034c99pyhb4a60z7f2kz40cjydhm8m9v2blaal1rmhlam7rs1";
};
propagatedBuildInputs = [
GitPython
pbr
pyyaml
six
stevedore
];
# Framework is Tox, tox performs 'pip install' inside the virtual-env
# and this requires Network Connectivity
doCheck = false;
meta = {
description = "Security oriented static analyser for python code";
homepage = "https://bandit.readthedocs.io/en/latest/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}

38
pkgs/development/python-modules/bashlex/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ enum-compat
, lib
, buildPythonPackage
, fetchFromGitHub
, nose
, python
}:
buildPythonPackage rec {
pname = "bashlex";
version = "0.14";
src = fetchFromGitHub {
owner = "idank";
repo = pname;
rev = version;
sha256 = "070spmbf53y18miky5chgky4x5h8kp9czkp7dm173klv9pi2cn0k";
};
checkInputs = [ nose ];
propagatedBuildInputs = [ enum-compat ];
# workaround https://github.com/idank/bashlex/issues/51
preBuild = ''
${python.interpreter} -c 'import bashlex'
'';
checkPhase = ''
${python.interpreter} -m nose --with-doctest
'';
meta = with lib; {
description = "Python parser for bash";
license = licenses.gpl3;
homepage = https://github.com/idank/bashlex;
maintainers = with maintainers; [ multun ];
};
}

1
pkgs/development/python-modules/cachetools/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "cachetools";
version = "4.0.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;

42
pkgs/development/python-modules/compiledb/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest
, bashlex
, click
, shutilwhich
, gcc
, coreutils
}:
buildPythonPackage rec {
pname = "compiledb";
version = "0.10.1";
src = fetchFromGitHub {
owner = "nickdiego";
repo = pname;
rev = "v${version}";
sha256 = "0qricdgqzry7j3rmgwyd43av3c2kxpzkh6f9zcqbzrjkn78qbpd4";
};
# fix the tests
patchPhase = ''
substituteInPlace tests/data/multiple_commands_oneline.txt \
--replace /bin/echo ${coreutils}/bin/echo
'';
checkInputs = [ pytest gcc coreutils ];
propagatedBuildInputs = [ click bashlex shutilwhich ];
checkPhase = ''
pytest
'';
meta = with lib; {
description = "Tool for generating Clang's JSON Compilation Database files";
license = licenses.gpl3;
homepage = https://github.com/nickdiego/compiledb;
maintainers = with maintainers; [ multun ];
};
}

24
pkgs/development/python-modules/graph-tool/2.x.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook
, pkgconfig, boost, expat, scipy, cgal, gmp, mpfr
, pkg-config, boost, expat, scipy, cgal, gmp, mpfr
, gobject-introspection, pygobject3, gtk3, matplotlib, ncurses
, buildPythonPackage
, fetchpatch
@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "graph-tool";
format = "other";
version = "2.27";
version = "2.29";
meta = with stdenv.lib; {
description = "Python module for manipulation and statistical analysis of graphs";
@ -21,25 +21,9 @@ buildPythonPackage rec {
src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
sha256 = "04s31qwlfcl7bwsggnic8gqcqmx2wsrmfw77nf7vzgnz42bwch27";
sha256 = "0ykzcnqc5bhqb4xlf9ahpp807vj5868xdrmcj6fggqnnpqv4633c";
};
patches = [
# fix build with cgal 4.13 (https://git.skewed.de/count0/graph-tool/issues/509)
(fetchpatch {
name = "cgal-4.13.patch";
url = "https://git.skewed.de/count0/graph-tool/commit/aa39e4a6b42d43fac30c841d176c75aff92cc01a.patch";
sha256 = "1578inb4jqwq2fhhwscn5z95nzmaxvmvk30nzs5wirr26iznap4m";
})
] ++ (lib.optionals (pythonAtLeast "3.7") [
# # python 3.7 compatibility (`async` is now reserved)
(fetchpatch {
name = "async-reserved.patch";
url = "https://git.skewed.de/count0/graph-tool/commit/0407f41a35b6be7c670927fb5dc578cbd0e88be4.patch";
sha256 = "1fklznhmfvbb3ykwzyf8p2hiczby6y7r0xnkkjl2jkxlvr24000q";
})
]);
configureFlags = [
"--with-python-module-path=$(out)/${python.sitePackages}"
"--with-boost-libdir=${boost}/lib"
@ -48,7 +32,7 @@ buildPythonPackage rec {
"--enable-openmp"
];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ ncurses ];
propagatedBuildInputs = [

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

@ -33,7 +33,7 @@ buildPythonPackage rec {
})
];
checkInputs = [ pytestCheckHook nose ];
checkInputs = [ pytestCheckHook nose flaky ];
dontUseSetuptoolsCheck = true;
preCheck = ''
export HOME=$(mktemp -d)

26
pkgs/development/python-modules/javaobj-py3/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ buildPythonPackage
, fetchPypi
, lib
}:
buildPythonPackage rec {
pname = "javaobj-py3";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0j9532i7bnjd0v4a8c36mjj9rsdnbmckk65dh9sbmvnhy3j6jx55";
};
# Tests assume network connectivity
doCheck = false;
meta = {
description = "Module for serializing and de-serializing Java objects";
homepage = "https://github.com/tcalmant/python-javaobj";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}

12
pkgs/development/python-modules/loguru/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, colorama }:
{ stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }:
buildPythonPackage rec {
pname = "loguru";
@ -10,12 +10,12 @@ buildPythonPackage rec {
sha256 = "d5ddf363b7e0e562652f283f74a89bf35601baf16b70f2cd2736a2f8c6638748";
};
checkInputs = [ pytest colorama ];
checkPhase = ''
pytest -k 'not test_time_rotation_reopening'
'';
checkInputs = [ pytestCheckHook colorama ];
meta = with lib; {
disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ]
++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" ];
meta = with stdenv.lib; {
homepage = https://github.com/Delgan/loguru;
description = "Python logging made (stupidly) simple";
license = licenses.mit;

35
pkgs/development/python-modules/msal-extensions/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ buildPythonPackage
, fetchPypi
, lib
# pythonPackages
, msal
, portalocker
}:
buildPythonPackage rec {
pname = "msal-extensions";
version = "0.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "1p05cbfksnhijx1il7s24js2ydzgxbpiasf607qdpb5sljlp3qar";
};
propagatedBuildInputs = [
msal
portalocker
];
# No tests found
doCheck = false;
meta = with lib; {
description = "The Microsoft Authentication Library Extensions (MSAL-Extensions) for Python";
homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
};
}

36
pkgs/development/python-modules/msal/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ buildPythonPackage
, fetchPypi
, lib
# pythonPackages
, pyjwt
, requests
}:
buildPythonPackage rec {
pname = "msal";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc";
};
propagatedBuildInputs = [
pyjwt
requests
];
# Tests assume Network Connectivity:
# https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73
doCheck = false;
meta = with lib; {
description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect";
homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
};
}

32
pkgs/development/python-modules/nagiosplugin/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, twine
, numpy
, pytest
, fetchPypi
}:
buildPythonPackage rec {
pname = "nagiosplugin";
version = "1.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "1vr3zy0zfvbrqc4nf81zxv4gs2q82sv5sjamdm4573ld529mk2nv";
};
nativeBuildInputs = [ twine ];
checkInputs = [ pytest numpy ];
checkPhase = ''
# this test relies on who, which does not work in the sandbox
pytest -k "not test_check_users" tests/
'';
meta = with lib; {
description = "A Python class library which helps with writing Nagios (Icinga) compatible plugins";
homepage = https://github.com/mpounsett/nagiosplugin;
license = licenses.zpl21;
maintainers = with maintainers; [ symphorien ];
};
}

36
pkgs/development/python-modules/names/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
# pythonPackages
, pytest
}:
buildPythonPackage rec {
pname = "names";
version = "0.3.0";
src = fetchFromGitHub {
owner = "treyhunner";
repo = pname;
rev = version;
sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611";
};
checkInputs = [
pytest
];
checkPhase = ''
pytest
'';
meta = {
description = "Generate random names";
homepage = "https://github.com/treyhunner/names";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}

41
pkgs/development/python-modules/oyaml/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
# pythonPackages
, pytest
, pyyaml
}:
buildPythonPackage rec {
pname = "oyaml";
version = "0.9";
src = fetchFromGitHub {
owner = "wimglenn";
repo = "oyaml";
rev = "v${version}";
sha256 = "13xjdym0p0jh9bvyjsbhi4yznlp68bamy3xi4w5wpcrzlcq6cfh9";
};
propagatedBuildInputs = [
pyyaml
];
checkInputs = [
pytest
];
checkPhase = ''
pytest test_oyaml.py
'';
meta = {
description = "Ordered YAML: drop-in replacement for PyYAML which preserves dict ordering";
homepage = "https://github.com/wimglenn/oyaml";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}

37
pkgs/development/python-modules/pyjks/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ buildPythonPackage
, fetchPypi
, lib
# pythonPackages
, pyasn1-modules
, pycryptodomex
, twofish
}:
buildPythonPackage rec {
pname = "pyjks";
version = "19.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "06h1cybsdj2wi0jf7igbr722xfm87crqn4g7m3bgrpxwi41b9rcw";
};
propagatedBuildInputs = [
pyasn1-modules
pycryptodomex
twofish
];
# Tests assume network connectivity
doCheck = false;
meta = {
description = "Pure-Python Java Keystore (JKS) library";
homepage = "https://github.com/kurtbrose/pyjks";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}

22
pkgs/development/python-modules/pyopenssl/default.nix
View File

@ -10,6 +10,7 @@
, flaky
, glibcLocales
, six
, fetchpatch
}:
with stdenv.lib;
@ -80,6 +81,27 @@ buildPythonPackage rec {
runHook postCheck
'';
patches = [
# 4 patches for 2020 bug
# https://github.com/pyca/pyopenssl/pull/828
(fetchpatch {
url = https://github.com/pyca/pyopenssl/commit/0d2fd1a24b30077ead6960bd63b4a9893a57c101.patch;
sha256 = "1c27g53qrwxddyx04sxf8yvj7xgbaabla7mc1cgbfd426rncbqf3";
})
(fetchpatch {
url = https://github.com/pyca/pyopenssl/commit/d08a742573c3205348a4eec9a65abaf6c16110c4.patch;
sha256 = "18xn8s1wpycz575ivrbsbs0qd2q48z8pdzsjzh8i60xba3f8yj2f";
})
(fetchpatch {
url = https://github.com/pyca/pyopenssl/commit/60b9e10e6da7ccafaf722def630285f54510ed12.patch;
sha256 = "0aw8qvy8m0bhgp39lmbcrpprpg4bhpssm327hyrk476wwgajk01j";
})
(fetchpatch {
url = https://github.com/pyca/pyopenssl/commit/7a37cc23fcbe43abe785cd4badd14bdc7acfb175.patch;
sha256 = "1c7zb568rs71rsl16p6dq7aixwlkgzfnba4vzmfvbmy3zsnaslq2";
})
];
# Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1
# for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail.
doCheck = !stdenv.isDarwin;

36
pkgs/development/python-modules/pysmb/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ buildPythonPackage
, fetchPypi
, lib
# pythonPackages
, pyasn1
}:
buildPythonPackage rec {
pname = "pysmb";
version = "1.1.28";
src = fetchPypi {
inherit pname version;
format = "setuptools";
extension = "zip";
sha256 = "0x44yq440c1j3xnl7qigz2fpfzhx68n9mbj7ps7rd0kj0plcmr2q";
};
propagatedBuildInputs = [
pyasn1
];
# Tests require Network Connectivity and a server up and running
# https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt
doCheck = false;
meta = {
description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines";
homepage = "https://miketeo.net/wp/index.php/projects/pysmb";
license = lib.licenses.zlib;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}

38
pkgs/development/python-modules/requirements-detector/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ buildPythonPackage
, fetchFromGitHub
, isPy27
, lib
# pythonPackages
, pytest
}:
buildPythonPackage rec {
pname = "requirements-detector";
version = "0.6";
disabled = isPy27;
src = fetchFromGitHub {
owner = "yuvadm";
repo = pname;
rev = version;
sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5";
};
checkInputs = [
pytest
];
checkPhase = ''
pytest
'';
meta = {
description = "Python tool to find and list requirements of a Python project";
homepage = "https://github.com/landscapeio/requirements-detector";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}

30
pkgs/development/python-modules/shutilwhich/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest
}:
buildPythonPackage rec {
pname = "shutilwhich";
version = "1.1.0";
src = fetchFromGitHub {
owner = "mbr";
repo = pname;
rev = version;
sha256 = "05fwcjn86w8wprck04iv1zccfi39skdf0lhwpb4b9gpvklyc9mj0";
};
checkInputs = [ pytest ];
checkPhase = ''
pytest -rs
'';
meta = with lib; {
description = "Backport of shutil.which";
license = licenses.psfl;
homepage = https://github.com/mbr/shutilwhich;
maintainers = with maintainers; [ multun ];
};
}

33
pkgs/development/python-modules/twofish/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ buildPythonPackage
, fetchPypi
, lib
# pythonPackages
, javaobj-py3
}:
buildPythonPackage rec {
pname = "twofish";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1yihp2n42amrxw0wk9f66llpb3w5kwhgkcdg9krkzcik1nsqp7dh";
};
propagatedBuildInputs = [
javaobj-py3
];
# No tests implemented
doCheck = false;
meta = {
description = "Bindings for the Twofish implementation by Niels Ferguson";
homepage = "https://github.com/keybase/python-twofish";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}

22
pkgs/development/python-modules/unicorn/default.nix
View File

@ -1,23 +1,23 @@
{ stdenv, buildPackages, buildPythonPackage, fetchPypi }:
{ stdenv, buildPythonPackage, setuptools, unicorn-emu }:
buildPythonPackage rec {
pname = "unicorn";
version = "1.0.1";
version = stdenv.lib.getVersion unicorn-emu;
src = fetchPypi {
inherit pname version;
sha256 = "0a5b4vh734b3wfkgapzzf8x18rimpmzvwwkly56da84n27wfw9bg";
};
src = unicorn-emu.src;
sourceRoot = "unicorn-${version}/bindings/python";
# needs python2 at build time
PYTHON=buildPackages.python2.interpreter;
prePatch = ''
ln -s ${unicorn-emu}/lib/libunicorn${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/
ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/
'';
setupPyBuildFlags = [ "--plat-name" "linux" ];
propagatedBuildInputs = [ setuptools ];
meta = with stdenv.lib; {
description = "Unicorn CPU emulator engine";
description = "Python bindings for Unicorn CPU emulator engine";
homepage = "http://www.unicorn-engine.org/";
license = [ licenses.gpl2 ];
maintainers = [ maintainers.bennofs ];
maintainers = with maintainers; [ bennofs ris ];
};
}

36
pkgs/development/python-modules/viewstate/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ buildPythonPackage
, fetchFromGitHub
, isPy3k
, lib
, pytest
}:
buildPythonPackage rec {
pname = "viewstate";
version = "0.4.3";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "yuvadm";
repo = pname;
rev = "v${version}";
sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5";
};
checkInputs = [
pytest
];
checkPhase = ''
pytest
'';
meta = {
description = ".NET viewstate decoder";
homepage = "https://github.com/yuvadm/viewstate";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}

4
pkgs/development/tools/build-managers/qbs/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "qbs";
version = "1.14.1";
version = "1.15.0";
src = fetchFromGitHub {
owner = "qbs";
repo = "qbs";
rev = "v${version}";
sha256 = "0rqfnclhzln6v4gm68fn4vn6ncf5qpi90295fwm4fx6dq4l94b3v";
sha256 = "0hq2lx5w5lsiy9c69bcps4wyn2sa9s88hj0bq95p93sfiwq6mxlr";
};
nativeBuildInputs = [ qmake ];

2
pkgs/development/tools/diesel-cli/default.nix
View File

@ -72,6 +72,6 @@ rustPlatform.buildRustPackage rec {
homepage = https://github.com/diesel-rs/diesel/tree/master/diesel_cli;
license = with licenses; [ mit asl20 ];
platforms = platforms.all;
maintainers = with maintainers; [ ivan ];
maintainers = with maintainers; [ ];
};
}

57
pkgs/development/tools/metals/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ stdenv, lib, coursier, jdk, jre, makeWrapper }:
let
baseName = "metals";
version = "0.7.6";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
export COURSIER_CACHE=$(pwd)
${coursier}/bin/coursier fetch org.scalameta:metals_2.12:${version} \
-r bintray:scalacenter/releases \
-r sonatype:snapshots > deps
mkdir -p $out/share/java
cp -n $(< deps) $out/share/java/
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "03vx8n77mndpqbvq14cy3k9r4jwgjacrv56v5n87da8rqiclx37j";
};
in
stdenv.mkDerivation rec {
name = "${baseName}-${version}";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk deps ];
phases = [ "installPhase" ];
extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m";
installPhase = ''
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/metals-emacs \
--prefix PATH : ${lib.makeBinPath [ jdk ]} \
--add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main"
makeWrapper ${jre}/bin/java $out/bin/metals-vim \
--prefix PATH : ${lib.makeBinPath [ jdk ]} \
--add-flags "${extraJavaOpts} -Dmetals.client=coc.nvim -cp $CLASSPATH scala.meta.metals.Main"
makeWrapper ${jre}/bin/java $out/bin/metals-vim-lsc \
--prefix PATH : ${lib.makeBinPath [ jdk ]} \
--add-flags "${extraJavaOpts} -Dmetals.client=vim-lsc -cp $CLASSPATH scala.meta.metals.Main"
makeWrapper ${jre}/bin/java $out/bin/metals-sublime \
--prefix PATH : ${lib.makeBinPath [ jdk ]} \
--add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main"
'';
meta = with stdenv.lib; {
homepage = https://scalameta.org/metals/;
license = licenses.asl20;
description = "Work-in-progress language server for Scala";
maintainers = with maintainers; [ ceedubs tomahna ];
};
}

6
pkgs/development/tools/ocaml/cppo/default.nix
View File

@ -7,8 +7,8 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12";
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "1.6.6";
sha256 = "1smcc0l6fh2n0y6bp96c69j5nw755jja99w0b206wx3yb2m4w2hs";
version = "1.6.5";
sha256 = "03c0amszy28shinvz61hm340jz446zz5763a1pdqlza36kwcj0p0";
buildInputs = [ dune ];
extra = {
inherit (dune) installPhase;
@ -31,7 +31,7 @@ stdenv.mkDerivation ({
name = "${pname}-${param.version}";
src = fetchFromGitHub {
owner = "ocaml-community";
owner = "mjambon";
repo = pname;
rev = "v${param.version}";
inherit (param) sha256;

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