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

Merge staging-next into staging

Browse Source
This commit is contained in:
zowoq 2021-02-19 10:47:46 +10:00
commit 3dab057264
192 changed files with 4485 additions and 2295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -5866,6 +5866,12 @@
githubId = 35892750; githubId = 35892750;
name = "Maxine Aubrey"; name = "Maxine Aubrey";
}; };
maxhbr = {
email = "nixos@maxhbr.dev";
github = "maxhbr";
githubId = 1187050;
name = "Maximilian Huber";
};
maxxk = { maxxk = {
email = "maxim.krivchikov@gmail.com"; email = "maxim.krivchikov@gmail.com";
github = "maxxk"; github = "maxxk";

2
nixos/modules/services/hardware/bluetooth.nix
View File

@ -104,7 +104,7 @@ in
# will in fact load the configuration file at /etc/bluetooth/main.conf # will in fact load the configuration file at /etc/bluetooth/main.conf
# so force it here to avoid any ambiguity and things suddenly breaking # so force it here to avoid any ambiguity and things suddenly breaking
# if/when the bluez derivation is changed. # if/when the bluez derivation is changed.
args = [ "-f /etc/bluetooth/main.conf" ] args = [ "-f" "/etc/bluetooth/main.conf" ]
++ optional hasDisabledPlugins ++ optional hasDisabledPlugins
"--noplugin=${concatStringsSep "," cfg.disabledPlugins}"; "--noplugin=${concatStringsSep "," cfg.disabledPlugins}";
in in

4
nixos/modules/services/web-apps/moinmoin.nix
View File

@ -211,7 +211,7 @@ in
environment = let environment = let
penv = python.buildEnv.override { penv = python.buildEnv.override {
# setuptools: https://github.com/benoitc/gunicorn/issues/1716 # setuptools: https://github.com/benoitc/gunicorn/issues/1716
extraLibs = [ python.pkgs.gevent python.pkgs.setuptools pkg ]; extraLibs = [ python.pkgs.eventlet python.pkgs.setuptools pkg ];
}; };
in { in {
PYTHONPATH = "${dataDir}/${wikiIdent}/config:${penv}/${python.sitePackages}"; PYTHONPATH = "${dataDir}/${wikiIdent}/config:${penv}/${python.sitePackages}";
@ -233,7 +233,7 @@ in
ExecStart = ''${python.pkgs.gunicorn}/bin/gunicorn moin_wsgi \ ExecStart = ''${python.pkgs.gunicorn}/bin/gunicorn moin_wsgi \
--name gunicorn-${wikiIdent} \ --name gunicorn-${wikiIdent} \
--workers ${toString cfg.gunicorn.workers} \ --workers ${toString cfg.gunicorn.workers} \
--worker-class gevent \ --worker-class eventlet \
--bind unix:/run/moin/${wikiIdent}/gunicorn.sock --bind unix:/run/moin/${wikiIdent}/gunicorn.sock
''; '';

15
nixos/tests/installer.nix
View File

@ -325,10 +325,13 @@ let
curl curl
] ]
++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
++ optionals (bootLoader == "grub" && grubVersion == 2) [ ++ optionals (bootLoader == "grub" && grubVersion == 2) (let
(pkgs.grub2.override { zfsSupport = true; }) zfsSupport = lib.any (x: x == "zfs")
(pkgs.grub2_efi.override { zfsSupport = true; }) (extraInstallerConfig.boot.supportedFilesystems or []);
]; in [
(pkgs.grub2.override { inherit zfsSupport; })
(pkgs.grub2_efi.override { inherit zfsSupport; })
]);
nix.binaryCaches = mkForce [ ]; nix.binaryCaches = mkForce [ ];
nix.extraOptions = '' nix.extraOptions = ''
@ -398,9 +401,9 @@ let
createPartitions = '' createPartitions = ''
machine.succeed( machine.succeed(
"flock /dev/vda parted --script /dev/vda -- mklabel gpt" "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
+ " mkpart ESP fat32 1M 50MiB" # /boot + " mkpart ESP fat32 1M 100MiB" # /boot
+ " set 1 boot on" + " set 1 boot on"
+ " mkpart primary linux-swap 50MiB 1024MiB" + " mkpart primary linux-swap 100MiB 1024MiB"
+ " mkpart primary ext2 1024MiB -1MiB", # / + " mkpart primary ext2 1024MiB -1MiB", # /
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",

19
nixos/tests/openldap.nix
View File

@ -1,4 +1,9 @@
{ pkgs, system ? builtins.currentSystem, ... }: let { pkgs ? (import ../.. { inherit system; config = { }; })
, system ? builtins.currentSystem
, ...
}:
let
dbContents = '' dbContents = ''
dn: dc=example dn: dc=example
objectClass: domain objectClass: domain
@ -16,7 +21,7 @@
''; '';
in { in {
# New-style configuration # New-style configuration
current = import ./make-test-python.nix { current = import ./make-test-python.nix ({ pkgs, ... }: {
inherit testScript; inherit testScript;
name = "openldap"; name = "openldap";
@ -53,10 +58,10 @@ in {
declarativeContents."dc=example" = dbContents; declarativeContents."dc=example" = dbContents;
}; };
}; };
}; }) { inherit pkgs system; };
# Old-style configuration # Old-style configuration
oldOptions = import ./make-test-python.nix { oldOptions = import ./make-test-python.nix ({ pkgs, ... }: {
inherit testScript; inherit testScript;
name = "openldap"; name = "openldap";
@ -72,10 +77,10 @@ in {
declarativeContents."dc=example" = dbContents; declarativeContents."dc=example" = dbContents;
}; };
}; };
}; }) { inherit system pkgs; };
# Manually managed configDir, for example if dynamic config is essential # Manually managed configDir, for example if dynamic config is essential
manualConfigDir = import ./make-test-python.nix { manualConfigDir = import ./make-test-python.nix ({ pkgs, ... }: {
name = "openldap"; name = "openldap";
machine = { pkgs, ... }: { machine = { pkgs, ... }: {
@ -121,5 +126,5 @@ in {
"systemctl restart openldap", "systemctl restart openldap",
) )
'' + testScript; '' + testScript;
}; }) { inherit system pkgs; };
} }

4
pkgs/applications/audio/ashuffle/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ashuffle"; pname = "ashuffle";
version = "3.4.0"; version = "3.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "joshkunz"; owner = "joshkunz";
repo = "ashuffle"; repo = "ashuffle";
rev = "v${version}"; rev = "v${version}";
sha256 = "09q6lwgc1dc8bg1mb9js9qz3xcsxph3548nxzvyb4v8111gixrp7"; sha256 = "103jhajqwryiaf52qqgshajcnsxsz4l8gn3sz6bxs7k0yq5x1knr";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/applications/backup/vorta/default.nix
View File

@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "vorta"; pname = "vorta";
version = "0.7.2"; version = "0.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "borgbase"; owner = "borgbase";
repo = "vorta"; repo = "vorta";
rev = "v${version}"; rev = "v${version}";
sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5"; sha256 = "sha256-nnnGqkT4sAunaT7GPysYQGeV34ZrRFaHK/gJRafvR3U=";
}; };
postPatch = '' postPatch = ''

16
pkgs/applications/editors/eclipse/plugins.nix
View File

@ -413,6 +413,22 @@ rec {
}; };
}; };
freemarker = buildEclipseUpdateSite rec {
name = "freemarker-${version}";
version = "1.5.305";
src = fetchzip {
url = "https://github.com/ddekany/jbosstools-freemarker/releases/download/v${version}/freemarker.site-${version}.zip";
sha256 = "1qrhi300vk07gi14r445wvy0bvghbjd6c4k7q09pqpaxv6raiczn";
stripRoot = false;
};
meta = with lib; {
homepage = "https://github.com/ddekany/jbosstools-freemarker";
description = "Plugin that provides an editor for Apache FreeMarker files";
};
};
gnuarmeclipse = buildEclipseUpdateSite rec { gnuarmeclipse = buildEclipseUpdateSite rec {
name = "gnuarmeclipse-${version}"; name = "gnuarmeclipse-${version}";
version = "3.1.1-201606210758"; version = "3.1.1-201606210758";

52
pkgs/applications/editors/formiko/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
, wrapGAppsHook
, gobject-introspection
, gtk3
, docutils
, gtksourceview
, gtkspell3
, librsvg
, pygobject3
, webkitgtk
}:
buildPythonApplication rec {
pname = "formiko";
version = "1.4.3";
src = fetchFromGitHub {
owner = "ondratu";
repo = "formiko";
rev = version;
sha256 = "0n7w585gbrpn2xcd5n04hivrjarpr2wj260y2kpxpgh93vn52sdi";
};
nativeBuildInputs = [
wrapGAppsHook
gobject-introspection
gtk3
];
propagatedBuildInputs = [
docutils
gobject-introspection
gtk3
gtksourceview
gtkspell3
librsvg
pygobject3
webkitgtk
];
# Needs a display
doCheck = false;
meta = with lib; {
description = "reStructuredText editor and live previewer";
homepage = "https://github.com/ondratu/formiko";
license = licenses.bsd3;
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

32
pkgs/applications/editors/jetbrains/default.nix
View File

@ -270,12 +270,12 @@ in
clion = buildClion rec { clion = buildClion rec {
name = "clion-${version}"; name = "clion-${version}";
version = "2020.3.1"; /* updated by script */ version = "2020.3.2"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform"; description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "1jfvwir79s0kcqmlx6bbkmc42bplgl7814mnqfcsdzni1qv62pws"; /* updated by script */ sha256 = "10120y9ccdlhjrpvfnspfj4s7940b3v3yic78r372wj5ns4bsjax"; /* updated by script */
}; };
wmClass = "jetbrains-clion"; wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@ -283,12 +283,12 @@ in
datagrip = buildDataGrip rec { datagrip = buildDataGrip rec {
name = "datagrip-${version}"; name = "datagrip-${version}";
version = "2020.3.1"; /* updated by script */ version = "2020.3.2"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL"; description = "Your Swiss Army Knife for Databases and SQL";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "0jk7ywxk983ld5x71a59dh1hvlnli3sbvg7fbicahas5ml8clxfv"; /* updated by script */ sha256 = "1wjaavgslwpz4jniszswdy10rk3622i1w3awdwhgjlcc6mwkwz1f"; /* updated by script */
}; };
wmClass = "jetbrains-datagrip"; wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE"; update-channel = "DataGrip RELEASE";
@ -296,12 +296,12 @@ in
goland = buildGoland rec { goland = buildGoland rec {
name = "goland-${version}"; name = "goland-${version}";
version = "2020.3.1"; /* updated by script */ version = "2020.3.2"; /* updated by script */
description = "Up and Coming Go IDE"; description = "Up and Coming Go IDE";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz"; url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "12gi1a2bmafmy7qgqwv3a7b5b46dlhw4ahmkm5pkq6pmxl4y6dmk"; /* updated by script */ sha256 = "00wbl4g1wgb9c287z6i7a48bm5zyb1gkmyqmhasmj0n2vamaq6sz"; /* updated by script */
}; };
wmClass = "jetbrains-goland"; wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE"; update-channel = "GoLand RELEASE";
@ -335,12 +335,12 @@ in
mps = buildMps rec { mps = buildMps rec {
name = "mps-${version}"; name = "mps-${version}";
version = "2020.3"; /* updated by script */ version = "2020.3.1"; /* updated by script */
description = "Create your own domain-specific language"; description = "Create your own domain-specific language";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz"; url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz";
sha256 = "0dr1z2sxarz1xif4swxx28hpzsyjd86m0c3xdaw5lmpqwqlzvc5h"; /* updated by script */ sha256 = "0qvl724mm53rxfhafl6561rhpwppcadmwr9sh0hpsfgsprh2xznv"; /* updated by script */
}; };
wmClass = "jetbrains-mps"; wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE"; update-channel = "MPS RELEASE";
@ -348,12 +348,12 @@ in
phpstorm = buildPhpStorm rec { phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}"; name = "phpstorm-${version}";
version = "2020.3.1"; /* updated by script */ version = "2020.3.2"; /* updated by script */
description = "Professional IDE for Web and PHP developers"; description = "Professional IDE for Web and PHP developers";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "1c5j3mbg8scsl4c90cjahdk5gs5q72y5a8fhkqa9zmy6di42k99x"; /* updated by script */ sha256 = "1dmymlv71syjv8byb9ap9c13fimjl6c3r94dwr9kghdlj3jh7p0k"; /* updated by script */
}; };
wmClass = "jetbrains-phpstorm"; wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE"; update-channel = "PhpStorm RELEASE";
@ -361,12 +361,12 @@ in
pycharm-community = buildPycharm rec { pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}"; name = "pycharm-community-${version}";
version = "2020.3.2"; /* updated by script */ version = "2020.3.3"; /* updated by script */
description = "PyCharm Community Edition"; description = "PyCharm Community Edition";
license = lib.licenses.asl20; license = lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz"; url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1z3w6aah635fdrhrzp5af6sgj269jk7mv8vgdd83gxillkx9vq9k"; /* updated by script */ sha256 = "0p05pgfmr9515sqbqbjiksg7qzvqxcs119lxfc6dsirdvc1qhnli"; /* updated by script */
}; };
wmClass = "jetbrains-pycharm-ce"; wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE"; update-channel = "PyCharm RELEASE";
@ -374,12 +374,12 @@ in
pycharm-professional = buildPycharm rec { pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}"; name = "pycharm-professional-${version}";
version = "2020.3.2"; /* updated by script */ version = "2020.3.3"; /* updated by script */
description = "PyCharm Professional Edition"; description = "PyCharm Professional Edition";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz"; url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1fbb8v40q7vgn5v5dyxb211abr8swnxa3gw18kh3vlk6yc2crzfw"; /* updated by script */ sha256 = "1yzv1pxpw6pvsjljqvbnf8qgdx34rs5j232zaq4vb5x2ahswf9mm"; /* updated by script */
}; };
wmClass = "jetbrains-pycharm"; wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE"; update-channel = "PyCharm RELEASE";
@ -400,12 +400,12 @@ in
ruby-mine = buildRubyMine rec { ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}"; name = "ruby-mine-${version}";
version = "2020.3.1"; /* updated by script */ version = "2020.3.2"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE"; description = "The Most Intelligent Ruby and Rails IDE";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "0drxzz6k0cmhir4szg8nwmsi9qh380vrryghmpvx9w83yrcain4c"; /* updated by script */ sha256 = "17x3sz4jkz2px25gj813xqrrb2cm7mdl6m5a22zg086phym66g3c"; /* updated by script */
}; };
wmClass = "jetbrains-rubymine"; wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE"; update-channel = "RubyMine RELEASE";

23
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -81,6 +81,29 @@ in
}; };
}; };
farbfeld = pluginDerivation rec {
pname = "farbfeld";
version = "unstable-2019-08-12";
src = fetchFromGitHub {
owner = "ids1024";
repo = "gimp-farbfeld";
rev = "5feacebf61448bd3c550dda03cd08130fddc5af4";
sha256 = "1vmw7k773vrndmfffj0m503digdjmkpcqy2r3p3i5x0qw9vkkkc6";
};
installPhase = ''
installPlugin farbfeld
'';
meta = {
description = "Gimp plug-in for the farbfeld image format";
homepage = "https://github.com/ids1024/gimp-farbfeld";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sikmir ];
};
};
fourier = pluginDerivation rec { fourier = pluginDerivation rec {
/* menu: /* menu:
Filters/Generic/FFT Forward Filters/Generic/FFT Forward

7
pkgs/applications/graphics/inkscape/default.nix
View File

@ -7,6 +7,7 @@
, fetchurl , fetchurl
, gettext , gettext
, gdl , gdl
, ghostscript
, glib , glib
, glib-networking , glib-networking
, glibmm , glibmm
@ -74,6 +75,12 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
patchShebangs share/extensions patchShebangs share/extensions
substituteInPlace share/extensions/eps_input.inx \
--replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf"
substituteInPlace share/extensions/ps_input.inx \
--replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf"
substituteInPlace share/extensions/ps_input.py \
--replace "call('ps2pdf'" "call('${ghostscript}/bin/ps2pdf'"
patchShebangs share/templates patchShebangs share/templates
patchShebangs man/fix-roff-punct patchShebangs man/fix-roff-punct
''; '';

110
pkgs/applications/misc/authy/default.nix Normal file
View File

@ -0,0 +1,110 @@
{ alsaLib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups
, dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib
, libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper
, nspr, nss, pango, squashfsTools, stdenv, systemd, xorg
}:
let
# Currently only works with electron 9
electron = electron_9;
in
stdenv.mkDerivation rec {
pname = "authy";
version = "1.8.3";
rev = "5";
buildInputs = [
alsaLib
at-spi2-atk
at-spi2-core
atk
cairo
cups
dbus
expat
gdk-pixbuf
glib
gtk3
libappindicator-gtk3
libdbusmenu-gtk3
libuuid
nspr
nss
pango
stdenv.cc.cc
systemd
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxcb
];
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
sha256 = "1yfvkmy34mc1dan9am11yka88jv7a4dslsszy4kcc8vap4cjmgpn";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];
unpackPhase = ''
runHook preUnpack
unsquashfs "$src"
cd squashfs-root
if ! grep -q '${version}' meta/snap.yaml; then
echo "Package version differs from version found in snap metadata:"
grep 'version: ' meta/snap.yaml
echo "While the nix package specifies: ${version}."
echo "You probably chose the wrong revision or forgot to update the nix version."
exit 1
fi
runHook postUnpack
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/
cp -r ./* $out/
rm -R ./*
# The snap package has the `ffmpeg.so` file which is copied over with other .so files
mv $out/*.so $out/lib/
# Replace icon name in Desktop file
sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/meta/gui/authy.desktop"
# Move the desktop file, icon, binary to their appropriate locations
mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps
cp $out/meta/gui/authy.desktop $out/share/applications/
cp $out/meta/gui/icon.png $out/share/pixmaps/authy.png
cp $out/${pname} $out/bin/${pname}
# Cleanup
rm -r $out/{data-dir,gnome-platform,meta,scripts,usr,*.sh,*.so}
runHook postInstall
'';
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/resources/app.asar
'';
meta = with lib; {
homepage = "https://www.authy.com";
description = "Twilio Authy two factor authentication desktop application";
license = licenses.unfree;
maintainers = with maintainers; [ iammrinal0 ];
platforms = [ "x86_64-linux" ];
};
}

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

@ -14,11 +14,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mkgmap"; pname = "mkgmap";
version = "4600"; version = "4601";
src = fetchurl { src = fetchurl {
url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
sha256 = "1xnqbyrf5cbxmggkk1pjcj5d1767kbp15v12zy2fpbbn3yf0k3sh"; sha256 = "TQ2Ee0sy9q4PUvY3TD6zaQ9oy1xgsw5OAw4RQ7ecCUM=";
}; };
patches = [ patches = [

4
pkgs/applications/misc/nwg-launchers/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nwg-launchers"; pname = "nwg-launchers";
version = "0.4.3"; version = "0.4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nwg-piotr"; owner = "nwg-piotr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vuvYL9N9xdg27uhiTe2OqxZ3/n/9EjlqPxtNMXpqpE8="; sha256 = "sha256-krhFtFQZSwfKPHmVxPGNySPL2Y9+kA0fxjZ/D+mNks4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

10
pkgs/applications/misc/reddsaver/default.nix
View File

@ -7,27 +7,27 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
version = "0.2.3";
pname = "reddsaver"; pname = "reddsaver";
version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "manojkarthick"; owner = "manojkarthick";
repo = "reddsaver"; repo = "reddsaver";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-K6SyfYx8VG0t6yogHwd80AxQuj3TXofHLEqZcDsRs1s="; sha256 = "0wiyzbl9vqx5aq3lpaaqkm3ivj77lqd8bmh8ipgshdflgm1z6yvp";
}; };
cargoSha256 = "sha256-VDr7fcE13Wy7KoGG3U1GSbWqF5Oad4EobgzOL7dtJDo="; cargoSha256 = "0kw5gk7pf4xkmjffs2jxm6sc4chybns88cii2wlgpyvgn4c3cwaa";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security; ++ lib.optional stdenv.isDarwin Security;
# package does not contain tests as of v0.2.3 # package does not contain tests as of v0.3.0
docCheck = false; docCheck = false;
meta = with lib; { meta = with lib; {
description = "CLI tool to download saved images from Reddit"; description = "CLI tool to download saved media from Reddit";
homepage = "https://github.com/manojkarthick/reddsaver"; homepage = "https://github.com/manojkarthick/reddsaver";
license = with licenses; [ mit /* or */ asl20 ]; license = with licenses; [ mit /* or */ asl20 ];
maintainers = [ maintainers.manojkarthick ]; maintainers = [ maintainers.manojkarthick ];

10
pkgs/applications/misc/redis-desktop-manager/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 { mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols2
, qtsvg, qttools, qtquick1, qtcharts , qtsvg, qttools, qtquick1, qtcharts
, qmake , qmake
}: }:
@ -13,7 +13,7 @@ let
in in
stdenv.mkDerivation rec { mkDerivation rec {
pname = "redis-desktop-manager"; pname = "redis-desktop-manager";
version = "0.9.1"; version = "0.9.1";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake ]; nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [ buildInputs = [
libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
qtquick1 qtquickcontrols qtsvg qttools qtcharts qtquick1 qtquickcontrols2 qtsvg qttools qtcharts
]; ];
dontUseQmakeConfigure = true; dontUseQmakeConfigure = true;
@ -77,7 +77,7 @@ EOF
meta = with lib; { meta = with lib; {
description = "Cross-platform open source Redis DB management tool"; description = "Cross-platform open source Redis DB management tool";
homepage = "https://redisdesktop.com/"; homepage = "https://redisdesktop.com/";
license = licenses.lgpl21; license = licenses.gpl3Only;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ]; maintainers = with maintainers; [ cstrahan ];
}; };

14
pkgs/applications/misc/swappy/default.nix
View File

@ -6,25 +6,23 @@
, pango , pango
, gtk , gtk
, pkg-config , pkg-config
, cmake
, scdoc , scdoc
, libnotify , libnotify
, gio-sharp
, glib , glib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "swappy-${version}"; pname = "swappy";
version = "1.2.1"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jtheoof"; owner = "jtheoof";
repo = "swappy"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "14ac2jmnak7avcz0jhqjm30vk7pv3gq5aq5rdyh84k8c613kkicf"; sha256 = "1bm184fbzylymh4kr7n8gy9plsdxif8xahc1zmkgdg1a0kwgws2x";
}; };
nativeBuildInputs = [ glib meson ninja pkg-config cmake scdoc ]; nativeBuildInputs = [ glib meson ninja pkg-config scdoc ];
buildInputs = [ cairo pango gtk libnotify wayland glib ]; buildInputs = [ cairo pango gtk libnotify wayland glib ];
@ -37,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/jtheoof/swappy"; homepage = "https://github.com/jtheoof/swappy";
description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS "; description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.matthiasbeyer ]; maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.linux; platforms = platforms.linux;

25
pkgs/applications/misc/ticker/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ticker";
version = "3.0.0";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = "ticker";
rev = "v${version}";
sha256 = "sha256-k4ahoaEI2HBoEcRQscpitp2tWsiWmSYaErnth99xOqw=";
};
vendorSha256 = "sha256-8Ew+K/uTFoBAhPQwebtjl6bJPiSEE3PaZCYZsQLOMkw=";
# Tests require internet
doCheck = false;
meta = with lib; {
description = "Terminal stock ticker with live updates and position tracking";
homepage = "https://github.com/achannarasappa/ticker";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ siraben ];
};
}

6
pkgs/applications/misc/tickrs/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tickrs"; pname = "tickrs";
version = "0.11.0"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tarkah"; owner = "tarkah";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Hx/9WW94rDAjlSZoUz5/43MQ6830OELLogRvHTbmWv0="; sha256 = "sha256-F9PyJ2uvnKPcjHS4VeuVJuK48HiqqCG8kFzphGW4QyA=";
}; };
cargoSha256 = "sha256-TYDNx1TNGcREaeHXaejTeMDEITTTUrHCrExZYa+MSHg="; cargoSha256 = "sha256-0JSsCtAsqukFuwtbVS1L2jgLNBjquFBInjsJ1XVocjc=";
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];

82
pkgs/applications/misc/todoist-electron/default.nix
View File

@ -1,65 +1,51 @@
{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf { lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }:
, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat
, udev, libpulseaudio, util-linux, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "todoist-electron"; pname = "todoist-electron";
version = "1.24.0"; version = "0.2.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}_amd64.deb"; url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage";
sha256 = "0g35518z6nf6pnfyx4ax75rq8b8br72mi6wv6jzgac9ric1q4h2s"; sha256 = "1xrf2qjhq116z18qx7n1zd7mhvkb2dccaq7az4w6fs216l8q5zf2";
}; };
desktopItem = makeDesktopItem { appimageContents = appimageTools.extractType2 {
name = "Todoist"; name = "${pname}-${version}";
exec = "todoist %U"; inherit src;
icon = "todoist";
comment = "Todoist for Linux";
desktopName = "Todoist";
categories = "Utility";
}; };
nativeBuildInputs = [ makeWrapper dpkg ]; dontUnpack = true;
unpackPhase = '' dontConfigure = true;
mkdir pkg dontBuild = true;
dpkg-deb -x $src pkg
sourceRoot=pkg nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/512x512
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
cp -a ${appimageContents}/todoist.desktop $out/share/applications/${pname}.desktop
cp -a ${appimageContents}/usr/share/icons/hicolor/0x0/apps $out/share/icons/hicolor/512x512
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
runHook postInstall
''; '';
installPhase = let
libPath = lib.makeLibraryPath ([
stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
nss nspr alsaLib libpulseaudio cups expat udev util-linux
] ++ (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver
]));
in ''
mkdir -p "$out/bin"
mv opt "$out/"
mv usr/share "$out/share"
# Patch binary postFixup = ''
patchelf \ makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --add-flags $out/share/${pname}/resources/app.asar \
--set-rpath "${libPath}:\$ORIGIN" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}"
$out/opt/Todoist/todoist
# Hacky workaround for RPATH problems
makeWrapper $out/opt/Todoist/todoist $out/bin/todoist \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio udev ]}
# Desktop item
mkdir -p "$out/share"
rm -r "$out/share/applications"
cp -r "${desktopItem}/share/applications" "$out/share/applications"
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/KryDos/todoist-linux"; homepage = "https://todoist.com";
description = "The Linux wrapper for Todoist web version"; description = "The official Todoist electron app";
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
license = licenses.mit; license = licenses.unfree;
maintainers = with maintainers; [ i077 ]; maintainers = with maintainers; [ i077 kylesferrazza ];
}; };
} }

10
pkgs/applications/misc/upwork/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook, writeShellScript { lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook
, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid , gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
@ -6,11 +6,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "upwork"; pname = "upwork";
version = "5.4.9.6"; version = "5.5.0.1";
src = fetchurl { src = fetchurl {
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_4_9_6_2565cdd0547940a2/${pname}_${version}_amd64.deb"; url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_1_291c031686ed44ff/${pname}_${version}_amd64.deb";
sha256 = "ff6246b3b4a1ed79cc9bca2934652fefb40bdac4b7e95997f3a46e354ce52456"; sha256 = "49192ecfb10929b5b51cf8899186059649c894109ec172695cd7cfaa50923f6a";
}; };
dontWrapGApps = true; dontWrapGApps = true;
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mv usr $out mv usr $out
mv opt $out mv opt $out
sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop
@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
$out/bin/upwork \ $out/bin/upwork \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : ${libPath} --prefix LD_LIBRARY_PATH : ${libPath}
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {

14
pkgs/applications/misc/zettlr/default.nix
View File

@ -1,13 +1,15 @@
{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas}: { appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas
, texlive, pandoc, pandoc-citeproc
}:
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
let let
pname = "zettlr"; pname = "zettlr";
version = "1.7.5"; version = "1.8.7";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
sha256 = "040lx01ywdpla34d4abkmh51kchr11s17la6fk6yq77y8zb87xzi"; sha256 = "0zbmlk5qk92b3zycs0bmdwgc8fn4a4dv1yvq9q8q2wxz4ammx6c0";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {
inherit name src; inherit name src;
@ -20,11 +22,11 @@ in appimageTools.wrapType2 rec {
''; '';
multiPkgs = null; # no 32bit needed multiPkgs = null; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ];
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/zettlr.desktop $out/share/applications/zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop
install -m 444 -D ${appimageContents}/zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png
substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}' substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
''; '';

6
pkgs/applications/networking/browsers/amfora/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "amfora"; pname = "amfora";
version = "1.7.2"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "makeworld-the-better-one"; owner = "makeworld-the-better-one";
repo = "amfora"; repo = "amfora";
rev = "v${version}"; rev = "v${version}";
sha256 = "KAOIx401G/kB/TclhidOnUja1P+mLo/mUwAqGJfVfyg="; sha256 = "sha256-q83fKs27vkrUs3+AoKZ2342llj6u3bvbLsdnT9DnVUs=";
}; };
vendorSha256 = "rOEM7iEkm42g8yJxY7qdTCSbkPMDHqlAsK7/ud8IDLY="; vendorSha256 = "sha256-0blHwZwOcgC4LcmZSJPRvyQzArCsaMGgIw+cesO+qOo=";
postInstall = lib.optionalString (!stdenv.isDarwin) '' postInstall = lib.optionalString (!stdenv.isDarwin) ''
sed -i "s:amfora:$out/bin/amfora:" amfora.desktop sed -i "s:amfora:$out/bin/amfora:" amfora.desktop

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -18,9 +18,9 @@
} }
}, },
"beta": { "beta": {
"version": "89.0.4389.47", "version": "89.0.4389.58",
"sha256": "022fq3mbd3j9a7lf02936ks0yvf73bwz1ws6m6zmnn9v8waardj2", "sha256": "1ppjkilfn84hq55wsb33xswlp1x8v34np5hq2wbh62ny6j8dbvwz",
"sha256bin64": "09gjbg8678xfh22r3gzjvrkhgda77pr8an4j5ka5672jvhj4hbq9", "sha256bin64": "1k4f380h2rghn81agdw8bkifpb690sr0ykjgbnis3kl68hbkp8a5",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-01-07", "version": "2021-01-07",

4
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -3,13 +3,13 @@
buildGoModule rec { buildGoModule rec {
pname = "argocd"; pname = "argocd";
version = "1.8.4"; version = "1.8.4";
commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574"; commit = "28aea3dfdede00443b52cc584814d80e8f896200";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj"; owner = "argoproj";
repo = "argo-cd"; repo = "argo-cd";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-E/IHJul2dGt8ITwZBhvZN8c4vQzzA99lGArCaLNJo5Q="; sha256 = "sha256:155396rnihha31jxy0zk1jykiirpv4dhc69w45y6nx3nx4k0gwhk";
}; };
vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4="; vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4=";

6
pkgs/applications/networking/cluster/fluxcd/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "fluxcd"; pname = "fluxcd";
version = "0.8.0"; version = "0.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fluxcd"; owner = "fluxcd";
repo = "flux2"; repo = "flux2";
rev = "v${version}"; rev = "v${version}";
sha256 = "1k7zcn8l60qfgiixkjcmp94w87w88n475mmhf58vl5pfz21p9vky"; sha256 = "1xxw6zk0lk4is220lydcx57mrsw6pk2rirsp4wjzvawjlv7wdv25";
}; };
vendorSha256 = "16yixz47zrzjkb2k4n03zfivpc2cavcrrv4fz8s5a4xzfrcp4nvx"; vendorSha256 = "0acxbmc4j1fcdja0s9g04f0kd34x54yfqismibfi40m2gzbg6ljr";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

6
pkgs/applications/networking/cluster/fluxctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "fluxctl"; pname = "fluxctl";
version = "1.21.1"; version = "1.21.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weaveworks"; owner = "weaveworks";
repo = "flux"; repo = "flux";
rev = version; rev = version;
sha256 = "sha256-/go8V1EjY/iL3csoNpPyeWORvWCf0WnnaSOgiZ8UFQ8="; sha256 = "sha256-pI/LGAjTWFXiDKSV+dZl0wXK/TZmN9DuWf5Nu8EYNYc=";
}; };
vendorSha256 = "sha256-GEU0Q2Elhiel20xvup+i1DSXCjQdA9s7cWykcbKR5KA="; vendorSha256 = "sha256-Q8gIhJSZqdjBXrIcJfCd25BniDScwVzUwZ9Vc8p/z3c=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

23
pkgs/applications/networking/cluster/kubectl-example/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-example";
version = "1.0.1";
src = fetchFromGitHub {
owner = "seredot";
repo = pname;
rev = "v${version}";
sha256 = "18vp53cda93qjssxygwqp55yc80a93781839gf3138awngf731yq";
};
vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
meta = with lib; {
description = "kubectl plugin for retrieving resource example YAMLs";
homepage = "https://github.com/seredot/kubectl-example";
changelog = "https://github.com/seredot/kubectl-example/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ maintainers.bryanasdev000 ];
};
}

1
pkgs/applications/networking/cluster/nixops/default.nix
View File

@ -2,7 +2,6 @@
, poetry2nix , poetry2nix
, lib , lib
, overrides ? (self: super: {}) , overrides ? (self: super: {})
, stdenv
}: }:
let let

4
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -157,8 +157,8 @@ in rec {
}); });
terraform_0_14 = pluggable (generic { terraform_0_14 = pluggable (generic {
version = "0.14.6"; version = "0.14.7";
sha256 = "0ba3vd6lswy4pd0qywdbx8cf71j5z3p8p8kdjs9m4qbyrzsbq0fk"; sha256 = "0lnq65ibdxrw2rlyipk469a5hh16vgym1698nmfn62ak8fdrd8la";
vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb"; vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb";
patches = [ ./provider-path.patch ]; patches = [ ./provider-path.patch ];
passthru = { inherit plugins; }; passthru = { inherit plugins; };

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.28.5"; version = "0.28.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-LSUWEgCajIBgRPiuvGJ9I3tJLXk1JrVDDsgS7lpbVYk="; sha256 = "sha256-DzC/HNwFNNEJhic/8KpHchrBmsSbrn7xf1DjY0JTH08=";
}; };
vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4=";

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -25,7 +25,7 @@ let
else ""); else "");
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "signal-desktop"; pname = "signal-desktop";
version = "1.39.6"; # Please backport all updates to the stable channel. version = "1.40.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release. # All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is # When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with: # applied. The expiration date for the current release can be extracted with:
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "04fd81vc0dxk0b47crm5zacf4x79pdn483xicygnc1z6v7mnrmgk"; sha256 = "1xd38a9mi23c4r873k37rzip68hfk3a4bk9j4j24v2kb3yvixrpp";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -22,12 +22,12 @@ let
in mkDerivation rec { in mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "2.5.8"; version = "2.5.9";
# Telegram-Desktop with submodules # Telegram-Desktop with submodules
src = fetchurl { src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "0zj1g24fi4m84p6zj9yk55v8sbhn0jdpdhp33y12d2msz0qwp2cw"; sha256 = "1311dab9cil8hl1qlh01ynrczyjbldcsq1l6ibh818wb5lsgvvl2";
}; };
postPatch = '' postPatch = ''

6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm
, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf , libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf
, xorg, libXtst
}: }:
let let
rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de"; rev = "a19877363082da634a3c851a4698376504d2eaee";
sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc"; sha256 = "03m6fkc3m2wbh821mr3ybsmd7sjllky44mizny96k4b249dkvzx7";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "tg_owt"; pname = "tg_owt";
@ -23,6 +24,7 @@ in stdenv.mkDerivation {
buildInputs = [ buildInputs = [
libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf
xorg.libX11 libXtst
]; ];
cmakeFlags = [ cmakeFlags = [

6
pkgs/applications/networking/irc/weechat/scripts/default.nix
View File

@ -1,8 +1,12 @@
{ callPackage, luaPackages, python3Packages }: { callPackage, luaPackages, perlPackages, python3Packages }:
{ {
colorize_nicks = callPackage ./colorize_nicks { }; colorize_nicks = callPackage ./colorize_nicks { };
multiline = callPackage ./multiline {
inherit (perlPackages) PodParser;
};
weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
inherit (luaPackages) cjson luaffi; inherit (luaPackages) cjson luaffi;
}; };

40
pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ stdenv, lib, fetchurl, substituteAll, PodParser }:
stdenv.mkDerivation {
pname = "multiline";
version = "0.6.3";
src = fetchurl {
url = "https://raw.githubusercontent.com/weechat/scripts/945315bed4bc2beaf1e47f9b946ffe8f638f77fe/perl/multiline.pl";
sha256 = "1smialb21ny7brhij4sbw46xvsmrdv6ig2da0ip63ga2afngwsy4";
};
dontUnpack = true;
prePatch = ''
cp $src multiline.pl
'';
patches = [
# The script requires a special Perl environment.
(substituteAll {
src = ./libpath.patch;
env = PodParser;
})
];
passthru.scripts = [ "multiline.pl" ];
installPhase = ''
runHook preInstall
install -D multiline.pl $out/share/multiline.pl
runHook postInstall
'';
meta = with lib; {
description = "Multi-line edit box";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ oxzi ];
};
}

9
pkgs/applications/networking/irc/weechat/scripts/multiline/libpath.patch Normal file
View File

@ -0,0 +1,9 @@
diff --git a/multiline.pl b/multiline.pl
index 54474d4..42fbef8 100644
--- a/multiline.pl
+++ b/multiline.pl
@@ -1,3 +1,4 @@
+use lib '@env@/lib/perl5/site_perl';
use strict; use warnings;
$INC{'Encode/ConfigLocal.pm'}=1;
require Encode;

5
pkgs/applications/networking/maestral-qt/default.nix
View File

@ -6,18 +6,17 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt"; pname = "maestral-qt";
version = "1.3.1"; version = "1.4.2";
disabled = python3.pkgs.pythonOlder "3.6"; disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SamSchott"; owner = "SamSchott";
repo = "maestral-qt"; repo = "maestral-qt";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-2S2sa2/HVt3IRsE98PT2XwpONjaYENBzYW+ezBFrJYI="; sha256 = "sha256-cPH0wD7RL3OifDTD48x58I4qeaLALOMFnfWXjE2/lUQ=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
bugsnag
click click
markdown2 markdown2
maestral maestral

4
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -12,7 +12,7 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.31.3"; version = "0.31.4";
pname = "notmuch"; pname = "notmuch";
passthru = { passthru = {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchgit { src = fetchgit {
url = "https://git.notmuchmail.org/git/notmuch"; url = "https://git.notmuchmail.org/git/notmuch";
sha256 = "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v"; sha256 = "sha256-M+LEf257OcDlHOCYYxzEVQpop+i2gzO/QJPdajz/CRM=";
rev = version; rev = version;
}; };

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

@ -41,11 +41,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mullvad-vpn"; pname = "mullvad-vpn";
version = "2021.1"; version = "2021.2";
src = fetchurl { src = fetchurl {
url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
sha256 = "1ksa327zaiwmcmzv4n4ycfzc4sqhj2492c5ir0mqlx7x2nnhx6q7"; sha256 = "sha256-nNZK11MckiQ+z8NDgDc7aJ6yrXWI1hPOvMZkrGwDDgU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

101
pkgs/applications/radio/cqrlog/default.nix Normal file
View File

@ -0,0 +1,101 @@
{ lib
, stdenv
, fetchFromGitHub
, fpc
, lazarus
, atk
, cairo
, gdk-pixbuf
, glib
, gtk2-x11
, libX11
, pango
, hamlib
, mysql57
, tqsl
, xdg-utils
, xplanet
, autoPatchelfHook
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "cqrlog";
version = "2.5.2";
src = fetchFromGitHub {
owner = "ok2cqr";
repo = "cqrlog";
rev = "v${version}";
sha256 = "0zzcg0bl6mq4wfifj998x9x09w8sigbh46synpqx034fpr0swyhb";
};
# Adds the possiblity to change the lazarus directory,
# otherwise, we would get error : "directory lcl not found"
patches = [ ./fix-makefile-lazarusdir.patch ];
postPatch = ''
substituteInPlace Makefile \
--replace @Lazarusdir@ "${lazarus}/share/lazarus" \
--replace /usr ""
substituteInPlace src/fTRXControl.pas \
--replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld"
substituteInPlace src/fCallAttachment.pas \
--replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
substituteInPlace src/fRotControl.pas \
--replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld"
substituteInPlace src/fPreferences.pas \
--replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" \
--replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld" \
--replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet"
substituteInPlace src/fLoTWExport.pas \
--replace "/usr/bin/tqsl" "${tqsl}/bin/tqsl"
substituteInPlace src/dUtils.pas \
--replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet" \
--replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld"
# Order is important
substituteInPlace src/dData.pas \
--replace "/usr/bin/mysqld_safe" "${mysql57}/bin/mysqld_safe" \
--replace "/usr/bin/mysqld" "${mysql57}/bin/mysqld"
# To be fail when I need to patch a new hardcoded binary
! grep -C src -RC0 "/usr"
'';
nativeBuildInputs = [ lazarus fpc autoPatchelfHook wrapGAppsHook ];
buildInputs = [
atk
cairo
gdk-pixbuf
glib
gtk2-x11
libX11
pango
];
propagatedBuildInputs = [
hamlib
mysql57
tqsl
xdg-utils
xplanet
];
makeFlags = [
"FPC=fpc"
"PP=fpc"
"DESTDIR=$(out)"
];
postFixup = ''
libmysqlclient=$(find "${mysql57}/lib" -name "libmysqlclient.so.*" | tail -n1)
patchelf --add-needed "$libmysqlclient" "$out/bin/.cqrlog-wrapped"
'';
meta = with lib; {
description = "Linux logging program for amateur radio operators";
homepage = "https://www.cqrlog.com/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

13
pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch Normal file
View File

@ -0,0 +1,13 @@
Seulement dans b: logs
diff --color -ur a/Makefile b/Makefile
--- a/Makefile 2021-02-15 17:07:14.333810200 +0100
+++ b/Makefile 2021-02-15 17:19:18.599426984 +0100
@@ -6,7 +6,7 @@
tmpdir = /tmp
cqrlog: src/cqrlog.lpi
- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+ $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus --lazarusdir=@Lazarusdir@ src/cqrlog.lpi
$(ST) src/cqrlog
gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz

4
pkgs/applications/science/math/calc/default.nix
View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "calc"; pname = "calc";
version = "2.12.7.6"; version = "2.12.8.1";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
]; ];
sha256 = "sha256-Pg8nvW+RDy1Vb+Xg+5tnDxZEVkD80VcQGyZVayq8zsk="; sha256 = "sha256-TwVcuGaWIgzEc34DFEGFcmckXrwZ4ruRqselJClz15o=";
}; };
patchPhase = '' patchPhase = ''

6
pkgs/applications/version-management/git-and-tools/gh/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "1.5.0"; version = "1.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "1f23b8bn867b4zihz8m91xmkclcw1jnqkwi06klhm5576akahigq"; sha256 = "03bsramq75i5sw08gdmjh94n1xh743mq6h4dzaix78i531x7y34i";
}; };
vendorSha256 = "00adc0xjrkjrjh0gxk55vhpgxb5x0j5ialzrdvhlrvhpnb44qrcq"; vendorSha256 = "0nk5axyr3nd9cbk8wswfhqf25dks22mky3rdn6ba9s0fpxhhkr5g";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

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

@ -1,13 +1,13 @@
{ {
"version": "13.7.4", "version": "13.8.4",
"repo_hash": "1ggx76k6941rhccsd585p4h5k4zb87yvg0pmpzhwhh2q4ma2sywm", "repo_hash": "1q8q5v7c6g7yss26d6wg29h28fq1azy1smai97yk80cr0kirab8v",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v13.7.4-ee", "rev": "v13.8.4-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "13.7.4", "GITALY_SERVER_VERSION": "13.8.4",
"GITLAB_PAGES_VERSION": "1.34.0", "GITLAB_PAGES_VERSION": "1.34.0",
"GITLAB_SHELL_VERSION": "13.14.0", "GITLAB_SHELL_VERSION": "13.15.1",
"GITLAB_WORKHORSE_VERSION": "8.58.2" "GITLAB_WORKHORSE_VERSION": "8.59.0"
} }
} }

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

@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem 'rugged', '~> 0.28' gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1' gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.0.3.3' gem 'activesupport', '~> 6.0.3.4'
gem 'rdoc', '~> 6.0' gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false

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

@ -2,20 +2,20 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
abstract_type (0.0.7) abstract_type (0.0.7)
actionpack (6.0.3.3) actionpack (6.0.3.4)
actionview (= 6.0.3.3) actionview (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.0.3.3) actionview (6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.0.3.3) activesupport (6.0.3.4)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -86,7 +86,7 @@ GEM
json (2.3.1) json (2.3.1)
licensee (8.9.2) licensee (8.9.2)
rugged (~> 0.24) rugged (~> 0.24)
loofah (2.7.0) loofah (2.8.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
memoizable (0.4.2) memoizable (0.4.2)
@ -96,12 +96,13 @@ GEM
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512) mime-types-data (3.2020.0512)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.5.0)
minitest (5.14.2) minitest (5.14.2)
msgpack (1.3.3) msgpack (1.3.3)
multipart-post (2.1.1) multipart-post (2.1.1)
nokogiri (1.10.10) nokogiri (1.11.1)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (1.5.0) nokogumbo (1.5.0)
nokogiri nokogiri
opentracing (0.5.0) opentracing (0.5.0)
@ -117,6 +118,7 @@ GEM
pry (0.12.2) pry (0.12.2)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.9.0) method_source (~> 0.9.0)
racc (1.5.2)
rack (2.2.3) rack (2.2.3)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
@ -177,7 +179,7 @@ GEM
thread_safe (0.3.6) thread_safe (0.3.6)
thrift (0.11.0.0) thrift (0.11.0.0)
timecop (0.9.1) timecop (0.9.1)
tzinfo (1.2.7) tzinfo (1.2.9)
thread_safe (~> 0.1) thread_safe (~> 0.1)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
unparser (0.4.7) unparser (0.4.7)
@ -188,13 +190,13 @@ GEM
equalizer (~> 0.0.9) equalizer (~> 0.0.9)
parser (>= 2.6.5) parser (>= 2.6.5)
procto (~> 0.0.2) procto (~> 0.0.2)
zeitwerk (2.4.0) zeitwerk (2.4.2)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
activesupport (~> 6.0.3.3) activesupport (~> 6.0.3.4)
factory_bot factory_bot
faraday (~> 1.0) faraday (~> 1.0)
github-linguist (~> 7.12) github-linguist (~> 7.12)

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

@ -33,17 +33,17 @@ let
}; };
}; };
in buildGoModule rec { in buildGoModule rec {
version = "13.7.4"; version = "13.8.4";
pname = "gitaly"; pname = "gitaly";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "1inb7xlv8admzy9q1bgxccbrhks0mmc8lng356h39crj5sgaqkmg"; sha256 = "sha256-y8uy70ccQPba+JJmWace4LgLJkJNzVdFhrvq0AB8G5w=";
}; };
vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187"; vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM=";
passthru = { passthru = {
inherit rubyEnv; inherit rubyEnv;

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

@ -13,10 +13,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj";
type = "gem"; type = "gem";
}; };
version = "6.0.3.3"; version = "6.0.3.4";
}; };
actionview = { actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -24,10 +24,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj";
type = "gem"; type = "gem";
}; };
version = "6.0.3.3"; version = "6.0.3.4";
}; };
activesupport = { activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -35,10 +35,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j";
type = "gem"; type = "gem";
}; };
version = "6.0.3.3"; version = "6.0.3.4";
}; };
adamantium = { adamantium = {
dependencies = ["ice_nine" "memoizable"]; dependencies = ["ice_nine" "memoizable"];
@ -360,10 +360,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
type = "gem"; type = "gem";
}; };
version = "2.7.0"; version = "2.8.0";
}; };
memoizable = { memoizable = {
dependencies = ["thread_safe"]; dependencies = ["thread_safe"];
@ -414,12 +414,14 @@
version = "1.0.2"; version = "1.0.2";
}; };
mini_portile2 = { mini_portile2 = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem"; type = "gem";
}; };
version = "2.4.0"; version = "2.5.0";
}; };
minitest = { minitest = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -452,15 +454,15 @@
version = "2.1.1"; version = "2.1.1";
}; };
nokogiri = { nokogiri = {
dependencies = ["mini_portile2"]; dependencies = ["mini_portile2" "racc"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem"; type = "gem";
}; };
version = "1.10.10"; version = "1.11.1";
}; };
nokogumbo = { nokogumbo = {
dependencies = ["nokogiri"]; dependencies = ["nokogiri"];
@ -538,6 +540,16 @@
}; };
version = "0.12.2"; version = "0.12.2";
}; };
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
type = "gem";
};
version = "1.5.2";
};
rack = { rack = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -819,10 +831,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
type = "gem"; type = "gem";
}; };
version = "1.2.7"; version = "1.2.9";
}; };
unicode-display_width = { unicode-display_width = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -850,9 +862,9 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
type = "gem"; type = "gem";
}; };
version = "2.4.0"; version = "2.4.2";
}; };
} }

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

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

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

@ -3,13 +3,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "8.58.2"; version = "8.59.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-workhorse"; repo = "gitlab-workhorse";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ks8rla6hm618dxhr41x1ckzk3jxv0f7vl2547f7f1fl3zqna1zp"; sha256 = "sha256-6JVt5hNWvnUm64SFqns1f1+xMP/KyPQ8H93jqXNT8n8=";
}; };
vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";

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

@ -4,9 +4,6 @@ gem 'rails', '~> 6.0.3.1'
gem 'bootsnap', '~> 1.4.6' gem 'bootsnap', '~> 1.4.6'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
# Responders respond_to and respond_with # Responders respond_to and respond_with
gem 'responders', '~> 3.0' gem 'responders', '~> 3.0'
@ -19,10 +16,10 @@ gem 'default_value_for', '~> 3.3.0'
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
gem 'rugged', '~> 0.28' gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.5' gem 'grape-path-helpers', '~> 1.6.1'
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
gem 'marginalia', '~> 1.9.0' gem 'marginalia', '~> 1.10.0'
# Authentication libraries # Authentication libraries
gem 'devise', '~> 4.7.2' gem 'devise', '~> 4.7.2'
@ -57,7 +54,7 @@ gem 'gssapi', group: :kerberos
# Spam and anti-bot protection # Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0' gem 'akismet', '~> 3.0'
gem 'invisible_captcha', '~> 0.12.1' gem 'invisible_captcha', '~> 1.1.0'
# Two-factor authentication # Two-factor authentication
gem 'devise-two-factor', '~> 3.1.0' gem 'devise-two-factor', '~> 3.1.0'
@ -81,12 +78,10 @@ gem 'gpgme', '~> 2.0.19'
# GitLab fork with several improvements to original library. For full list of changes # GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap' gem 'net-ldap', '~> 0.16.3'
# API # API
# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged gem 'grape', '~> 1.5.1'
# Remove config/initializers/grape_patch.rb
gem 'grape', '= 1.4.0'
gem 'grape-entity', '~> 0.7.1' gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
@ -115,7 +110,7 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick', '~> 4.10.1' gem 'mini_magick', '~> 4.10.1'
# for backups # for backups
gem 'fog-aws', '~> 3.7' gem 'fog-aws', '~> 3.8'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb. # Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0' gem 'fog-core', '= 2.1.0'
@ -145,7 +140,7 @@ gem 'aws-sdk-s3', '~> 1'
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' gem 'html-pipeline', '~> 2.13.2'
gem 'deckar01-task_list', '2.3.1' gem 'deckar01-task_list', '2.3.1'
gem 'gitlab-markup', '~> 1.7.1' gem 'gitlab-markup', '~> 1.7.1'
gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'github-markup', '~> 1.7.0', require: 'github/markup'
@ -163,7 +158,7 @@ gem 'asciidoctor-kroki', '~> 0.2.2', require: false
gem 'rouge', '~> 3.26.0' gem 'rouge', '~> 3.26.0'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0' gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.9' gem 'nokogiri', '~> 1.11.1'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering
@ -184,15 +179,15 @@ group :unicorn do
end end
group :puma do group :puma do
gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false gem 'puma', '~> 5.1.1', require: false
gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false
end end
# State machine # State machine
gem 'state_machines-activerecord', '~> 0.6.0' gem 'state_machines-activerecord', '~> 0.8.0'
# Issue tags # Issue tags
gem 'acts-as-taggable-on', '~> 6.0' gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs # Background jobs
gem 'sidekiq', '~> 5.2.7' gem 'sidekiq', '~> 5.2.7'
@ -242,7 +237,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
gem 'hipchat', '~> 1.5.0' gem 'hipchat', '~> 1.5.0'
# Jira integration # Jira integration
gem 'jira-ruby', '~> 2.0.0' gem 'jira-ruby', '~> 2.1.4'
gem 'atlassian-jwt', '~> 0.2.0' gem 'atlassian-jwt', '~> 0.2.0'
# Flowdock integration # Flowdock integration
@ -255,7 +250,7 @@ gem 'slack-messenger', '~> 2.3.4'
gem 'hangouts-chat', '~> 0.0.5' gem 'hangouts-chat', '~> 0.0.5'
# Asana integration # Asana integration
gem 'asana', '0.10.2' gem 'asana', '~> 0.10.3'
# FogBugz integration # FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
@ -306,12 +301,12 @@ gem 'rack-attack', '~> 6.3.0'
gem 'sentry-raven', '~> 3.0' gem 'sentry-raven', '~> 3.0'
# PostgreSQL query parsing # PostgreSQL query parsing
gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query' gem 'pg_query', '~> 1.3.0'
gem 'premailer-rails', '~> 1.10.3' gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '0.13.3' gem 'gitlab-labkit', '0.14.0'
# I18n # I18n
gem 'ruby_parser', '~> 3.15', require: false gem 'ruby_parser', '~> 3.15', require: false
@ -331,6 +326,7 @@ gem 'snowplow-tracker', '~> 0.6.1'
# Metrics # Metrics
group :metrics do group :metrics do
gem 'method_source', '~> 1.0', require: false gem 'method_source', '~> 1.0', require: false
gem 'webrick', '~> 1.6.1', require: false
# Prometheus # Prometheus
gem 'prometheus-client-mmap', '~> 0.12.0' gem 'prometheus-client-mmap', '~> 0.12.0'
@ -353,14 +349,15 @@ end
group :development, :test do group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.0' gem 'bullet', '~> 6.1.0'
gem 'pry-byebug', '~> 3.9.0', platform: :mri gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
gem 'pry-remote'
gem 'awesome_print', require: false gem 'awesome_print', require: false
gem 'database_cleaner', '~> 1.7.0' gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 5.1.0' gem 'factory_bot_rails', '~> 6.1.0'
gem 'rspec-rails', '~> 4.0.0' gem 'rspec-rails', '~> 4.0.1'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.11.0' gem 'minitest', '~> 5.11.0'
@ -371,7 +368,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0' gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 5.3.0', require: false gem 'gitlab-styles', '~> 6.0.0', require: false
gem 'scss_lint', '~> 0.59.0', require: false gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false gem 'haml_lint', '~> 0.36.0', require: false
@ -409,7 +406,7 @@ group :test do
gem 'rspec_profiling', '~> 0.0.6' gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.33.0' gem 'capybara', '~> 3.34.0'
gem 'capybara-screenshot', '~> 1.0.22' gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.142' gem 'selenium-webdriver', '~> 3.142'
@ -465,7 +462,7 @@ group :ed25519 do
end end
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
gem 'gitaly', '~> 13.7.0.pre.rc1' gem 'gitaly', '~> 13.8.0.pre.rc2'
gem 'grpc', '~> 1.30.2' gem 'grpc', '~> 1.30.2'
@ -478,7 +475,7 @@ gem 'flipper', '~> 0.17.1'
gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1'
gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5' gem 'unleash', '~> 0.1.5'
gem 'gitlab-experiment', '~> 0.4.4' gem 'gitlab-experiment', '~> 0.4.5'
# Structured logging # Structured logging
gem 'lograge', '~> 0.5' gem 'lograge', '~> 0.5'

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

@ -5,66 +5,66 @@ GEM
abstract_type (0.0.7) abstract_type (0.0.7)
acme-client (2.0.6) acme-client (2.0.6)
faraday (>= 0.17, < 2.0.0) faraday (>= 0.17, < 2.0.0)
actioncable (6.0.3.3) actioncable (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.3) actionmailbox (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
activejob (= 6.0.3.3) activejob (= 6.0.3.4)
activerecord (= 6.0.3.3) activerecord (= 6.0.3.4)
activestorage (= 6.0.3.3) activestorage (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.0.3.3) actionmailer (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
actionview (= 6.0.3.3) actionview (= 6.0.3.4)
activejob (= 6.0.3.3) activejob (= 6.0.3.4)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.0.3.3) actionpack (6.0.3.4)
actionview (= 6.0.3.3) actionview (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.3) actiontext (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
activerecord (= 6.0.3.3) activerecord (= 6.0.3.4)
activestorage (= 6.0.3.3) activestorage (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.0.3.3) actionview (6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.3) activejob (6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.0.3.3) activemodel (6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
activerecord (6.0.3.3) activerecord (6.0.3.4)
activemodel (= 6.0.3.3) activemodel (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
activerecord-explain-analyze (0.1.0) activerecord-explain-analyze (0.1.0)
activerecord (>= 4) activerecord (>= 4)
pg pg
activestorage (6.0.3.3) activestorage (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
activejob (= 6.0.3.3) activejob (= 6.0.3.4)
activerecord (= 6.0.3.3) activerecord (= 6.0.3.4)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activesupport (6.0.3.3) activesupport (6.0.3.4)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2) zeitwerk (~> 2.2, >= 2.2.2)
acts-as-taggable-on (6.5.0) acts-as-taggable-on (7.0.0)
activerecord (>= 5.0, < 6.1) activerecord (>= 5.0, < 6.2)
adamantium (0.2.0) adamantium (0.2.0)
ice_nine (~> 0.11.0) ice_nine (~> 0.11.0)
memoizable (~> 0.4.0) memoizable (~> 0.4.0)
@ -76,7 +76,7 @@ GEM
apollo_upload_server (2.0.2) apollo_upload_server (2.0.2)
graphql (>= 1.8) graphql (>= 1.8)
rails (>= 4.2) rails (>= 4.2)
asana (0.10.2) asana (0.10.3)
faraday (~> 1.0) faraday (~> 1.0)
faraday_middleware (~> 1.0) faraday_middleware (~> 1.0)
faraday_middleware-multi_json (~> 0.0) faraday_middleware-multi_json (~> 0.0)
@ -115,13 +115,14 @@ GEM
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.1) aws-sigv4 (1.2.1)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
azure-storage-blob (2.0.0) azure-storage-blob (2.0.1)
azure-storage-common (~> 2.0) azure-storage-common (~> 2.0)
nokogiri (~> 1.10.4) nokogiri (~> 1.11.0.rc2)
azure-storage-common (2.0.1) azure-storage-common (2.0.2)
faraday (~> 1.0) faraday (~> 1.0)
faraday_middleware (~> 1.0.0.rc1) faraday_middleware (~> 1.0.0.rc1)
nokogiri (~> 1.10.4) net-http-persistent (~> 4.0)
nokogiri (~> 1.11.0.rc2)
babosa (1.0.2) babosa (1.0.2)
base32 (0.3.2) base32 (0.3.2)
batch-loader (1.4.0) batch-loader (1.4.0)
@ -151,7 +152,7 @@ GEM
bundler (>= 1.2.0, < 3) bundler (>= 1.2.0, < 3)
thor (~> 0.18) thor (~> 0.18)
byebug (11.1.3) byebug (11.1.3)
capybara (3.33.0) capybara (3.34.0)
addressable addressable
mini_mime (>= 0.1.3) mini_mime (>= 0.1.3)
nokogiri (~> 1.8) nokogiri (~> 1.8)
@ -228,17 +229,16 @@ GEM
activerecord (>= 3.2.0, < 6.1) activerecord (>= 3.2.0, < 6.1)
deprecation_toolkit (1.5.1) deprecation_toolkit (1.5.1)
activesupport (>= 4.2) activesupport (>= 4.2)
derailed_benchmarks (1.7.0) derailed_benchmarks (1.8.1)
benchmark-ips (~> 2) benchmark-ips (~> 2)
get_process_mem (~> 0) get_process_mem (~> 0)
heapy (~> 0) heapy (~> 0)
memory_profiler (~> 0) memory_profiler (~> 0)
mini_histogram (~> 0) mini_histogram (>= 0.2.1)
rack (>= 1) rack (>= 1)
rake (> 10, < 14) rake (> 10, < 14)
ruby-statistics (>= 2.1) ruby-statistics (>= 2.1)
thor (>= 0.19, < 2) thor (>= 0.19, < 2)
unicode_plot (>= 0.0.4, < 1.0.0)
device_detector (1.0.0) device_detector (1.0.0)
devise (4.7.3) devise (4.7.3)
bcrypt (~> 3.0) bcrypt (~> 3.0)
@ -252,7 +252,7 @@ GEM
devise (~> 4.0) devise (~> 4.0)
railties (< 6.1) railties (< 6.1)
rotp (~> 2.0) rotp (~> 2.0)
diff-lcs (1.3) diff-lcs (1.4.4)
diff_match_patch (0.1.0) diff_match_patch (0.1.0)
diffy (3.3.0) diffy (3.3.0)
discordrb-webhooks-blackst0ne (3.3.0) discordrb-webhooks-blackst0ne (3.3.0)
@ -265,21 +265,19 @@ GEM
doorkeeper-openid_connect (1.7.4) doorkeeper-openid_connect (1.7.4)
doorkeeper (>= 5.2, < 5.5) doorkeeper (>= 5.2, < 5.5)
json-jwt (>= 1.11.0) json-jwt (>= 1.11.0)
dry-configurable (0.11.5) dry-configurable (0.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-core (~> 0.4, >= 0.4.7) dry-core (~> 0.5, >= 0.5.0)
dry-equalizer (~> 0.2)
dry-container (0.7.2) dry-container (0.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-configurable (~> 0.1, >= 0.1.3) dry-configurable (~> 0.1, >= 0.1.3)
dry-core (0.4.9) dry-core (0.5.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-equalizer (0.3.0) dry-equalizer (0.3.0)
dry-inflector (0.2.0) dry-inflector (0.2.0)
dry-logic (1.0.6) dry-logic (1.1.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-core (~> 0.2) dry-core (~> 0.5, >= 0.5)
dry-equalizer (~> 0.2)
dry-types (1.4.0) dry-types (1.4.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
dry-container (~> 0.3) dry-container (~> 0.3)
@ -309,7 +307,6 @@ GEM
launchy (~> 2.1) launchy (~> 2.1)
mail (~> 2.7) mail (~> 2.7)
encryptor (3.0.0) encryptor (3.0.0)
enumerable-statistics (2.0.1)
equalizer (0.0.11) equalizer (0.0.11)
erubi (1.9.0) erubi (1.9.0)
escape_utils (1.2.1) escape_utils (1.2.1)
@ -321,11 +318,11 @@ GEM
expression_parser (0.9.0) expression_parser (0.9.0)
extended-markdown-filter (0.6.0) extended-markdown-filter (0.6.0)
html-pipeline (~> 2.0) html-pipeline (~> 2.0)
factory_bot (5.1.0) factory_bot (6.1.0)
activesupport (>= 4.2.0) activesupport (>= 5.0.0)
factory_bot_rails (5.1.0) factory_bot_rails (6.1.0)
factory_bot (~> 5.1.0) factory_bot (~> 6.1.0)
railties (>= 4.2.0) railties (>= 5.0.0)
faraday (1.0.1) faraday (1.0.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.7) faraday-cookie_jar (0.0.7)
@ -363,7 +360,7 @@ GEM
fog-json fog-json
ipaddress (~> 0.8) ipaddress (~> 0.8)
xml-simple (~> 1.1) xml-simple (~> 1.1)
fog-aws (3.7.0) fog-aws (3.8.0)
fog-core (~> 2.1) fog-core (~> 2.1)
fog-json (~> 1.1) fog-json (~> 1.1)
fog-xml (~> 0.1) fog-xml (~> 0.1)
@ -420,12 +417,12 @@ GEM
rails (>= 3.2.0) rails (>= 3.2.0)
git (1.7.0) git (1.7.0)
rchardet (~> 1.8) rchardet (~> 1.8)
gitaly (13.7.0.pre.rc1) gitaly (13.8.0.pre.rc2)
grpc (~> 1.0) grpc (~> 1.0)
github-markup (1.7.0) github-markup (1.7.0)
gitlab-chronic (0.10.5) gitlab-chronic (0.10.5)
numerizer (~> 0.2) numerizer (~> 0.2)
gitlab-experiment (0.4.4) gitlab-experiment (0.4.5)
activesupport (>= 3.0) activesupport (>= 3.0)
scientist (~> 1.5, >= 1.5.0) scientist (~> 1.5, >= 1.5.0)
gitlab-fog-azure-rm (1.0.0) gitlab-fog-azure-rm (1.0.0)
@ -435,9 +432,9 @@ GEM
fog-json (~> 1.2.0) fog-json (~> 1.2.0)
mime-types mime-types
ms_rest_azure (~> 0.12.0) ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.13.3) gitlab-labkit (0.14.0)
actionpack (>= 5.0.0, < 6.1.0) actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 7.0.0)
gitlab-pg_query (~> 1.3) gitlab-pg_query (~> 1.3)
grpc (~> 1.19) grpc (~> 1.19)
jaeger-client (~> 1.1) jaeger-client (~> 1.1)
@ -447,19 +444,17 @@ GEM
gitlab-mail_room (0.0.8) gitlab-mail_room (0.0.8)
gitlab-markup (1.7.1) gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1) gitlab-net-dns (0.9.1)
gitlab-pg_query (1.3.0) gitlab-pg_query (1.3.1)
gitlab-puma (4.3.5.gitlab.3) gitlab-pry-byebug (3.9.0)
nio4r (~> 2.0) byebug (~> 11.0)
gitlab-puma_worker_killer (0.1.1.gitlab.1) pry (~> 0.13.0)
get_process_mem (~> 0.2)
gitlab-puma (>= 2.7, < 5)
gitlab-sidekiq-fetcher (0.5.2) gitlab-sidekiq-fetcher (0.5.2)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (5.3.0) gitlab-styles (6.0.0)
rubocop (~> 0.89.1) rubocop (~> 0.91.1)
rubocop-gitlab-security (~> 0.1.0) rubocop-gitlab-security (~> 0.1.1)
rubocop-performance (~> 1.8.1) rubocop-performance (~> 1.9.2)
rubocop-rails (~> 2.8) rubocop-rails (~> 2.9)
rubocop-rspec (~> 1.44) rubocop-rspec (~> 1.44)
gitlab_chronic_duration (0.10.6.2) gitlab_chronic_duration (0.10.6.2)
numerizer (~> 0.2) numerizer (~> 0.2)
@ -497,7 +492,7 @@ GEM
signet (~> 0.14) signet (~> 0.14)
gpgme (2.0.20) gpgme (2.0.20)
mini_portile2 (~> 2.3) mini_portile2 (~> 2.3)
grape (1.4.0) grape (1.5.1)
activesupport activesupport
builder builder
dry-types (>= 1.1) dry-types (>= 1.1)
@ -507,10 +502,11 @@ GEM
grape-entity (0.7.1) grape-entity (0.7.1)
activesupport (>= 4.0) activesupport (>= 4.0)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grape-path-helpers (1.5.0) grape-path-helpers (1.6.1)
activesupport activesupport
grape (~> 1.3) grape (~> 1.3)
rake (> 12) rake (> 12)
ruby2_keywords (~> 0.0.2)
grape_logging (1.8.3) grape_logging (1.8.3)
grape grape
rack rack
@ -573,11 +569,12 @@ GEM
hashie (>= 3.0) hashie (>= 3.0)
health_check (3.0.0) health_check (3.0.0)
railties (>= 5.0) railties (>= 5.0)
heapy (0.1.4) heapy (0.2.0)
thor
hipchat (1.5.2) hipchat (1.5.2)
httparty httparty
mimemagic mimemagic
html-pipeline (2.12.2) html-pipeline (2.13.2)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
html2text (0.2.0) html2text (0.2.0)
@ -598,18 +595,18 @@ GEM
mime-types (~> 3.0) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.8.5) i18n (1.8.7)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n_data (0.8.0) i18n_data (0.8.0)
icalendar (2.4.1) icalendar (2.4.1)
ice_nine (0.11.2) ice_nine (0.11.2)
invisible_captcha (0.12.1) invisible_captcha (1.1.0)
rails (>= 3.2.0) rails (>= 4.2)
ipaddress (0.8.3) ipaddress (0.8.3)
jaeger-client (1.1.0) jaeger-client (1.1.0)
opentracing (~> 0.3) opentracing (~> 0.3)
thrift thrift
jira-ruby (2.0.0) jira-ruby (2.1.4)
activesupport activesupport
atlassian-jwt atlassian-jwt
multipart-post multipart-post
@ -686,7 +683,7 @@ GEM
activesupport (>= 4) activesupport (>= 4)
railties (>= 4) railties (>= 4)
request_store (~> 1.0) request_store (~> 1.0)
loofah (2.7.0) loofah (2.8.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lru_redux (1.1.0) lru_redux (1.1.0)
@ -695,7 +692,7 @@ GEM
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (0.3.3) marcel (0.3.3)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.2)
marginalia (1.9.0) marginalia (1.10.0)
actionpack (>= 2.3) actionpack (>= 2.3)
activerecord (>= 2.3) activerecord (>= 2.3)
memoist (0.16.2) memoist (0.16.2)
@ -707,10 +704,10 @@ GEM
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512) mime-types-data (3.2020.0512)
mimemagic (0.3.5) mimemagic (0.3.5)
mini_histogram (0.1.3) mini_histogram (0.3.1)
mini_magick (4.10.1) mini_magick (4.10.1)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.5.0)
minitest (5.11.3) minitest (5.11.3)
ms_rest (0.7.6) ms_rest (0.7.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
@ -730,17 +727,19 @@ GEM
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
mustermann-grape (1.0.1) mustermann-grape (1.0.1)
mustermann (>= 1.0.0) mustermann (>= 1.0.0)
nakayoshi_fork (0.0.4)
nap (1.1.0) nap (1.1.0)
nenv (0.3.0) nenv (0.3.0)
net-ldap (0.16.2) net-http-persistent (4.0.0)
connection_pool (~> 2.2)
net-ldap (0.16.3)
net-ntp (2.1.3) net-ntp (2.1.3)
net-ssh (6.0.0) net-ssh (6.0.0)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.4) nio4r (2.5.4)
no_proxy_fix (0.1.2) no_proxy_fix (0.1.2)
nokogiri (1.10.10) nokogiri (1.11.1)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.2) nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4) nokogiri (~> 1.8, >= 1.8.4)
notiffany (0.1.3) notiffany (0.1.3)
@ -840,13 +839,14 @@ GEM
rubypants (~> 0.2) rubypants (~> 0.2)
orm_adapter (0.5.0) orm_adapter (0.5.0)
os (1.1.1) os (1.1.1)
parallel (1.19.2) parallel (1.20.1)
parser (2.7.2.0) parser (3.0.0.0)
ast (~> 2.4.1) ast (~> 2.4.1)
parslet (1.8.2) parslet (1.8.2)
peek (1.1.0) peek (1.1.0)
railties (>= 4.0.0) railties (>= 4.0.0)
pg (1.2.3) pg (1.2.3)
pg_query (1.3.0)
png_quantizator (0.2.1) png_quantizator (0.2.1)
po_to_json (1.0.1) po_to_json (1.0.1)
json (>= 1.6.0) json (>= 1.6.0)
@ -866,14 +866,20 @@ GEM
pry (0.13.1) pry (0.13.1)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
pry-rails (0.3.9) pry-rails (0.3.9)
pry (>= 0.10.4) pry (>= 0.10.4)
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.1.1)
nio4r (~> 2.0)
puma_worker_killer (0.3.1)
get_process_mem (~> 0.2)
puma (>= 2.7)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6) raabro (1.1.6)
racc (1.5.2)
rack (2.2.3) rack (2.2.3)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
@ -894,20 +900,20 @@ GEM
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rack-timeout (0.5.2) rack-timeout (0.5.2)
rails (6.0.3.3) rails (6.0.3.4)
actioncable (= 6.0.3.3) actioncable (= 6.0.3.4)
actionmailbox (= 6.0.3.3) actionmailbox (= 6.0.3.4)
actionmailer (= 6.0.3.3) actionmailer (= 6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
actiontext (= 6.0.3.3) actiontext (= 6.0.3.4)
actionview (= 6.0.3.3) actionview (= 6.0.3.4)
activejob (= 6.0.3.3) activejob (= 6.0.3.4)
activemodel (= 6.0.3.3) activemodel (= 6.0.3.4)
activerecord (= 6.0.3.3) activerecord (= 6.0.3.4)
activestorage (= 6.0.3.3) activestorage (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 6.0.3.3) railties (= 6.0.3.4)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
@ -921,15 +927,15 @@ GEM
rails-i18n (6.0.0) rails-i18n (6.0.0)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7) railties (>= 6.0.0, < 7)
railties (6.0.3.3) railties (6.0.3.4)
actionpack (= 6.0.3.3) actionpack (= 6.0.3.4)
activesupport (= 6.0.3.3) activesupport (= 6.0.3.4)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (>= 0.20.3, < 2.0)
rainbow (3.0.0) rainbow (3.0.0)
raindrops (0.19.1) raindrops (0.19.1)
rake (13.0.1) rake (13.0.3)
rb-fsevent (0.10.4) rb-fsevent (0.10.4)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
@ -989,25 +995,25 @@ GEM
chunky_png chunky_png
rqrcode-rails3 (0.1.7) rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2) rqrcode (>= 0.4.2)
rspec (3.9.0) rspec (3.10.0)
rspec-core (~> 3.9.0) rspec-core (~> 3.10.0)
rspec-expectations (~> 3.9.0) rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.9.0) rspec-mocks (~> 3.10.0)
rspec-core (3.9.1) rspec-core (3.10.0)
rspec-support (~> 3.9.1) rspec-support (~> 3.10.0)
rspec-expectations (3.9.1) rspec-expectations (3.10.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.10.0)
rspec-mocks (3.9.1) rspec-mocks (3.10.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.10.0)
rspec-parameterized (0.4.2) rspec-parameterized (0.4.2)
binding_ninja (>= 0.2.3) binding_ninja (>= 0.2.3)
parser parser
proc_to_ast proc_to_ast
rspec (>= 2.13, < 4) rspec (>= 2.13, < 4)
unparser unparser
rspec-rails (4.0.0) rspec-rails (4.0.1)
actionpack (>= 4.2) actionpack (>= 4.2)
activesupport (>= 4.2) activesupport (>= 4.2)
railties (>= 4.2) railties (>= 4.2)
@ -1017,7 +1023,7 @@ GEM
rspec-support (~> 3.9) rspec-support (~> 3.9)
rspec-retry (0.6.1) rspec-retry (0.6.1)
rspec-core (> 3.3) rspec-core (> 3.3)
rspec-support (3.9.2) rspec-support (3.10.0)
rspec_junit_formatter (0.4.1) rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0) rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.6) rspec_profiling (0.0.6)
@ -1025,26 +1031,26 @@ GEM
pg pg
rails rails
sqlite3 sqlite3
rubocop (0.89.1) rubocop (0.91.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.1) parser (>= 2.7.1.1)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7) regexp_parser (>= 1.7)
rexml rexml
rubocop-ast (>= 0.3.0, < 1.0) rubocop-ast (>= 0.4.0, < 1.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0) unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.8.0) rubocop-ast (0.8.0)
parser (>= 2.7.1.5) parser (>= 2.7.1.5)
rubocop-gitlab-security (0.1.1) rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51) rubocop (>= 0.51)
rubocop-performance (1.8.1) rubocop-performance (1.9.2)
rubocop (>= 0.87.0) rubocop (>= 0.90.0, < 2.0)
rubocop-ast (>= 0.4.0) rubocop-ast (>= 0.4.0)
rubocop-rails (2.8.1) rubocop-rails (2.9.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
rack (>= 1.1) rack (>= 1.1)
rubocop (>= 0.87.0) rubocop (>= 0.90.0, < 2.0)
rubocop-rspec (1.44.1) rubocop-rspec (1.44.1)
rubocop (~> 0.87) rubocop (~> 0.87)
rubocop-ast (>= 0.7.1) rubocop-ast (>= 0.7.1)
@ -1053,7 +1059,7 @@ GEM
ruby-fogbugz (0.2.1) ruby-fogbugz (0.2.1)
crack (~> 0.4) crack (~> 0.4)
ruby-prof (1.3.1) ruby-prof (1.3.1)
ruby-progressbar (1.10.1) ruby-progressbar (1.11.0)
ruby-saml (1.7.2) ruby-saml (1.7.2)
nokogiri (>= 1.5.10) nokogiri (>= 1.5.10)
ruby-statistics (2.1.2) ruby-statistics (2.1.2)
@ -1127,6 +1133,7 @@ GEM
simplecov-html (0.12.2) simplecov-html (0.12.2)
sixarm_ruby_unaccent (1.2.0) sixarm_ruby_unaccent (1.2.0)
slack-messenger (2.3.4) slack-messenger (2.3.4)
slop (3.6.0)
snowplow-tracker (0.6.1) snowplow-tracker (0.6.1)
contracts (~> 0.7, <= 0.11) contracts (~> 0.7, <= 0.11)
spring (2.1.1) spring (2.1.1)
@ -1143,12 +1150,12 @@ GEM
sshkey (2.0.0) sshkey (2.0.0)
stackprof (0.2.15) stackprof (0.2.15)
state_machines (0.5.0) state_machines (0.5.0)
state_machines-activemodel (0.7.1) state_machines-activemodel (0.8.0)
activemodel (>= 4.1) activemodel (>= 5.1)
state_machines (>= 0.5.0) state_machines (>= 0.5.0)
state_machines-activerecord (0.6.0) state_machines-activerecord (0.8.0)
activerecord (>= 4.1) activerecord (>= 5.1)
state_machines-activemodel (>= 0.5.0) state_machines-activemodel (>= 0.8.0)
swd (1.1.2) swd (1.1.2)
activesupport (>= 3) activesupport (>= 3)
attr_required (>= 0.0.5) attr_required (>= 0.0.5)
@ -1185,7 +1192,7 @@ GEM
truncato (0.7.11) truncato (0.7.11)
htmlentities (~> 4.3.1) htmlentities (~> 4.3.1)
nokogiri (>= 1.7.0, <= 2.0) nokogiri (>= 1.7.0, <= 2.0)
tzinfo (1.2.8) tzinfo (1.2.9)
thread_safe (~> 0.1) thread_safe (~> 0.1)
u2f (0.2.1) u2f (0.2.1)
uber (0.1.0) uber (0.1.0)
@ -1193,8 +1200,6 @@ GEM
unf_ext unf_ext
unf_ext (0.0.7.7) unf_ext (0.0.7.7)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
unicode_plot (0.0.4)
enumerable-statistics (>= 2.0.1)
unicode_utils (1.4.0) unicode_utils (1.4.0)
unicorn (5.5.5) unicorn (5.5.5)
kgio (~> 2.6) kgio (~> 2.6)
@ -1247,6 +1252,7 @@ GEM
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0) hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.6.1)
websocket-driver (0.7.3) websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
@ -1259,7 +1265,7 @@ GEM
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
yajl-ruby (1.4.1) yajl-ruby (1.4.1)
zeitwerk (2.4.1) zeitwerk (2.4.2)
PLATFORMS PLATFORMS
ruby ruby
@ -1268,11 +1274,11 @@ DEPENDENCIES
RedCloth (~> 4.3.2) RedCloth (~> 4.3.2)
acme-client (~> 2.0, >= 2.0.6) acme-client (~> 2.0, >= 2.0.6)
activerecord-explain-analyze (~> 0.1) activerecord-explain-analyze (~> 0.1)
acts-as-taggable-on (~> 6.0) acts-as-taggable-on (~> 7.0)
addressable (~> 2.7) addressable (~> 2.7)
akismet (~> 3.0) akismet (~> 3.0)
apollo_upload_server (~> 2.0.2) apollo_upload_server (~> 2.0.2)
asana (= 0.10.2) asana (~> 0.10.3)
asciidoctor (~> 2.0.10) asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1) asciidoctor-include-ext (~> 0.3.1)
asciidoctor-kroki (~> 0.2.2) asciidoctor-kroki (~> 0.2.2)
@ -1297,7 +1303,7 @@ DEPENDENCIES
browser (~> 4.2) browser (~> 4.2)
bullet (~> 6.1.0) bullet (~> 6.1.0)
bundler-audit (~> 0.6.1) bundler-audit (~> 0.6.1)
capybara (~> 3.33.0) capybara (~> 3.34.0)
capybara-screenshot (~> 1.0.22) capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3) carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7) charlock_holmes (~> 0.7.7)
@ -1329,7 +1335,7 @@ DEPENDENCIES
email_spec (~> 2.2.0) email_spec (~> 2.2.0)
erubi (~> 1.9.0) erubi (~> 1.9.0)
escape_utils (~> 1.1) escape_utils (~> 1.1)
factory_bot_rails (~> 5.1.0) factory_bot_rails (~> 6.1.0)
faraday (~> 1.0) faraday (~> 1.0)
faraday_middleware-aws-sigv4 (~> 0.3.0) faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank fast_blank
@ -1339,7 +1345,7 @@ DEPENDENCIES
flipper-active_support_cache_store (~> 0.17.1) flipper-active_support_cache_store (~> 0.17.1)
flowdock (~> 0.7) flowdock (~> 0.7)
fog-aliyun (~> 0.3) fog-aliyun (~> 0.3)
fog-aws (~> 3.7) fog-aws (~> 3.8)
fog-core (= 2.1.0) fog-core (= 2.1.0)
fog-google (~> 1.12) fog-google (~> 1.12)
fog-local (~> 0.6) fog-local (~> 0.6)
@ -1351,30 +1357,28 @@ DEPENDENCIES
gettext (~> 3.3) gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly (~> 13.7.0.pre.rc1) gitaly (~> 13.8.0.pre.rc2)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5) gitlab-chronic (~> 0.10.5)
gitlab-experiment (~> 0.4.4) gitlab-experiment (~> 0.4.5)
gitlab-fog-azure-rm (~> 1.0) gitlab-fog-azure-rm (~> 1.0)
gitlab-labkit (= 0.13.3) gitlab-labkit (= 0.14.0)
gitlab-license (~> 1.0) gitlab-license (~> 1.0)
gitlab-mail_room (~> 0.0.8) gitlab-mail_room (~> 0.0.8)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-pg_query (~> 1.3) gitlab-pry-byebug
gitlab-puma (~> 4.3.3.gitlab.2)
gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
gitlab-sidekiq-fetcher (= 0.5.2) gitlab-sidekiq-fetcher (= 0.5.2)
gitlab-styles (~> 5.3.0) gitlab-styles (~> 6.0.0)
gitlab_chronic_duration (~> 0.10.6.2) gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2) gon (~> 6.2)
google-api-client (~> 0.33) google-api-client (~> 0.33)
google-protobuf (~> 3.12) google-protobuf (~> 3.12)
gpgme (~> 2.0.19) gpgme (~> 2.0.19)
grape (= 1.4.0) grape (~> 1.5.1)
grape-entity (~> 0.7.1) grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.5) grape-path-helpers (~> 1.6.1)
grape_logging (~> 1.7) grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10) graphiql-rails (~> 1.4.10)
graphlient (~> 0.4.0) graphlient (~> 0.4.0)
@ -1390,13 +1394,13 @@ DEPENDENCIES
hashie-forbidden_attributes hashie-forbidden_attributes
health_check (~> 3.0) health_check (~> 3.0)
hipchat (~> 1.5.0) hipchat (~> 1.5.0)
html-pipeline (~> 2.12) html-pipeline (~> 2.13.2)
html2text html2text
httparty (~> 0.16.4) httparty (~> 0.16.4)
icalendar icalendar
invisible_captcha (~> 0.12.1) invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3) ipaddress (~> 0.8.3)
jira-ruby (~> 2.0.0) jira-ruby (~> 2.1.4)
js_regex (~> 3.4) js_regex (~> 3.4)
json (~> 2.3.0) json (~> 2.3.0)
json-schema (~> 2.8.0) json-schema (~> 2.8.0)
@ -1414,18 +1418,17 @@ DEPENDENCIES
loofah (~> 2.2) loofah (~> 2.2)
lru_redux lru_redux
mail (= 2.7.1) mail (= 2.7.1)
marginalia (~> 1.9.0) marginalia (~> 1.10.0)
memory_profiler (~> 0.9) memory_profiler (~> 0.9)
method_source (~> 1.0) method_source (~> 1.0)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.2)
mini_magick (~> 4.10.1) mini_magick (~> 4.10.1)
minitest (~> 5.11.0) minitest (~> 5.11.0)
multi_json (~> 1.14.1) multi_json (~> 1.14.1)
nakayoshi_fork (~> 0.0.4) net-ldap (~> 0.16.3)
net-ldap
net-ntp net-ntp
net-ssh (~> 6.0) net-ssh (~> 6.0)
nokogiri (~> 1.10.9) nokogiri (~> 1.11.1)
oauth2 (~> 1.4) oauth2 (~> 1.4)
octokit (~> 4.15) octokit (~> 4.15)
oj (~> 3.10.6) oj (~> 3.10.6)
@ -1451,11 +1454,14 @@ DEPENDENCIES
parallel (~> 1.19) parallel (~> 1.19)
peek (~> 1.1) peek (~> 1.1)
pg (~> 1.1) pg (~> 1.1)
pg_query (~> 1.3.0)
png_quantizator (~> 0.2.1) png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3) premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.12.0) prometheus-client-mmap (~> 0.12.0)
pry-byebug (~> 3.9.0)
pry-rails (~> 0.3.9) pry-rails (~> 0.3.9)
pry-remote
puma (~> 5.1.1)
puma_worker_killer (~> 0.3.1)
rack (~> 2.2.3) rack (~> 2.2.3)
rack-attack (~> 6.3.0) rack-attack (~> 6.3.0)
rack-cors (~> 1.0.6) rack-cors (~> 1.0.6)
@ -1481,7 +1487,7 @@ DEPENDENCIES
rouge (~> 3.26.0) rouge (~> 3.26.0)
rqrcode-rails3 (~> 0.1.7) rqrcode-rails3 (~> 0.1.7)
rspec-parameterized rspec-parameterized
rspec-rails (~> 4.0.0) rspec-rails (~> 4.0.1)
rspec-retry (~> 0.6.1) rspec-retry (~> 0.6.1)
rspec_junit_formatter rspec_junit_formatter
rspec_profiling (~> 0.0.6) rspec_profiling (~> 0.0.6)
@ -1511,7 +1517,7 @@ DEPENDENCIES
sprockets (~> 3.7.0) sprockets (~> 3.7.0)
sshkey (~> 2.0) sshkey (~> 2.0)
stackprof (~> 0.2.15) stackprof (~> 0.2.15)
state_machines-activerecord (~> 0.6.0) state_machines-activerecord (~> 0.8.0)
sys-filesystem (~> 1.1.6) sys-filesystem (~> 1.1.6)
terser (= 1.0.2) terser (= 1.0.2)
test-prof (~> 0.12.0) test-prof (~> 0.12.0)
@ -1530,6 +1536,7 @@ DEPENDENCIES
vmstat (~> 2.3.0) vmstat (~> 2.3.0)
webauthn (~> 2.3) webauthn (~> 2.3)
webmock (~> 3.9.1) webmock (~> 3.9.1)
webrick (~> 1.6.1)
wikicloth (= 0.8.1) wikicloth (= 0.8.1)
yajl-ruby (~> 1.4.1) yajl-ruby (~> 1.4.1)

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

File diff suppressed because it is too large Load Diff

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

@ -778,19 +778,27 @@
}; };
} }
{ {
name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-5.0.0.tgz"; url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-6.0.0.tgz";
sha1 = "502eb2bccb55d65d6310ce9ef2da76035b6fc319"; sha1 = "deb18f63808af1cb1cc117a92558f07edb1e2256";
}; };
} }
{ {
name = "_gitlab_svgs___svgs_1.177.0.tgz"; name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "_gitlab_svgs___svgs_1.177.0.tgz"; name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz"; url = "https://registry.yarnpkg.com/@gitlab/favicon-overlay/-/favicon-overlay-2.0.0.tgz";
sha1 = "e481ed327a11d3834c8b1668d7485b9eefef97f5"; sha1 = "2f32d0b6a4d5b8ac44e2927083d9ab478a78c984";
};
}
{
name = "_gitlab_svgs___svgs_1.178.0.tgz";
path = fetchurl {
name = "_gitlab_svgs___svgs_1.178.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.178.0.tgz";
sha1 = "069edb8abb4c7137d48f527592476655f066538b";
}; };
} }
{ {
@ -802,11 +810,11 @@
}; };
} }
{ {
name = "_gitlab_ui___ui_24.8.1.tgz"; name = "_gitlab_ui___ui_25.11.3.tgz";
path = fetchurl { path = fetchurl {
name = "_gitlab_ui___ui_24.8.1.tgz"; name = "_gitlab_ui___ui_25.11.3.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.8.1.tgz"; url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-25.11.3.tgz";
sha1 = "eb674d19aedf9c91b9a14aa7a66397d54b199fb7"; sha1 = "54719d1276f417e66904f9f951671633f1647006";
}; };
} }
{ {
@ -970,19 +978,19 @@
}; };
} }
{ {
name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; name = "_rails_actioncable___actioncable_6.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; name = "_rails_actioncable___actioncable_6.1.0.tgz";
url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-3.tgz"; url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.0.tgz";
sha1 = "fb1a46d3d353512764d5fa3cea2f492391601b7a"; sha1 = "f336f25450b1bc43b99bc60557a70b6e6bb1d3d2";
}; };
} }
{ {
name = "_rails_ujs___ujs_6.0.3_2.tgz"; name = "_rails_ujs___ujs_6.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "_rails_ujs___ujs_6.0.3_2.tgz"; name = "_rails_ujs___ujs_6.1.0.tgz";
url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3-2.tgz"; url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.0.tgz";
sha1 = "e14c1f29086858215ce7ccd9ad6d8888c458b4a3"; sha1 = "9a48df6511cb2b472c9f596c1f37dc0af022e751";
}; };
} }
{ {
@ -1178,11 +1186,11 @@
}; };
} }
{ {
name = "_types_json_schema___json_schema_7.0.4.tgz"; name = "_types_json_schema___json_schema_7.0.6.tgz";
path = fetchurl { path = fetchurl {
name = "_types_json_schema___json_schema_7.0.4.tgz"; name = "_types_json_schema___json_schema_7.0.6.tgz";
url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz";
sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; sha1 = "f4c7ec43e81b319a9815115031709f26987891f0";
}; };
} }
{ {
@ -1314,11 +1322,11 @@
}; };
} }
{ {
name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; name = "_vue_test_utils___test_utils_1.1.2.tgz";
path = fetchurl { path = fetchurl {
name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; name = "_vue_test_utils___test_utils_1.1.2.tgz";
url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.30.tgz"; url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.2.tgz";
sha1 = "d5f26d1e2411fdb7fa7fdedb61b4b4ea4194c49d"; sha1 = "fdb487448dceefeaf3d01d465f7c836a3d666dbc";
}; };
} }
{ {
@ -1538,11 +1546,11 @@
}; };
} }
{ {
name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
path = fetchurl { path = fetchurl {
name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz";
sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b";
}; };
} }
{ {
@ -1610,19 +1618,19 @@
}; };
} }
{ {
name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; name = "ajv_keywords___ajv_keywords_3.5.2.tgz";
path = fetchurl { path = fetchurl {
name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; name = "ajv_keywords___ajv_keywords_3.5.2.tgz";
url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz";
sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d";
}; };
} }
{ {
name = "ajv___ajv_6.12.5.tgz"; name = "ajv___ajv_6.12.6.tgz";
path = fetchurl { path = fetchurl {
name = "ajv___ajv_6.12.5.tgz"; name = "ajv___ajv_6.12.6.tgz";
url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz";
sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4";
}; };
} }
{ {
@ -4402,11 +4410,11 @@
}; };
} }
{ {
name = "dompurify___dompurify_2.2.4.tgz"; name = "dompurify___dompurify_2.2.6.tgz";
path = fetchurl { path = fetchurl {
name = "dompurify___dompurify_2.2.4.tgz"; name = "dompurify___dompurify_2.2.6.tgz";
url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz"; url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz";
sha1 = "a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410"; sha1 = "54945dc5c0b45ce5ae228705777e8e59d7b2edc4";
}; };
} }
{ {
@ -4874,11 +4882,11 @@
}; };
} }
{ {
name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz";
path = fetchurl { path = fetchurl {
name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz";
sha1 = "27fecd9a3a24789b0f111ecdd540a9e56198e0fe"; sha1 = "2526ef0c010c218824a89423dbe6ddbe76f04fd6";
}; };
} }
{ {
@ -4914,11 +4922,11 @@
}; };
} }
{ {
name = "eslint_utils___eslint_utils_2.0.0.tgz"; name = "eslint_utils___eslint_utils_2.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "eslint_utils___eslint_utils_2.0.0.tgz"; name = "eslint_utils___eslint_utils_2.1.0.tgz";
url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz";
sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; sha1 = "d2de5e03424e707dc10c74068ddedae708741b27";
}; };
} }
{ {
@ -4938,11 +4946,11 @@
}; };
} }
{ {
name = "espree___espree_6.1.2.tgz"; name = "espree___espree_6.2.1.tgz";
path = fetchurl { path = fetchurl {
name = "espree___espree_6.1.2.tgz"; name = "espree___espree_6.2.1.tgz";
url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz";
sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a";
}; };
} }
{ {
@ -5225,6 +5233,14 @@
sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
}; };
} }
{
name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz";
path = fetchurl {
name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz";
url = "https://registry.yarnpkg.com/fast-mersenne-twister/-/fast-mersenne-twister-1.0.2.tgz";
sha1 = "5ead7caf3ace592a5789d11767732bd81cbaaa56";
};
}
{ {
name = "fault___fault_1.0.2.tgz"; name = "fault___fault_1.0.2.tgz";
path = fetchurl { path = fetchurl {
@ -7874,11 +7890,11 @@
}; };
} }
{ {
name = "katex___katex_0.10.0.tgz"; name = "katex___katex_0.10.2.tgz";
path = fetchurl { path = fetchurl {
name = "katex___katex_0.10.0.tgz"; name = "katex___katex_0.10.2.tgz";
url = "https://registry.yarnpkg.com/katex/-/katex-0.10.0.tgz"; url = "https://registry.yarnpkg.com/katex/-/katex-0.10.2.tgz";
sha1 = "da562e5d0d5cc3aa602e27af8a9b8710bfbce765"; sha1 = "39973edbb65eda5b6f9e7f41648781e557dd4932";
}; };
} }
{ {
@ -8081,6 +8097,14 @@
sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613";
}; };
} }
{
name = "loader_utils___loader_utils_2.0.0.tgz";
path = fetchurl {
name = "loader_utils___loader_utils_2.0.0.tgz";
url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz";
sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0";
};
}
{ {
name = "locate_path___locate_path_2.0.0.tgz"; name = "locate_path___locate_path_2.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -8593,6 +8617,14 @@
sha1 = "5d47f709c4c9fc3c216b6d46127280f40b39d790"; sha1 = "5d47f709c4c9fc3c216b6d46127280f40b39d790";
}; };
} }
{
name = "mathjax___mathjax_3.1.2.tgz";
path = fetchurl {
name = "mathjax___mathjax_3.1.2.tgz";
url = "https://registry.yarnpkg.com/mathjax/-/mathjax-3.1.2.tgz";
sha1 = "95c0d45ce2330ef7b6a815cebe7d61ecc26bbabd";
};
}
{ {
name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz";
path = fetchurl { path = fetchurl {
@ -8721,14 +8753,6 @@
sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8"; sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8";
}; };
} }
{
name = "mersenne_twister___mersenne_twister_1.1.0.tgz";
path = fetchurl {
name = "mersenne_twister___mersenne_twister_1.1.0.tgz";
url = "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz";
sha1 = "f916618ee43d7179efcf641bec4531eb9670978a";
};
}
{ {
name = "methods___methods_1.1.2.tgz"; name = "methods___methods_1.1.2.tgz";
path = fetchurl { path = fetchurl {
@ -10265,14 +10289,6 @@
sha1 = "a3b4160516007075d29127262f3a0063d19896e9"; sha1 = "a3b4160516007075d29127262f3a0063d19896e9";
}; };
} }
{
name = "prettier___prettier_1.18.2.tgz";
path = fetchurl {
name = "prettier___prettier_1.18.2.tgz";
url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz";
sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea";
};
}
{ {
name = "prettier___prettier_2.0.5.tgz"; name = "prettier___prettier_2.0.5.tgz";
path = fetchurl { path = fetchurl {
@ -10281,6 +10297,22 @@
sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4";
}; };
} }
{
name = "prettier___prettier_2.2.1.tgz";
path = fetchurl {
name = "prettier___prettier_2.2.1.tgz";
url = "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz";
sha1 = "795a1a78dd52f073da0cd42b21f9c91381923ff5";
};
}
{
name = "prettier___prettier_1.18.2.tgz";
path = fetchurl {
name = "prettier___prettier_1.18.2.tgz";
url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz";
sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea";
};
}
{ {
name = "pretty_format___pretty_format_25.5.0.tgz"; name = "pretty_format___pretty_format_25.5.0.tgz";
path = fetchurl { path = fetchurl {
@ -11338,11 +11370,11 @@
}; };
} }
{ {
name = "schema_utils___schema_utils_2.6.4.tgz"; name = "schema_utils___schema_utils_2.7.1.tgz";
path = fetchurl { path = fetchurl {
name = "schema_utils___schema_utils_2.6.4.tgz"; name = "schema_utils___schema_utils_2.7.1.tgz";
url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz"; url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz";
sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"; sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7";
}; };
} }
{ {
@ -12202,11 +12234,11 @@
}; };
} }
{ {
name = "style_loader___style_loader_1.1.3.tgz"; name = "style_loader___style_loader_1.3.0.tgz";
path = fetchurl { path = fetchurl {
name = "style_loader___style_loader_1.1.3.tgz"; name = "style_loader___style_loader_1.3.0.tgz";
url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz"; url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz";
sha1 = "9e826e69c683c4d9bf9db924f85e9abb30d5e200"; sha1 = "828b4a3b3b7e7aa5847ce7bae9e874512114249e";
}; };
} }
{ {
@ -13442,11 +13474,11 @@
}; };
} }
{ {
name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz";
path = fetchurl { path = fetchurl {
name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz";
url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz"; url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz";
sha1 = "a4ed2669f87179dedd06afdd8736acbb3a3864d6"; sha1 = "894085839d99d81296fa081d19643733f23d7559";
}; };
} }
{ {
@ -13474,11 +13506,11 @@
}; };
} }
{ {
name = "vue_loader___vue_loader_15.9.5.tgz"; name = "vue_loader___vue_loader_15.9.6.tgz";
path = fetchurl { path = fetchurl {
name = "vue_loader___vue_loader_15.9.5.tgz"; name = "vue_loader___vue_loader_15.9.6.tgz";
url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz"; url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz";
sha1 = "7a960dc420a3439deaacdda038fdcdbf7c432706"; sha1 = "f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b";
}; };
} }
{ {

4
pkgs/applications/video/filebot/default.nix
View File

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "filebot"; pname = "filebot";
version = "4.9.2"; version = "4.9.3";
src = fetchurl { src = fetchurl {
url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
sha256 = "0hcyam8l0fzc9fnp1dpawk0s3rwhfph78w99y7zlcv5l4l4h04lz"; sha256 = "sha256-R1FnHgSziJ7eGL8GrUmheVZxOnUgn9TK6gObSSKe9j0=";
}; };
unpackPhase = "tar xvf $src"; unpackPhase = "tar xvf $src";

2
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -2,7 +2,7 @@
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
, alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch , alsaLib, curl, libvpx, nettools, dbus, substituteAll
# If open-watcom-bin is not passed, VirtualBox will fall back to use # If open-watcom-bin is not passed, VirtualBox will fall back to use
# the shipped alternative sources (assembly). # the shipped alternative sources (assembly).
, open-watcom-bin ? null , open-watcom-bin ? null

1
pkgs/build-support/docker/default.nix
View File

@ -770,6 +770,7 @@ rec {
mkdir $out mkdir $out
tar \ tar \
--sort name \
--owner 0 --group 0 --mtime "@$SOURCE_DATE_EPOCH" \ --owner 0 --group 0 --mtime "@$SOURCE_DATE_EPOCH" \
--hard-dereference \ --hard-dereference \
-C old_out \ -C old_out \

2
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -105,7 +105,7 @@ fi
init_remote(){ init_remote(){
local url=$1 local url=$1
clean_git init clean_git init --initial-branch=master
clean_git remote add origin "$url" clean_git remote add origin "$url"
( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true ( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true
} }

2
pkgs/data/fonts/iosevka/bin.nix
View File

@ -10,7 +10,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "${name}-bin"; pname = "${name}-bin";
version = "4.5.0"; version = "5.0.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

44
pkgs/data/fonts/iosevka/variants.nix
View File

@ -1,24 +1,26 @@
# This file was autogenerated. DO NOT EDIT! # This file was autogenerated. DO NOT EDIT!
{ {
iosevka = "1ic5w8w4v27vfq7pvx9wv2zdcsj16xi71ln2a3fb4kh93zj84kl8"; iosevka = "069qy5mnrp61da7b5yy79s9d0s3cwn5mqkqkysv8lccr91qnjgdc";
iosevka-aile = "1qv2b4zcz172knvr39argqshjpin1lidlafilfcm569cp8rasrdd"; iosevka-aile = "1b9zh017wdxlk9dlick6qwx8f2vqsrsaq5yjr79iinirc417ri67";
iosevka-curly = "0x9pdgyiab8hibyf1yrwn6cr90aqy9ygyk1zz9nqzcndk5mk54p4"; iosevka-curly = "155faw2nlczp3ic2y9ck2vm21rfa1zaiswc0mfgmd3b2r6wimjrj";
iosevka-curly-slab = "0mxnbf9dwq3iq5dc0cgrdqf2dlyymylv46psb83n5kra4rz1wxnb"; iosevka-curly-slab = "1axzan1p9slfskg8nshz4hrmw24vmbcsxf7kpz70xjs98w7wh6lh";
iosevka-etoile = "1rz9dkpiwwfjnhiajfxg3rrnf4lyxnynx89qswg0b8wql4q6bz71"; iosevka-etoile = "00w4r660qaydygqvfv03i77h1q6wk8xbvrvh4wsnifl7li4xax4w";
iosevka-slab = "17p0cf4k8k3kabqp0b1anqqj8phfw7nnxiiscnngbrxhdvhpp62n"; iosevka-slab = "0a7ndr3c0sldn902d9c50l63xrvranclsvwnj4py2m6w32s8i9nx";
iosevka-sparkle = "0ip46lcq7gcv77ar6vqz51lhf448fd0nviijfpqfg7gdywdzalm0"; iosevka-ss01 = "0q5bh511z6qdvagk831sb1nrp9gawsjv904106clkqwak3k55v54";
iosevka-ss01 = "1v1z2rx7r6nb45i3qcb9pvilm6yxxkl5ks7ldmm902cx67pkv7rj"; iosevka-ss02 = "1qk250yydi3ff5z3s1099xrdzpwg62lr39wxl9539a2rl0awdw3w";
iosevka-ss02 = "1pd4sbr1p1cf9917nnn22v1kah8jfgm9jpfvq1j51wyr8lnxqz2k"; iosevka-ss03 = "02rblgk9j0bz7pyag3a8p4by76zj0z4gg8iignfff7j3yfszgfhp";
iosevka-ss03 = "0pdbvrzilrxxcaz9gnhnqxvk4ipfxcgys41sasl3znxzij1ary8s"; iosevka-ss04 = "0z9aj5ll5mdgfm8brgwhwabbq31ws8qqzdyyf9s8mq30l0js2wd6";
iosevka-ss04 = "08xwdp5s3dp30qy81j3qwhhqk1bibcpnh2i00a3kyw3g6jsnsvmp"; iosevka-ss05 = "00sclgj25vp3frk1wvlwb83z33xy45171m76jr5x9jspq5nr02fa";
iosevka-ss05 = "1njf1ysd42k2rc2lvg5ilq6q2wvg8dlm04d7wygdamw0yx6sia83"; iosevka-ss06 = "1r9da69k47kiag7ba47panyj5sxgz6icpynbrnz7d7kvqwal842k";
iosevka-ss06 = "04g4m770i1b75gl1lanbs0ibmjj8vg5yfwyn6n0bidfn30z4n01l"; iosevka-ss07 = "0lvdzfha27158bs5p3njyw6gnrm53mpdacaln1bh37mwd967b689";
iosevka-ss07 = "07f1n44f5bvifbns6572ys6zihac6yljv7frm58w7xgyl0a3prvg"; iosevka-ss08 = "1l60yz475m780k6ds5h4n36p82av8ag28l1yr8z8gl7yznf2sf7b";
iosevka-ss08 = "157cq5jfxvr0n7ksqln5mjmr800dbyfy8vwl0ngbf0aiq3mw2x8f"; iosevka-ss09 = "058ln47yv5015c4xnhmyglvdqndbdp0v8n5w73cd73nzfb4y035j";
iosevka-ss09 = "0yib3mhb48g2vjiaviwgcl6lad4dbwwblnmv4zi880bdvz7jrwr9"; iosevka-ss10 = "0966wrbamjkyrjkirv2jzw86yr9l3d5vnb0azi93y0amcrkksmrw";
iosevka-ss10 = "06s0s9x1fiqqmnkm42khasws40db7l68d2ycsm38mx6b62nlsbkr"; iosevka-ss11 = "0y3nhjn38jvcf4ngwgir5hg4vx9fsrfxzlshmynlf7bb6krvfnaq";
iosevka-ss11 = "0yzy322zqas0id70i1p92x7fbim8gai0a61nf6bf33aq3qgsj2w8"; iosevka-ss12 = "09hccisb2lrakjh7fnk43znixly7qbqclmsvhp9mlbpjvlzzq03j";
iosevka-ss12 = "0lhmhwd4z44y4469av6na7k5w4ra47g98dxfi0mb42a4n4sq0k5j"; iosevka-ss13 = "117712kys0fihadpzrwqm3z25z390qjnhligr5k0wx8h0la9nwq3";
iosevka-ss13 = "1cq91iqfgq4fsazi2pjh6l4n9mgci4aayqp7fiy8lydv7f1ym0z9"; iosevka-ss14 = "0iy4m64jnsi2b74hcmwxk0qabzgza08v9s56blg4i9mfmp8xvzlp";
iosevka-ss14 = "0xid48yr2qfsh6kvlajlaqnb43ck351kg8r3bwpvzrdbvl809983"; iosevka-ss15 = "0mdqfal48sfq5n3a88cgsaddcc07qwqynr662zqqpjqy98kvaz62";
iosevka-ss16 = "0dkv3mzhl9vl7x9x0g6hc7j1mp9mnnyx7iamkvm8wcqjhwnvy0r6";
iosevka-ss17 = "1adb1z468wfa1b707kr0ycv5d5nxpmcx44q0dizik5zyx26aq10p";
} }

2
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus { lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus
, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala
, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 , desktop-file-utils, itstool, wrapGAppsHook, pcre2
, libxslt, docbook-xsl-nons }: , libxslt, docbook-xsl-nons }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

1
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
View File

@ -15,7 +15,6 @@
, gnome3 , gnome3
, gjs , gjs
, nixosTests , nixosTests
, gsettings-desktop-schemas
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

25
pkgs/development/compilers/crystal/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, lib , lib
# Dependencies # Dependencies
, boehmgc , boehmgc
, coreutils , coreutils
, git , git
@ -32,7 +32,6 @@
# #
# We need to keep around at least the latest version released with a stable # We need to keep around at least the latest version released with a stable
# NixOS # NixOS
let let
archs = { archs = {
x86_64-linux = "linux-x86_64"; x86_64-linux = "linux-x86_64";
@ -61,7 +60,14 @@ let
}; };
commonBuildInputs = extraBuildInputs: [ commonBuildInputs = extraBuildInputs: [
boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl boehmgc
libatomic_ops
pcre
libevent
libyaml
zlib
libxml2
openssl
] ++ extraBuildInputs ] ++ extraBuildInputs
++ lib.optionals stdenv.isDarwin [ libiconv ]; ++ lib.optionals stdenv.isDarwin [ libiconv ];
@ -70,8 +76,8 @@ let
, sha256 , sha256
, binary , binary
, doCheck ? true , doCheck ? true
, extraBuildInputs ? [] , extraBuildInputs ? [ ]
, buildFlags ? ["all" "docs"] , buildFlags ? [ "all" "docs" ]
}: }:
lib.fix (compiler: stdenv.mkDerivation { lib.fix (compiler: stdenv.mkDerivation {
pname = "crystal"; pname = "crystal";
@ -212,7 +218,8 @@ let
}) })
); );
in rec { in
rec {
binaryCrystal_0_31 = genericBinary { binaryCrystal_0_31 = genericBinary {
version = "0.31.1"; version = "0.31.1";
sha256s = { sha256s = {
@ -256,12 +263,12 @@ in rec {
}; };
crystal_0_36 = generic { crystal_0_36 = generic {
version = "0.36.0"; version = "0.36.1";
sha256 = "0s7g13mrh2jrxxrrrg4hy3gi49rp7fmpn9zg9kj4nbc8w8yir20r"; sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk=";
binary = crystal_0_35; binary = crystal_0_35;
}; };
crystal = crystal_0_36; crystal = crystal_0_36;
crystal2nix = callPackage ./crystal2nix.nix {}; crystal2nix = callPackage ./crystal2nix.nix { };
} }

12
pkgs/development/coq-modules/coq-elpi/default.nix
View File

@ -1,19 +1,23 @@
{ lib, mkCoqDerivation, which, coq, version ? null }: { lib, mkCoqDerivation, which, coq, version ? null }:
with builtins; with lib; let with builtins; with lib; let
elpi = coq.ocamlPackages.elpi.override ( elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [
optionalAttrs (coq.coq-version == "8.11") { version = "1.11.4"; } { case = "8.11"; out = { version = "1.11.4"; };}
); { case = "8.12"; out = { version = "1.12.0"; };}
{ case = "8.13"; out = { version = "1.13.0"; };}
] {});
in mkCoqDerivation { in mkCoqDerivation {
pname = "elpi"; pname = "elpi";
repo = "coq-elpi"; repo = "coq-elpi";
owner = "LPCIC"; owner = "LPCIC";
inherit version; inherit version;
defaultVersion = lib.switch coq.coq-version [ defaultVersion = lib.switch coq.coq-version [
{ case = "8.13"; out = "1.8.1"; } { case = "8.13"; out = "1.9.3"; }
{ case = "8.12"; out = "1.8.0"; } { case = "8.12"; out = "1.8.0"; }
{ case = "8.11"; out = "1.6.0_8.11"; } { case = "8.11"; out = "1.6.0_8.11"; }
] null; ] null;
release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z";
release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07";
release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1"; release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1";
release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8"; release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8";

2
pkgs/development/coq-modules/hierarchy-builder/default.nix
View File

@ -12,6 +12,8 @@ with lib; mkCoqDerivation {
release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
releaseRev = v: "v${v}"; releaseRev = v: "v${v}";
nativeBuildInputs = [ which ];
propagatedBuildInputs = [ coq-elpi ]; propagatedBuildInputs = [ coq-elpi ];
extraInstallFlags = [ "VFILES=structures.v" ]; extraInstallFlags = [ "VFILES=structures.v" ];

5
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View File

@ -45,7 +45,7 @@ self: super: {
# Take the 3.4.x release candidate. # Take the 3.4.x release candidate.
cabal-install = assert super.cabal-install.version == "3.2.0.0"; cabal-install = assert super.cabal-install.version == "3.2.0.0";
overrideCabal super.cabal-install (drv: { overrideCabal (doJailbreak super.cabal-install) (drv: {
postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot"; postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot";
version = "cabal-install-3.4.0.0-rc4"; version = "cabal-install-3.4.0.0-rc4";
editedCabalFile = null; editedCabalFile = null;
@ -54,6 +54,7 @@ self: super: {
rev = "cabal-install-3.4.0.0-rc4"; rev = "cabal-install-3.4.0.0-rc4";
sha256 = "049hllk1d8jid9yg70hmcsdgb0n7hm24p39vavllaahfb0qfimrk"; sha256 = "049hllk1d8jid9yg70hmcsdgb0n7hm24p39vavllaahfb0qfimrk";
}; };
executableHaskellDepends = drv.executableHaskellDepends ++ [ self.regex-base self.regex-posix ];
}); });
# Jailbreaks & Version Updates # Jailbreaks & Version Updates
@ -62,8 +63,10 @@ self: super: {
data-fix = doJailbreak super.data-fix; data-fix = doJailbreak super.data-fix;
dec = doJailbreak super.dec; dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519; ed25519 = doJailbreak super.ed25519;
hackage-security = doJailbreak super.hackage-security;
hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }); hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; });
hashable-time = doJailbreak super.hashable-time; hashable-time = doJailbreak super.hashable-time;
HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; });
integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
lukko = doJailbreak super.lukko; lukko = doJailbreak super.lukko;
parallel = doJailbreak super.parallel; parallel = doJailbreak super.parallel;

10
pkgs/development/libraries/g2o/default.nix
View File

@ -1,15 +1,15 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, libGLU { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas
, qtbase, libqglviewer, makeWrapper }: , lapack, libGLU, qtbase, libqglviewer, makeWrapper }:
mkDerivation rec { mkDerivation rec {
pname = "g2o"; pname = "g2o";
version = "20200410"; version = "20201223";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RainerKuemmerle"; owner = "RainerKuemmerle";
repo = pname; repo = pname;
rev = "${version}_git"; rev = "${version}_git";
sha256 = "11rgj2g9mmwajlr69pjkjvxjyn88afa0r4bchjyvmxswjccizlg2"; sha256 = "sha256-Ik6uBz4Z4rc5+mPNdT8vlNZSBom4Tvt8Y6myBC/s0m8=";
}; };
# Removes a reference to gcc that is only used in a debug message # Removes a reference to gcc that is only used in a debug message
@ -18,7 +18,7 @@ mkDerivation rec {
separateDebugInfo = true; separateDebugInfo = true;
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ eigen suitesparse libGLU qtbase libqglviewer ]; buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ];
# Silence noisy warning # Silence noisy warning
CXXFLAGS = "-Wno-deprecated-copy"; CXXFLAGS = "-Wno-deprecated-copy";

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

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libcint"; pname = "libcint";
version = "4.0.7"; version = "4.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sunqm"; owner = "sunqm";
repo = "libcint"; repo = "libcint";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/S5LcaIIAXq9QiH8wGPSw8KpWC3afX9HqiHrWHmGQ6s="; sha256 = "sha256-ZDPDJXvSAqCkhxUSzlcWBAMrCI6mjA8rXxX65Cw5nYI=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

24
pkgs/development/libraries/libetpan/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub { stdenv, lib, fetchFromGitHub, fetchpatch
, autoconf, automake, libtool, openssl, pkg-config , autoconf, automake, libtool, openssl, pkg-config
}: }:
@ -13,6 +13,28 @@ stdenv.mkDerivation rec {
sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"; sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn";
}; };
patches = [
# The following two patches are fixing CVE-2020-15953, as reported in the
# issue tracker: https://github.com/dinhvh/libetpan/issues/386
# They might be removed for the next version bump.
# CVE-2020-15953: Detect extra data after STARTTLS response and exit
# https://github.com/dinhvh/libetpan/pull/387
(fetchpatch {
name = "cve-2020-15953-imap.patch";
url = "https://github.com/dinhvh/libetpan/commit/1002a0121a8f5a9aee25357769807f2c519fa50b.patch";
sha256 = "1h9ds2z4jii40a0i3z6hsnzx1ldmd2jqidsxp2y2ksyp1ijcgabn";
})
# CVE-2020-15953: Detect extra data after STARTTLS responses in SMTP and POP3 and exit
# https://github.com/dinhvh/libetpan/pull/388
(fetchpatch {
name = "cve-2020-15953-pop3-smtp.patch";
url = "https://github.com/dinhvh/libetpan/commit/298460a2adaabd2f28f417a0f106cb3b68d27df9.patch";
sha256 = "0lq829djar7nb3fai3vdzirmks3w2lfagzqc809lx2lln6y213a0";
})
];
nativeBuildInputs = [ autoconf automake libtool pkg-config ]; nativeBuildInputs = [ autoconf automake libtool pkg-config ];
buildInputs = [ openssl ]; buildInputs = [ openssl ];

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

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Userspace library for the Linux Restartable Sequence API"; description = "Userspace library for the Linux Restartable Sequence API";
homepage = "https://github.com/compudj/librseq"; homepage = "https://github.com/compudj/librseq";
license = licenses.lgpl21; license = licenses.lgpl21Only;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ]; maintainers = with maintainers; [ thoughtpolice ];
}; };

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

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oatpp"; pname = "oatpp";
version = "1.2.0"; version = "1.2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oatpp"; owner = "oatpp";
repo = "oatpp"; repo = "oatpp";
rev = version; rev = version;
sha256 = "05rm0m5zf1b5ky8prf6yni2074bz6yjjbrc2qk96fb48fc1198gw"; sha256 = "sha256-Vtdz03scx0hvY1yeM7yfSxCVKzi84OQ1Oh9b922movE=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

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

@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oneDNN"; pname = "oneDNN";
version = "2.0"; version = "2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oneapi-src"; owner = "oneapi-src";
repo = "oneDNN"; repo = "oneDNN";
rev = "v${version}"; rev = "v${version}";
sha256 = "0r50r9bz7mdhy9z9zdy5m2nhi8r6kqsn70q2rfwylm1vppmhwkfq"; sha256 = "sha256-PZ8r1eNfz4dVxlbtQJSrxiw/Hk6E6wSDapkMy7ux9fI=";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];

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

@ -21,13 +21,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tiledb"; pname = "tiledb";
version = "2.2.3"; version = "2.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TileDB-Inc"; owner = "TileDB-Inc";
repo = "TileDB"; repo = "TileDB";
rev = version; rev = version;
sha256 = "sha256-QYJ5dJQyVy0GLVKRcwb2WBK4IE1q/jXl1OQGau0HBSg="; sha256 = "sha256-xzzWB20vhnneiqJqZAeSUjZouqhPPg2bGaot1IQDMEo=";
}; };
# (bundled) blosc headers have a warning on some archs that it will be using # (bundled) blosc headers have a warning on some archs that it will be using

3
pkgs/development/node-packages/node-packages.json
View File

@ -88,6 +88,7 @@
, "flood" , "flood"
, "forever" , "forever"
, "fx" , "fx"
, "ganache-cli"
, "get-graphql-schema" , "get-graphql-schema"
, "git-run" , "git-run"
, "git-ssb" , "git-ssb"
@ -115,7 +116,7 @@
, "indium" , "indium"
, "insect" , "insect"
, "ionic" , "ionic"
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz"} , {"iosevka": "https://github.com/be5invis/Iosevka/archive/v5.0.2.tar.gz"}
, "jake" , "jake"
, "javascript-typescript-langserver" , "javascript-typescript-langserver"
, "joplin" , "joplin"

2051
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

3
pkgs/development/ocaml-modules/elpi/default.nix
View File

@ -1,10 +1,11 @@
{ stdenv, lib, fetchzip, buildDunePackage, camlp5 { stdenv, lib, fetchzip, buildDunePackage, camlp5
, ppxlib, ppx_deriving, re, perl, ncurses , ppxlib, ppx_deriving, re, perl, ncurses
, version ? "1.12.0" , version ? "1.13.0"
}: }:
with lib; with lib;
let fetched = import ../../../build-support/coq/meta-fetch/default.nix let fetched = import ../../../build-support/coq/meta-fetch/default.nix
{inherit lib stdenv fetchzip; } ({ {inherit lib stdenv fetchzip; } ({
release."1.13.0".sha256 = "0dmzy058m1mkndv90byjaik6lzzfk3aaac7v84mpmkv6my23bygr";
release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is";
release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5";
releaseRev = v: "v${v}"; releaseRev = v: "v${v}";

4
pkgs/development/php-packages/phpstan/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }: { mkDerivation, fetchurl, pkgs, lib, php }:
let let
pname = "phpstan"; pname = "phpstan";
version = "0.12.74"; version = "0.12.76";
in in
mkDerivation { mkDerivation {
inherit pname version; inherit pname version;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "sha256-zEDqswyldyXha836ye+FmE4yYxH+7AzEvlKJYOje0xQ="; sha256 = "sha256-UYQvzWAnbaD77yDXVTui+fQEwOfOFXKLf5Bt/81mQI4=";
}; };
phases = [ "installPhase" ]; phases = [ "installPhase" ];

3
pkgs/development/python-modules/Nikola/default.nix
View File

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, isPy3k , isPy3k
, fetchPypi , fetchPypi
@ -72,5 +73,7 @@ buildPythonPackage rec {
description = "A modular, fast, simple, static website and blog generator"; description = "A modular, fast, simple, static website and blog generator";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jluttine ]; maintainers = with lib.maintainers; [ jluttine ];
# all tests fail
broken = stdenv.isDarwin;
}; };
} }

4
pkgs/development/python-modules/PyRMVtransport/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "PyRMVtransport"; pname = "PyRMVtransport";
version = "0.2.10"; version = "0.3.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "cgtobi"; owner = "cgtobi";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "03qrylidb1d6zw6a22d1drdf73cvfxqcqaa8qi8x4pli1axcfh5w"; sha256 = "1y412xmdskf13673igzsqsglpdc3d5r6pbm8j85csax0blv7rn1m";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

52
pkgs/development/python-modules/aioasuswrt/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib
, asyncssh
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pytest-asyncio
, pytest-mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aioasuswrt";
version = "1.3.2";
src = fetchFromGitHub {
owner = "kennedyshead";
repo = pname;
rev = "V${version}";
sha256 = "0bzl11224vny4p9vhi1n5s9p04kfavdzs9xkq5qimbisz9sg4ysj";
};
patches = [
(fetchpatch {
# Remove pytest-runner, https://github.com/kennedyshead/aioasuswrt/pull/63
url = "https://github.com/kennedyshead/aioasuswrt/pull/63/commits/e7923927648d5d8daccac1716db86db2a45fcb34.patch";
sha256 = "09xzs3hjr3133li6b7lr58n090r00kaxi9hx1fms2zn0ai4xwp9d";
})
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "--cov-report html" "" \
--replace "--cov-report term-missing" ""
'';
propagatedBuildInputs = [ asyncssh ];
checkInputs = [
pytest-asyncio
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [ "aioasuswrt" ];
meta = with lib; {
description = "Python module for Asuswrt";
homepage = "https://github.com/kennedyshead/aioasuswrt";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/apache-airflow/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, alembic , alembic
@ -47,10 +46,7 @@
, tzlocal , tzlocal
, unicodecsv , unicodecsv
, zope_deprecation , zope_deprecation
, enum34
, typing
, nose , nose
, python
, pythonOlder , pythonOlder
, pythonAtLeast , pythonAtLeast
}: }:

4
pkgs/development/python-modules/cozy/default.nix
View File

@ -1,5 +1,5 @@
{ buildPythonPackage, isPy3k, fetchFromGitHub, lib, { buildPythonPackage, isPy3k, fetchFromGitHub, lib,
z3, ply, python-igraph, oset, ordered-set, dictionaries }: z3, ply, python-igraph, oset, ordered-set, dictionaries, setuptools }:
buildPythonPackage { buildPythonPackage {
pname = "cozy"; pname = "cozy";
@ -7,7 +7,7 @@ buildPythonPackage {
disabled = !isPy3k; disabled = !isPy3k;
propagatedBuildInputs = [ propagatedBuildInputs = [
z3 ply python-igraph oset ordered-set dictionaries setuptools z3 ply python-igraph oset ordered-set dictionaries
]; ];
src = fetchFromGitHub { src = fetchFromGitHub {

13
pkgs/development/python-modules/cvxpy/default.nix
View File

@ -4,40 +4,35 @@
, fetchPypi , fetchPypi
, cvxopt , cvxopt
, ecos , ecos
, multiprocess
, numpy , numpy
, osqp , osqp
, scipy , scipy
, scs , scs
, six
# Check inputs # Check inputs
, pytestCheckHook , pytestCheckHook
, nose
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cvxpy"; pname = "cvxpy";
version = "1.1.8"; version = "1.1.10";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "444068d4eda9ffcd43578895174489d4cef36b28ba7ae8a96ab9ef9571d2b4ff"; hash = "sha256-7NCouJ95nOolSSjeqHktnGnDfbC9gwtM2mKbKyvlInA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
cvxopt cvxopt
ecos ecos
multiprocess
numpy numpy
osqp osqp
scipy scipy
scs scs
six
]; ];
checkInputs = [ pytestCheckHook nose ]; checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "./cvxpy" ]; pytestFlagsArray = [ "./cvxpy" ];
# Disable the slowest benchmarking tests, cuts test time in half # Disable the slowest benchmarking tests, cuts test time in half
disabledTests = [ disabledTests = [
@ -46,7 +41,7 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
description = "A domain-specific language for modeling convex optimization problems in Python."; description = "A domain-specific language for modeling convex optimization problems in Python";
homepage = "https://www.cvxpy.org/"; homepage = "https://www.cvxpy.org/";
downloadPage = "https://github.com/cvxgrp/cvxpy/releases"; downloadPage = "https://github.com/cvxgrp/cvxpy/releases";
changelog = "https://github.com/cvxgrp/cvxpy/releases/tag/v${version}"; changelog = "https://github.com/cvxgrp/cvxpy/releases/tag/v${version}";

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

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, stdenv
, packaging
, importlib-resources
, dbus-next
}:
buildPythonPackage rec {
pname = "desktop-notifier";
version = "3.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-D8/amC6SwXkm8Ao8G2Vn9FNpbqyFJFBUVcngkW5g8k0=";
};
propagatedBuildInputs = [
packaging
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
] ++ lib.optionals stdenv.isLinux [
dbus-next
];
# no tests available, do the imports check instead
doCheck = false;
pythonImportsCheck = [ "desktop_notifier" ];
meta = with lib; {
homepage = "https://github.com/samschott/desktop-notifier";
description = "A Python library for cross-platform desktop notifications";
license = licenses.mit;
maintainers = with maintainers; [ sfrijters ];
};
}

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

@ -6,7 +6,6 @@
, six , six
# test dependencies # test dependencies
, coverage , coverage
, flake8
, mock , mock
, nose , nose
, pycodestyle , pycodestyle

4
pkgs/development/python-modules/flask-compress/default.nix
View File

@ -3,12 +3,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.8.0"; version = "1.9.0";
pname = "Flask-Compress"; pname = "Flask-Compress";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c132590e7c948877a96d675c13cbfa64edec0faafa2381678dea6f36aa49a552"; sha256 = "d93edd8fc02ae74b73c3df10a8e7ee26dee489c65dedce0b3a1d2ce05ac3d1be";
}; };
propagatedBuildInputs = [ flask brotli ]; propagatedBuildInputs = [ flask brotli ];

3
pkgs/development/python-modules/intake/default.nix
View File

@ -24,7 +24,6 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "intake"; pname = "intake";
version = "0.6.0"; version = "0.6.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
@ -73,7 +72,7 @@ buildPythonPackage rec {
"http" "http"
# broken test # broken test
"test_read_pattern_with" "test_read_pattern"
]; ];
meta = with lib; { meta = with lib; {

3
pkgs/development/python-modules/jupyterhub/default.nix
View File

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, pythonOlder , pythonOlder
, fetchPypi , fetchPypi
@ -155,5 +156,7 @@ buildPythonPackage rec {
homepage = "https://jupyter.org/"; homepage = "https://jupyter.org/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ ixxie cstrahan ]; maintainers = with maintainers; [ ixxie cstrahan ];
# E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found
broken = stdenv.isDarwin;
}; };
} }

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

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage, fetchPypi
, requests
}:
buildPythonPackage rec {
pname = "kivy-garden";
version = "0.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "0wkcpr2zc1q5jb0bi7v2dgc0vs5h1y7j42mviyh764j2i0kz8mn2";
};
propagatedBuildInputs = [ requests ];
pythonImportsCheck = [ "garden" ];
# There are no tests in the Pypi archive and building from source is not
# easily feasible because the build is done using buildozer and multiple
# repositories.
doCheck = false;
meta = with lib; {
description = "The kivy garden installation script, split into its own package for convenient use in buildozer.";
homepage = "https://pypi.python.org/pypi/kivy-garden";
license = licenses.mit;
maintainers = with maintainers; [ risson ];
};
}

68
pkgs/development/python-modules/kivy/default.nix Normal file
View File

@ -0,0 +1,68 @@
{ lib
, buildPythonPackage, fetchPypi
, pkg-config, cython, docutils
, kivy-garden
, mesa, mtdev, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, gst_all_1
, pillow, requests, pygments
}:
buildPythonPackage rec {
pname = "Kivy";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "1n0j9046vgjncy50v06r3wcg3q2l37jp8n0cznr64dz48kml8pnj";
};
nativeBuildInputs = [
pkg-config
cython
docutils
];
buildInputs = [
mesa
mtdev
SDL2
SDL2_image
SDL2_ttf
SDL2_mixer
# NOTE: The degree to which gstreamer actually works is unclear
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
];
propagatedBuildInputs = [
kivy-garden
pillow
pygments
requests
];
KIVY_NO_CONFIG = 1;
KIVY_NO_ARGS = 1;
KIVY_NO_FILELOG = 1;
postPatch = ''
substituteInPlace kivy/lib/mtdev.py \
--replace "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${mtdev}/lib/libmtdev.so.1')"
'';
/*
We cannot run tests as Kivy tries to import itself before being fully
installed.
*/
doCheck = false;
pythonImportsCheck = [ "kivy" ];
meta = with lib; {
description = "Library for rapid development of hardware-accelerated multitouch applications.";
homepage = "https://pypi.python.org/pypi/kivy";
license = licenses.mit;
maintainers = with maintainers; [ risson ];
};
}

4
pkgs/development/python-modules/labelbox/default.nix
View File

@ -14,11 +14,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "labelbox"; pname = "labelbox";
version = "2.4.9"; version = "2.4.10";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "488fb0b2233738c3bba3d3bf67b941f105553b7286cca3099ac0120dd247bd84"; sha256 = "b58604ee50c54a35994e54741d9071ecfebb6d6b9b2737604a95f29c4f23d6ec";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, pytestCheckHook
, pytest-xdist
}:
buildPythonPackage rec {
pname = "librouteros";
version = "3.1.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "luqasz";
repo = pname;
rev = version;
sha256 = "1skjwnqa3vcpq9gzgpw93wdmisq15fp0q07kzyq3fgx4yg7b6sql";
};
checkInputs = [
pytest-xdist
pytestCheckHook
];
disabledTests = [
# Disable tests which require QEMU to run
"test_login"
"test_long_word"
"test_query"
"test_add_then_remove"
"test_add_then_update"
"test_generator_ditch"
];
pythonImportsCheck = [ "librouteros" ];
meta = with lib; {
description = "Python implementation of the MikroTik RouterOS API";
homepage = "https://librouteros.readthedocs.io/";
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ fab ];
};
}

53
pkgs/development/python-modules/linode-api/default.nix
View File

@ -1,41 +1,38 @@
{ { lib
buildPythonPackage, , buildPythonPackage
fetchFromGitHub, , fetchFromGitHub
pythonOlder, , pythonOlder
lib, , requests
requests, , pytestCheckHook
future, , mock
enum34, }:
mock }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "linode-api"; pname = "linode-api";
version = "4.1.8b1"; # NOTE: this is a beta, and the API may change in future versions. version = "5.0.0";
disabled = pythonOlder "3.6";
disabled = (pythonOlder "2.7");
propagatedBuildInputs = [ requests future ]
++ lib.optionals (pythonOlder "3.4") [ enum34 ];
postPatch = (lib.optionalString (!pythonOlder "3.4") ''
sed -i -e '/"enum34",/d' setup.py
'');
doCheck = true;
checkInputs = [ mock ];
# Sources from Pypi exclude test fixtures # Sources from Pypi exclude test fixtures
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}";
owner = "linode"; owner = "linode";
repo = "python-linode-api"; repo = "python-linode-api";
sha256 = "0qfqn92fr876dncwbkf2vhm90hnf7lwpg80hzwyzyzwz1hcngvjg"; rev = version;
sha256 = "0lqi15vks4fxbki1l7n1bfzygjy3w17d9wchjxvp22ijmas44yai";
}; };
meta = { propagatedBuildInputs = [ requests ];
checkInputs = [
mock
pytestCheckHook
];
pythonImportsCheck = [ "linode_api4" ];
meta = with lib; {
description = "Python library for the Linode API v4";
homepage = "https://github.com/linode/python-linode-api"; homepage = "https://github.com/linode/python-linode-api";
description = "The official python library for the Linode API v4 in python."; license = licenses.bsd3;
license = lib.licenses.bsd3; maintainers = with maintainers; [ glenns ];
maintainers = with lib.maintainers; [ glenns ];
}; };
} }

13
pkgs/development/python-modules/maestral/default.nix
View File

@ -1,30 +1,29 @@
{ lib, stdenv { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
, python , python
, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog , alembic, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog
, importlib-metadata , importlib-metadata
, importlib-resources , importlib-resources
, dbus-next
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "maestral"; pname = "maestral";
version = "1.3.1"; version = "1.4.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SamSchott"; owner = "SamSchott";
repo = "maestral"; repo = "maestral";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SspyTdmAbbmWN3AqVp9bj/QfAKLVgU2bLiiHjZO0aCM="; sha256 = "sha256-ibAYuaPSty275/aQ0DibyWe2LjPoEpdWgElTnR+MEs8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
alembic alembic
bugsnag
click click
desktop-notifier
dropbox dropbox
fasteners fasteners
keyring keyring
@ -42,8 +41,6 @@ buildPythonPackage rec {
importlib-metadata importlib-metadata
] ++ lib.optionals (pythonOlder "3.9") [ ] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources importlib-resources
] ++ lib.optionals stdenv.isLinux [
dbus-next
]; ];
makeWrapperArgs = [ makeWrapperArgs = [

4
pkgs/development/python-modules/moinmoin/default.nix
View File

@ -4,14 +4,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "moinmoin"; pname = "moinmoin";
version = "1.9.10"; version = "1.9.11";
# SyntaxError in setup.py # SyntaxError in setup.py
disabled = isPy3k; disabled = isPy3k;
src = fetchurl { src = fetchurl {
url = "http://static.moinmo.in/files/moin-${version}.tar.gz"; url = "http://static.moinmo.in/files/moin-${version}.tar.gz";
sha256 = "0g05lnl1s8v61phi3z1g3b6lfj4g98grj9kw8nyjl246x0c489ja"; sha256 = "sha256-Ar4x1V851P4MYlPfi0ngG3bQlWNMvRtW0YX2bh4MPPU=";
}; };
patches = [ patches = [

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

@ -49,7 +49,7 @@ buildPythonPackage rec {
"test_filter_cmd_invalid_filter" "test_filter_cmd_invalid_filter"
"test_inline_merge" "test_inline_merge"
"test_interrogate_filter_no_repo" "test_interrogate_filter_no_repo"
"test_merge_input_strategy_inline_source_conflict" "test_merge"
]; ];
nativeBuildInputs = [ setuptools_scm ]; nativeBuildInputs = [ setuptools_scm ];

4
pkgs/development/python-modules/nbformat/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nbformat"; pname = "nbformat";
version = "5.0.8"; version = "5.1.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "f545b22138865bfbcc6b1ffe89ed5a2b8e2dc5d4fe876f2ca60d8e6f702a30f8"; sha256 = "sha256-HSI+ZKGL+nzfLbLpuoqBgxL8KgcB0ukQtY32aAk4WlY=";
}; };
LC_ALL="en_US.utf8"; LC_ALL="en_US.utf8";

4
pkgs/development/python-modules/papermill/default.nix
View File

@ -25,11 +25,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "papermill"; pname = "papermill";
version = "2.2.2"; version = "2.3.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1c452b1c5a9ab52b94c99d8b7705ae7173f6aa88a3d28a5d30cffba48a46f5b6"; sha256 = "sha256-ptwZXypS9b7Y1CkszqOa8PMzgyS+r9VikPlhbJUDNiM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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