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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-20 01:20:12 +00:00 committed by GitHub
commit b27f238893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
178 changed files with 771 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@ -47,9 +47,10 @@ indent_style = space
insert_final_newline = unset insert_final_newline = unset
trim_trailing_whitespace = unset trim_trailing_whitespace = unset
[*.{key,ovpn}] [*.{asc,key,ovpn}]
insert_final_newline = unset insert_final_newline = unset
end_of_line = unset end_of_line = unset
trim_trailing_whitespace = unset
[*.lock] [*.lock]
indent_size = unset indent_size = unset

8
maintainers/scripts/nixpkgs-lint.nix
View File

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, perl, perlPackages }: { stdenv, lib, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nixpkgs-lint-1"; name = "nixpkgs-lint-1";
@ -15,9 +15,9 @@ stdenv.mkDerivation {
wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB
''; '';
meta = { meta = with lib; {
maintainers = [ stdenv.lib.maintainers.eelco ]; maintainers = [ maintainers.eelco ];
description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors"; description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors";
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
}; };
} }

10
nixos/modules/config/gnu.nix
View File

@ -1,11 +1,9 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib;
{ {
options = { options = {
gnu = mkOption { gnu = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
When enabled, GNU software is chosen by default whenever a there is When enabled, GNU software is chosen by default whenever a there is
@ -15,7 +13,7 @@ with lib;
}; };
}; };
config = mkIf config.gnu { config = lib.mkIf config.gnu {
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs;
# TODO: Adjust `requiredPackages' from `system-path.nix'. # TODO: Adjust `requiredPackages' from `system-path.nix'.
@ -26,7 +24,7 @@ with lib;
nano zile nano zile
texinfo # for the stand-alone Info reader texinfo # for the stand-alone Info reader
] ]
++ stdenv.lib.optional (!stdenv.isAarch32) grub2; ++ lib.optional (!stdenv.isAarch32) grub2;
# GNU GRUB, where available. # GNU GRUB, where available.

6
nixos/modules/installer/tools/nixos-option/default.nix
View File

@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
src = ./.; src = ./.;
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ boost nix ]; buildInputs = [ boost nix ];
meta = { meta = with lib; {
license = stdenv.lib.licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ chkno ]; maintainers = with maintainers; [ chkno ];
}; };
} }

14
nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
View File

@ -19,18 +19,16 @@ nix-shell -E 'with import <nixpkgs> { }; brscan4-etc-files.override{netDevices=[
*/ */
with lib;
let let
addNetDev = nd: '' addNetDev = nd: ''
brsaneconfig4 -a \ brsaneconfig4 -a \
name="${nd.name}" \ name="${nd.name}" \
model="${nd.model}" \ model="${nd.model}" \
${if (hasAttr "nodename" nd && nd.nodename != null) then ${if (lib.hasAttr "nodename" nd && nd.nodename != null) then
''nodename="${nd.nodename}"'' else ''nodename="${nd.nodename}"'' else
''ip="${nd.ip}"''}''; ''ip="${nd.ip}"''}'';
addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs); addAllNetDev = xs: lib.concatStringsSep "\n" (map addNetDev xs);
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -61,11 +59,11 @@ stdenv.mkDerivation {
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
meta = { meta = with lib; {
description = "Brother brscan4 sane backend driver etc files"; description = "Brother brscan4 sane backend driver etc files";
homepage = "http://www.brother.com"; homepage = "http://www.brother.com";
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
license = stdenv.lib.licenses.unfree; license = licenses.unfree;
maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; maintainers = with maintainers; [ jraygauthier ];
}; };
} }

2
nixos/modules/virtualisation/google-compute-image.nix
View File

@ -43,7 +43,7 @@ in
system.build.googleComputeImage = import ../../lib/make-disk-image.nix { system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
name = "google-compute-image"; name = "google-compute-image";
postVM = '' postVM = ''
PATH=$PATH:${with pkgs; stdenv.lib.makeBinPath [ gnutar gzip ]} PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]}
pushd $out pushd $out
mv $diskImage disk.raw mv $diskImage disk.raw
tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw

2
nixos/tests/searx.nix
View File

@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{ {
name = "searx"; name = "searx";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ rnhmjoj ]; maintainers = [ rnhmjoj ];
}; };

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

@ -24,10 +24,10 @@ mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "TeX and LaTeX editor"; description = "TeX and LaTeX editor";
longDescription='' longDescription=''
This editor is a full fledged IDE for TeX and This editor is a full fledged IDE for TeX and
LaTeX editing with completion, structure viewer, preview, LaTeX editing with completion, structure viewer, preview,
spell checking and support of any compilation chain. spell checking and support of any compilation chain.
''; '';
homepage = "http://www.xm1math.net/texmaker/"; homepage = "http://www.xm1math.net/texmaker/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;

16
pkgs/applications/graphics/animbar/default.nix
View File

@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Create your own animation on paper and transparancy"; description = "Create your own animation on paper and transparancy";
longDescription = '' longDescription = ''
Animbar lets you easily create your own animation on paper and Animbar lets you easily create your own animation on paper and
transparancy. From a set of input images two output images are transparancy. From a set of input images two output images are
computed, that are printed one on paper and one on computed, that are printed one on paper and one on
transparency. By moving the transparency over the paper you transparency. By moving the transparency over the paper you
create a fascinating animation effect. This kind of animation create a fascinating animation effect. This kind of animation
technique is hundreds of years old and known under several technique is hundreds of years old and known under several
names: picket fence animation, barrier grid animation, Moiré names: picket fence animation, barrier grid animation, Moiré
animation, to name a few. animation, to name a few.
''; '';
homepage = "http://animbar.mnim.org"; homepage = "http://animbar.mnim.org";
maintainers = with maintainers; [ leenaars ]; maintainers = with maintainers; [ leenaars ];

108
pkgs/applications/misc/sidequest/default.nix
View File

@ -1,69 +1,69 @@
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
let let
pname = "sidequest"; pname = "sidequest";
version = "0.10.11"; version = "0.10.11";
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {
name = "SideQuest"; name = "SideQuest";
exec = "SideQuest"; exec = "SideQuest";
desktopName = name; desktopName = name;
genericName = "VR App Store"; genericName = "VR App Store";
categories = "Settings;PackageManager;"; categories = "Settings;PackageManager;";
}; };
sidequest = stdenv.mkDerivation { sidequest = stdenv.mkDerivation {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
buildCommand = '' buildCommand = ''
mkdir -p "$out/lib/SideQuest" "$out/bin" mkdir -p "$out/lib/SideQuest" "$out/bin"
tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
ln -s "$out/lib/SideQuest/sidequest" "$out/bin" ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
fixupPhase fixupPhase
# mkdir -p "$out/share/applications" # mkdir -p "$out/share/applications"
# ln -s "${desktopItem}/share/applications/*" "$out/share/applications" # ln -s "${desktopItem}/share/applications/*" "$out/share/applications"
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \ --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \
"$out/lib/SideQuest/sidequest" "$out/lib/SideQuest/sidequest"
''; '';
}; };
in buildFHSUserEnv { in buildFHSUserEnv {
name = "SideQuest"; name = "SideQuest";
passthru = { passthru = {
inherit pname version; inherit pname version;
meta = with lib; { meta = with lib; {
description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
homepage = "https://github.com/the-expanse/SideQuest"; homepage = "https://github.com/the-expanse/SideQuest";
downloadPage = "https://github.com/the-expanse/SideQuest/releases"; downloadPage = "https://github.com/the-expanse/SideQuest/releases";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ joepie91 rvolosatovs ]; maintainers = with maintainers; [ joepie91 rvolosatovs ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
}; };
targetPkgs = pkgs: [ targetPkgs = pkgs: [
sidequest sidequest
# Needed in the environment on runtime, to make QuestSaberPatch work # Needed in the environment on runtime, to make QuestSaberPatch work
icu openssl zlib icu openssl zlib
]; ];
extraInstallCommands = '' extraInstallCommands = ''
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"
ln -s ${desktopItem}/share/applications/* "$out/share/applications" ln -s ${desktopItem}/share/applications/* "$out/share/applications"
''; '';
runScript = "sidequest"; runScript = "sidequest";
} }

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

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kpt"; pname = "kpt";
version = "0.37.0"; version = "0.37.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoogleContainerTools"; owner = "GoogleContainerTools";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1b1sgwax67pazcs1lly3h3bb7ww91lcd3nr0w3r3f46d1c6iy8mn"; sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM=";
}; };
vendorSha256 = "0dn6nryf3vn7r0xna02va4wbgkq0z6x8sj6g2mskfywrk0mfhadv"; vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI=";
subPackages = [ "." ]; subPackages = [ "." ];

28
pkgs/applications/radio/klog/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "klog";
version = "1.3.2";
src = fetchurl {
url = "https://download.savannah.nongnu.org/releases/klog/${pname}-${version}.tar.gz";
sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
};
nativeBuildInputs = [ pkg-config wrapQtAppsHook qmake qttools ];
buildInputs = [ hamlib qtbase qtserialport qtcharts ];
qmakeFlags = [ "KLog.pro" ];
meta = with stdenv.lib; {
description = "A multiplatform free hamradio logger";
longDescription = ''
KLog provides QSO management, useful QSL management DX-Cluster client, DXCC management,
ClubLog integration, WSJT-X, DX-Marathon support and much more.
'';
homepage = "https://www.klog.xyz/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ pulsation ];
};
}

4
pkgs/applications/science/astronomy/kstars/default.nix
View File

@ -14,11 +14,11 @@
mkDerivation rec { mkDerivation rec {
pname = "kstars"; pname = "kstars";
version = "3.5.0"; version = "3.5.1";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
sha256 = "0fpkm75abn0hhdhfyvpfl6n0fr7gvw63xhb4hvwdrglhkf2nxam1"; sha256 = "sha256-gf+yaXiYQFuO1/nvdP6OOuD4QrRtPAQTwQZAbYNKxUU=";
}; };
patches = [ patches = [

2
pkgs/applications/science/astronomy/xearth/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
longDescription = longDescription =
'' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, '' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space,
correctly shaded for the current position of the Sun. correctly shaded for the current position of the Sun.
By default, xearth updates the displayed image every five minutes. By default, xearth updates the displayed image every five minutes.
''; '';
maintainers = [ maintainers.mafo ]; maintainers = [ maintainers.mafo ];
license = "xearth"; license = "xearth";

12
pkgs/applications/science/biology/ecopcr/default.nix
View File

@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
buildInputs = [ gcc python27 zlib ]; buildInputs = [ gcc python27 zlib ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -v ecoPCR $out/bin cp -v ecoPCR $out/bin
cp -v ecogrep $out/bin cp -v ecogrep $out/bin
cp -v ecofind $out/bin cp -v ecofind $out/bin
cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat
chmod a+x $out/bin/ecoPCRFormat chmod a+x $out/bin/ecoPCRFormat
''; '';
meta = with lib; { meta = with lib; {

2
pkgs/applications/virtualization/xen/xsa-patches.nix
View File

@ -454,7 +454,7 @@ in {
}) })
]; ];
# 4.5 # 4.5
XSA_248_45 = [ XSA_248_45 = [
(xsaPatch { (xsaPatch {
name = "248-4.5"; name = "248-4.5";

2
pkgs/development/compilers/ghc/8.10.1.nix
View File

@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
strictDeps = true; strictDeps = true;
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true; dontAddExtraLibs = true;
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx perl autoconf automake m4 python3 sphinx

2
pkgs/development/compilers/ghc/8.8.2.nix
View File

@ -189,7 +189,7 @@ stdenv.mkDerivation (rec {
strictDeps = true; strictDeps = true;
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true; dontAddExtraLibs = true;
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx perl autoconf automake m4 python3 sphinx

2
pkgs/development/compilers/ghc/8.8.3.nix
View File

@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
strictDeps = true; strictDeps = true;
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true; dontAddExtraLibs = true;
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx perl autoconf automake m4 python3 sphinx

2
pkgs/development/compilers/ghc/8.8.4.nix
View File

@ -198,7 +198,7 @@ stdenv.mkDerivation (rec {
strictDeps = true; strictDeps = true;
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true; dontAddExtraLibs = true;
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx perl autoconf automake m4 python3 sphinx

2
pkgs/development/compilers/ghc/head.nix
View File

@ -203,7 +203,7 @@ stdenv.mkDerivation (rec {
strictDeps = true; strictDeps = true;
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true; dontAddExtraLibs = true;
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf autoreconfHook automake m4 python3 sphinx perl autoconf autoreconfHook automake m4 python3 sphinx

2
pkgs/development/compilers/ocaml/3.11.2.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
[ (fetchurl { [ (fetchurl {
name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch"; name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch";
url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug"; url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug";
sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e"; sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
}) })
]; ];

28
pkgs/development/libraries/SDL_gfx/default.nix
View File

@ -17,23 +17,23 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "SDL graphics drawing primitives and support functions"; description = "SDL graphics drawing primitives and support functions";
longDescription = longDescription = ''
'' The SDL_gfx library evolved out of the SDL_gfxPrimitives code The SDL_gfx library evolved out of the SDL_gfxPrimitives code
which provided basic drawing routines such as lines, circles or which provided basic drawing routines such as lines, circles or
polygons and SDL_rotozoom which implemented a interpolating polygons and SDL_rotozoom which implemented a interpolating
rotozoomer for SDL surfaces. rotozoomer for SDL surfaces.
The current components of the SDL_gfx library are: The current components of the SDL_gfx library are:
* Graphic Primitives (SDL_gfxPrimitves.h) * Graphic Primitives (SDL_gfxPrimitves.h)
* Rotozoomer (SDL_rotozoom.h) * Rotozoomer (SDL_rotozoom.h)
* Framerate control (SDL_framerate.h) * Framerate control (SDL_framerate.h)
* MMX image filters (SDL_imageFilter.h) * MMX image filters (SDL_imageFilter.h)
* Custom Blit functions (SDL_gfxBlitFunc.h) * Custom Blit functions (SDL_gfxBlitFunc.h)
The library is backwards compatible to the above mentioned The library is backwards compatible to the above mentioned
code. Its is written in plain C and can be used in C++ code. code. Its is written in plain C and can be used in C++ code.
''; '';
homepage = "https://sourceforge.net/projects/sdlgfx/"; homepage = "https://sourceforge.net/projects/sdlgfx/";
license = licenses.zlib; license = licenses.zlib;

28
pkgs/development/libraries/aften/default.nix
View File

@ -1,21 +1,21 @@
{ stdenv, fetchurl, cmake }: { stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aften"; pname = "aften";
version = "0.0.8"; version = "0.0.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DSHARED=ON" ]; cmakeFlags = [ "-DSHARED=ON" ];
meta = { meta = {
description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
homepage = "http://aften.sourceforge.net/"; homepage = "http://aften.sourceforge.net/";
license = stdenv.lib.licenses.lgpl2; license = stdenv.lib.licenses.lgpl2;
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
}; };
} }

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

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cdk"; pname = "cdk";
version ="5.0-20200923"; version ="5.0-20210109";
buildInputs = [ buildInputs = [
ncurses ncurses
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
"ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz"
"https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz"
]; ];
sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0"; sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY=";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

6
pkgs/development/libraries/elf-header/default.nix
View File

@ -35,9 +35,9 @@ stdenvNoCC.mkDerivation {
outputsToInstall = [ "out" ]; outputsToInstall = [ "out" ];
description = "The datastructures of ELF according to the target platform's libc"; description = "The datastructures of ELF according to the target platform's libc";
longDescription = '' longDescription = ''
The Executable and Linkable Format (ELF, formerly named Extensible Linking The Executable and Linkable Format (ELF, formerly named Extensible Linking
Format), is usually defined in a header like this. Format), is usually defined in a header like this.
''; '';
platforms = lib.platforms.all; platforms = lib.platforms.all;
maintainers = [ lib.maintainers.ericson2314 ]; maintainers = [ lib.maintainers.ericson2314 ];
}; };

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }: { stdenv, lib, fetchurl, fetchpatch, autoreconfHook, libunwind }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gperftools-2.8"; name = "gperftools-2.8";
@ -20,21 +20,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
# tcmalloc uses libunwind in a way that works correctly only on non-ARM linux # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
# Disable general dynamic TLS on AArch to support dlopen()'ing the library: # Disable general dynamic TLS on AArch to support dlopen()'ing the library:
# https://bugzilla.redhat.com/show_bug.cgi?id=1483558 # https://bugzilla.redhat.com/show_bug.cgi?id=1483558
configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64) configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
"--disable-general-dynamic-tls"; "--disable-general-dynamic-tls";
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile.am --replace stdc++ c++ substituteInPlace Makefile.am --replace stdc++ c++
substituteInPlace Makefile.in --replace stdc++ c++ substituteInPlace Makefile.in --replace stdc++ c++
substituteInPlace libtool --replace stdc++ c++ substituteInPlace libtool --replace stdc++ c++
''; '';
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
"-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable"; "-D_XOPEN_SOURCE";
# some packages want to link to the static tcmalloc_minimal # some packages want to link to the static tcmalloc_minimal
# to drop the runtime dependency on gperftools # to drop the runtime dependency on gperftools
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with lib; {
homepage = "https://github.com/gperftools/gperftools"; homepage = "https://github.com/gperftools/gperftools";
description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;

10
pkgs/development/libraries/irrlicht/mac.nix
View File

@ -9,16 +9,16 @@ stdenv.mkDerivation rec {
version = common.version; version = common.version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quiark"; owner = "quiark";
repo = "IrrlichtCMake"; repo = "IrrlichtCMake";
rev = "523a5e6ef84be67c3014f7b822b97acfced536ce"; rev = "523a5e6ef84be67c3014f7b822b97acfced536ce";
sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi"; sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi";
}; };
postUnpack = '' postUnpack = ''
cp -r ${common.src}/* $sourceRoot/ cp -r ${common.src}/* $sourceRoot/
chmod -R 777 $sourceRoot chmod -R 777 $sourceRoot
''; '';
patches = [ ./mac_device.patch ]; patches = [ ./mac_device.patch ];
dontFixCmake = true; dontFixCmake = true;

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

@ -1,12 +1,12 @@
{stdenv, fetchurl, ant, jdk}: {stdenv, fetchurl, ant, jdk}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "martyr"; pname = "martyr";
version = "0.3.9"; version = "0.3.9";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
}; };
buildInputs = [ ant jdk ]; buildInputs = [ ant jdk ];

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchPypi, buildPythonPackage, { lib, stdenv, fetchPypi, buildPythonPackage,
wrapt, pytest, tox }: wrapt, pytest, tox }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "Deprecated"; pname = "Deprecated";

45
pkgs/development/python-modules/url-normalize/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry
, pytest-cov
, pytest-flakes
, pytest-mock
, pytest-socket
, pytestCheckHook
, six
}:
buildPythonPackage rec {
pname = "url-normalize";
version = "1.4.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "niksite";
repo = pname;
rev = version;
sha256 = "09nac5nh94x0n4bfazjfxk96b20mfsx6r1fnvqv85gkzs0rwqkaq";
};
nativeBuildInputs = [ poetry ];
propagatedBuildInputs = [ six ];
checkInputs = [
pytest-cov
pytest-flakes
pytest-mock
pytest-socket
pytestCheckHook
];
pythonImportsCheck = [ "url_normalize" ];
meta = with lib; {
description = "URL normalization for Python";
homepage = "https://github.com/niksite/url-normalize";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

51
pkgs/development/python-modules/virtualenv/default.nix
View File

@ -1,35 +1,27 @@
{ buildPythonPackage { buildPythonPackage
, fetchPypi
, lib
, stdenv
, pythonOlder
, isPy27
, appdirs , appdirs
, contextlib2 , contextlib2
, cython
, distlib , distlib
, fetchPypi
, filelock , filelock
, fish
, flaky
, importlib-metadata , importlib-metadata
, importlib-resources , importlib-resources
, isPy27
, lib
, pathlib2 , pathlib2
, pytest-freezegun
, pytest-mock
, pytest-timeout
, pytestCheckHook
, pythonOlder
, setuptools_scm , setuptools_scm
, six , six
, stdenv
, xonsh
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "virtualenv"; pname = "virtualenv";
version = "20.3.1"; version = "20.2.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-DBEaIjaxkUIrN/6MKLjIKM7TmqtL9WJ/pcMxrv+1cNk="; sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -55,33 +47,10 @@ buildPythonPackage rec {
./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch
]; ];
checkInputs = [ meta = {
cython
fish
flaky
pytest-freezegun
pytest-mock
pytest-timeout
pytestCheckHook
] ++ lib.optionals (pythonOlder "3.9") [
xonsh
];
preCheck = "export HOME=$(mktemp -d)";
# Ignore tests which requires network access
pytestFlagsArray = [
"--ignore tests/unit/create/test_creator.py"
"--ignore tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
];
disabledTests = [ "test_can_build_c_extensions" ];
pythonImportsCheck = [ "virtualenv" ];
meta = with lib; {
description = "A tool to create isolated Python environments"; description = "A tool to create isolated Python environments";
homepage = "http://www.virtualenv.org"; homepage = "http://www.virtualenv.org";
license = licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ goibhniu ]; maintainers = with lib.maintainers; [ goibhniu ];
}; };
} }

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

@ -39,5 +39,5 @@ buildPythonPackage rec {
homepage = "http://wrf-python.rtfd.org"; homepage = "http://wrf-python.rtfd.org";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mhaselsteiner ]; maintainers = with lib.maintainers; [ mhaselsteiner ];
}; };
} }

2
pkgs/development/tools/ineffassign/default.nix
View File

@ -6,7 +6,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "ineffassign-unstable"; pname = "ineffassign-unstable";
version = "2018-09-09"; version = "2018-09-09";
rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
goPackagePath = "github.com/gordonklaus/ineffassign"; goPackagePath = "github.com/gordonklaus/ineffassign";
excludedPackages = ''testdata''; excludedPackages = ''testdata'';

4
pkgs/development/tools/metals/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "metals"; pname = "metals";
version = "0.9.8"; version = "0.9.10";
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}"; name = "${pname}-deps-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
''; '';
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk"; outputHash = "1i91jq1p27kkzxk57mm438sablnrx8j5pfyl0yg64wzrashba1xa";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

2
pkgs/development/tools/unity3d/default.nix
View File

@ -29,7 +29,7 @@ in stdenv.mkDerivation {
version = "${ver}x${build}"; version = "${ver}x${build}";
src = fetchurl { src = fetchurl {
url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv";
}; };

6
pkgs/games/globulation/default.nix
View File

@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
patches = [ ./header-order.patch ./public-buildproject.patch patches = [ ./header-order.patch ./public-buildproject.patch
(fetchpatch { (fetchpatch {
url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw";
sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
}) })
]; ];
postPatch = '' postPatch = ''

10
pkgs/misc/drivers/epson_201207w/default.nix
View File

@ -63,11 +63,11 @@ in
Epson L550 Series Epson L550 Series
Epson L555 Series Epson L555 Series
To use the driver adjust your configuration.nix file: To use the driver adjust your configuration.nix file:
services.printing = { services.printing = {
enable = true; enable = true;
drivers = [ pkgs.epson_201207w ]; drivers = [ pkgs.epson_201207w ];
}; };
''; '';
license = with licenses; [ lgpl21 epson ]; license = with licenses; [ lgpl21 epson ];
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

10
pkgs/os-specific/linux/cifs-utils/default.nix
View File

@ -3,27 +3,25 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cifs-utils"; pname = "cifs-utils";
version = "6.9"; version = "6.12";
src = fetchurl { src = fetchurl {
url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"; sha256 = "1vw570pvir73kl4y6fhd6ns936ankimkhb1ii43yh8lr0p1xqbcj";
}; };
nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
buildInputs = [ kerberos keyutils pam talloc ]; buildInputs = [ kerberos keyutils pam talloc ];
configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds. # AC_FUNC_MALLOC is broken on cross builds.
"ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes"
]; ];
makeFlags = [ "root_sbindir=$(out)/sbin" ];
meta = with lib; { meta = with lib; {
homepage = "http://www.samba.org/linux-cifs/cifs-utils/"; homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils";
description = "Tools for managing Linux CIFS client filesystems"; description = "Tools for managing Linux CIFS client filesystems";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.lgpl3; license = licenses.lgpl3;

4
pkgs/servers/home-assistant/component-packages.nix
View File

@ -361,7 +361,7 @@
"html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "html5" = ps: with ps; [ aiohttp-cors pywebpush ];
"http" = ps: with ps; [ aiohttp-cors ]; "http" = ps: with ps; [ aiohttp-cors ];
"htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize "huawei_lte" = ps: with ps; [ getmac stringcase url-normalize ]; # missing inputs: huawei-lte-api
"huawei_router" = ps: with ps; [ ]; "huawei_router" = ps: with ps; [ ];
"hue" = ps: with ps; [ aiohue ]; "hue" = ps: with ps; [ aiohue ];
"humidifier" = ps: with ps; [ ]; "humidifier" = ps: with ps; [ ];
@ -801,7 +801,7 @@
"switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot
"switcher_kis" = ps: with ps; [ aioswitcher ]; "switcher_kis" = ps: with ps; [ aioswitcher ];
"switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
"syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru
"synology" = ps: with ps; [ ]; # missing inputs: py-synology "synology" = ps: with ps; [ ]; # missing inputs: py-synology
"synology_chat" = ps: with ps; [ ]; "synology_chat" = ps: with ps; [ ];
"synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api

10
pkgs/servers/xmpp/pyMAILt/default.nix
View File

@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
version = "20090101"; version = "20090101";
src = fetchcvs { src = fetchcvs {
cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy";
module = "xmpppy/mail-transport"; module = "xmpppy/mail-transport";
date = "2009-01-01"; date = "2009-01-01";
sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
}; };
pythonPath = [ xmpppy ]; pythonPath = [ xmpppy ];
buildInputs = [ pythonPackages.wrapPython ]; buildInputs = [ pythonPackages.wrapPython ];

4
pkgs/shells/zsh/zsh-powerlevel10k/default.nix
View File

@ -19,13 +19,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "powerlevel10k"; pname = "powerlevel10k";
version = "1.14.4"; version = "1.14.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romkatv"; owner = "romkatv";
repo = "powerlevel10k"; repo = "powerlevel10k";
rev = "v${version}"; rev = "v${version}";
sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk"; sha256 = "1z6xipd7bgq7fc03x9j2dmg3yv59xyjf4ic5f1l6l6pw7w3q4sq7";
}; };
patches = [ patches = [

16
pkgs/tools/backup/iceshelf/default.nix
View File

@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec {
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mrworf"; owner = "mrworf";
repo = pname; repo = pname;
rev = "26768dde3fc54fa412e523eb8f8552e866b4853b"; rev = "26768dde3fc54fa412e523eb8f8552e866b4853b";
sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm"; sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -19,12 +19,12 @@ python3.pkgs.buildPythonApplication rec {
python3.pkgs.python-gnupg python3.pkgs.python-gnupg
]; ];
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages} mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages}
cp -v iceshelf iceshelf-restore $out/bin cp -v iceshelf iceshelf-restore $out/bin
cp -v iceshelf.sample.conf $out/share/doc/${pname}/ cp -v iceshelf.sample.conf $out/share/doc/${pname}/
cp -rv modules $out/${python3.sitePackages} cp -rv modules $out/${python3.sitePackages}
''; '';
meta = with lib; { meta = with lib; {
description = "A simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage"; description = "A simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage";

4
pkgs/tools/misc/latex2html/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "latex2html"; pname = "latex2html";
version = "2020.2"; version = "2021";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1icyl6kl60wh7cavprgbd8q6lpjwr7wn24m34kpiif7ahknhcbcm"; sha256 = "sha256-n7VbK/S9EkWxb4fbIXp3tIfX7N+9bvZ/odBylqTuzUU=";
}; };
buildInputs = [ ghostscript netpbm perl ]; buildInputs = [ ghostscript netpbm perl ];

7
pkgs/tools/networking/dnsmasq/default.nix
View File

@ -12,11 +12,12 @@ let
]); ]);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dnsmasq-2.82"; pname = "dnsmasq";
version = "2.83";
src = fetchurl { src = fetchurl {
url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; url = "http://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz";
sha256 = "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4"; sha256 = "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz";
}; };
postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

10
pkgs/tools/networking/uget-integrator/default.nix
View File

@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
substituteInPlace $f --replace "/usr" "$out" substituteInPlace $f --replace "/usr" "$out"
done done
install -D -t $out/bin bin/uget-integrator install -D -t $out/bin bin/uget-integrator
install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json
install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json
install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json
install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json
wrapPythonPrograms wrapPythonPrograms
''; '';

30
pkgs/tools/security/git-hound/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "git-hound";
version = "1.3";
src = fetchFromGitHub {
owner = "tillson";
repo = pname;
rev = "v${version}";
sha256 = "1l2bif7qpc1yl93ih01g9jci7ba47rsnpq9js88rz216q93dzmsf";
};
vendorSha256 = "055hpfjbqng513c9rscb8jhnlxj7p82sr8cbsvwnzk569n71qwma";
meta = with lib; {
description = "Reconnaissance tool for GitHub code search";
longDescription = ''
GitHound pinpoints exposed API keys and other sensitive information
across all of GitHub using pattern matching, commit history searching,
and a unique result scoring system.
'';
homepage = "https://github.com/tillson/git-hound";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

29
pkgs/tools/security/gitleaks/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "gitleaks";
version = "7.2.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "1pdbkjx8h6ijypsxyv34lykymaqf8wnfyjk3ldp49apbx01bl34y";
};
vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9";
meta = with lib; {
description = "Scan git repos (or files) for secrets";
longDescription = ''
Gitleaks is a SAST tool for detecting hardcoded secrets like passwords,
API keys, and tokens in git repos.
'';
homepage = "https://github.com/zricethezav/gitleaks";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

2
pkgs/tools/security/metasploit/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
source "https://rubygems.org" source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.12" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.25"

128
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: 8ba313ed85b03ef54bec32086c2a8708a7e1df58 revision: 7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c
ref: refs/tags/6.0.12 ref: refs/tags/6.0.25
specs: specs:
metasploit-framework (6.0.12) metasploit-framework (6.0.25)
actionpack (~> 5.2.2) actionpack (~> 5.2.2)
activerecord (~> 5.2.2) activerecord (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
@ -31,7 +31,7 @@ GIT
metasploit-concern metasploit-concern
metasploit-credential metasploit-credential
metasploit-model metasploit-model
metasploit-payloads (= 2.0.22) metasploit-payloads (= 2.0.26)
metasploit_data_models metasploit_data_models
metasploit_payloads-mettle (= 1.0.2) metasploit_payloads-mettle (= 1.0.2)
mqtt mqtt
@ -50,6 +50,7 @@ GIT
pcaprub pcaprub
pdf-reader pdf-reader
pg pg
puma
railties railties
rb-readline rb-readline
recog recog
@ -86,6 +87,7 @@ GIT
windows_error windows_error
xdr xdr
xmlrpc xmlrpc
zeitwerk
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
@ -119,41 +121,41 @@ GEM
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2) afm (0.2.2)
arel (9.0.0) arel (9.0.0)
arel-helpers (2.11.0) arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7) activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.0) aws-eventstream (1.1.0)
aws-partitions (1.385.0) aws-partitions (1.415.0)
aws-sdk-core (3.109.1) aws-sdk-core (3.110.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0) aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1.0)
aws-sdk-ec2 (1.202.0) aws-sdk-ec2 (1.220.0)
aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-iam (1.46.0) aws-sdk-iam (1.46.0)
aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kms (1.39.0) aws-sdk-kms (1.40.0)
aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.83.1) aws-sdk-s3 (1.87.0)
aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2) aws-sigv4 (1.2.2)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16) bcrypt (3.1.16)
bcrypt_pbkdf (1.0.1) bcrypt_pbkdf (1.1.0)
bindata (2.4.8) bindata (2.4.8)
bit-struct (0.16) bit-struct (0.16)
bson (4.11.0) bson (4.11.1)
builder (3.2.4) builder (3.2.4)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
cookiejar (0.3.3) cookiejar (0.3.3)
crass (1.0.6) crass (1.0.6)
daemons (1.3.1) daemons (1.3.1)
dnsruby (1.61.4) dnsruby (1.61.5)
simpleidn (~> 0.1) simpleidn (~> 0.1)
ed25519 (1.2.4) ed25519 (1.2.4)
em-http-request (1.1.7) em-http-request (1.1.7)
@ -164,13 +166,15 @@ GEM
http_parser.rb (>= 0.6.0) http_parser.rb (>= 0.6.0)
em-socksify (0.3.2) em-socksify (0.3.2)
eventmachine (>= 1.0.0.beta.4) eventmachine (>= 1.0.0.beta.4)
erubi (1.9.0) erubi (1.10.0)
eventmachine (1.2.7) eventmachine (1.2.7)
faker (2.14.0) faker (2.15.1)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
faraday (1.1.0) faraday (1.3.0)
faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ruby2_keywords ruby2_keywords
faraday-net_http (1.0.0)
faye-websocket (0.11.0) faye-websocket (0.11.0)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1) websocket-driver (>= 0.5.1)
@ -179,24 +183,24 @@ GEM
hrr_rb_ssh (0.3.0.pre2) hrr_rb_ssh (0.3.0.pre2)
ed25519 (~> 1.2) ed25519 (~> 1.2)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (1.8.5) i18n (1.8.7)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
io-console (0.5.6) io-console (0.5.6)
irb (1.2.7) irb (1.3.0)
reline (>= 0.1.5) reline (>= 0.1.5)
jmespath (1.4.0) jmespath (1.4.0)
jsobfu (0.4.2) jsobfu (0.4.2)
rkelly-remix rkelly-remix
json (2.3.1) json (2.5.1)
loofah (2.7.0) loofah (2.8.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
metasm (1.0.4) metasm (1.0.4)
metasploit-concern (3.0.0) metasploit-concern (3.0.1)
activemodel (~> 5.2.2) activemodel (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
railties (~> 5.2.2) railties (~> 5.2.2)
metasploit-credential (4.0.2) metasploit-credential (4.0.3)
metasploit-concern metasploit-concern
metasploit-model metasploit-model
metasploit_data_models (>= 3.0.0) metasploit_data_models (>= 3.0.0)
@ -206,12 +210,12 @@ GEM
rex-socket rex-socket
rubyntlm rubyntlm
rubyzip rubyzip
metasploit-model (3.1.2) metasploit-model (3.1.3)
activemodel (~> 5.2.2) activemodel (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
railties (~> 5.2.2) railties (~> 5.2.2)
metasploit-payloads (2.0.22) metasploit-payloads (2.0.26)
metasploit_data_models (4.1.0) metasploit_data_models (4.1.1)
activerecord (~> 5.2.2) activerecord (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
arel-helpers arel-helpers
@ -222,21 +226,23 @@ GEM
recog (~> 2.0) recog (~> 2.0)
metasploit_payloads-mettle (1.0.2) metasploit_payloads-mettle (1.0.2)
method_source (1.0.0) method_source (1.0.0)
mini_portile2 (2.4.0) mini_portile2 (2.5.0)
minitest (5.14.2) minitest (5.14.3)
mqtt (0.5.0) mqtt (0.5.0)
msgpack (1.3.3) msgpack (1.3.3)
multipart-post (2.1.1) multipart-post (2.1.1)
mustermann (1.1.1) mustermann (1.1.1)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
nessus_rest (0.1.6) nessus_rest (0.1.6)
net-ldap (0.16.3) net-ldap (0.17.0)
net-ssh (6.1.0) net-ssh (6.1.0)
network_interface (0.0.2) network_interface (0.0.2)
nexpose (7.2.1) nexpose (7.2.1)
nokogiri (1.10.10) nio4r (2.5.4)
mini_portile2 (~> 2.4.0) nokogiri (1.11.1)
octokit (4.19.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.20.0)
faraday (>= 0.9) faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3) sawyer (~> 0.8.0, >= 0.5.3)
openssl-ccm (1.2.2) openssl-ccm (1.2.2)
@ -254,6 +260,9 @@ GEM
ttfunk ttfunk
pg (1.2.3) pg (1.2.3)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.1.1)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3) rack (2.2.3)
rack-protection (2.1.0) rack-protection (2.1.0)
rack rack
@ -270,65 +279,65 @@ GEM
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0) thor (>= 0.19.0, < 2.0)
rake (13.0.1) rake (13.0.3)
rb-readline (0.5.5) rb-readline (0.5.5)
recog (2.3.15) recog (2.3.18)
nokogiri nokogiri
redcarpet (3.5.0) redcarpet (3.5.1)
reline (0.1.6) reline (0.2.0)
io-console (~> 0.5) io-console (~> 0.5)
rex-arch (0.1.13) rex-arch (0.1.14)
rex-text rex-text
rex-bin_tools (0.1.6) rex-bin_tools (0.1.7)
metasm metasm
rex-arch rex-arch
rex-core rex-core
rex-struct2 rex-struct2
rex-text rex-text
rex-core (0.1.13) rex-core (0.1.14)
rex-encoder (0.1.4) rex-encoder (0.1.5)
metasm metasm
rex-arch rex-arch
rex-text rex-text
rex-exploitation (0.1.24) rex-exploitation (0.1.26)
jsobfu jsobfu
metasm metasm
rex-arch rex-arch
rex-encoder rex-encoder
rex-text rex-text
rex-java (0.1.5) rex-java (0.1.6)
rex-mime (0.1.5) rex-mime (0.1.6)
rex-text rex-text
rex-nop (0.1.1) rex-nop (0.1.2)
rex-arch rex-arch
rex-ole (0.1.6) rex-ole (0.1.7)
rex-text rex-text
rex-powershell (0.1.87) rex-powershell (0.1.88)
rex-random_identifier rex-random_identifier
rex-text rex-text
ruby-rc4 ruby-rc4
rex-random_identifier (0.1.4) rex-random_identifier (0.1.5)
rex-text rex-text
rex-registry (0.1.3) rex-registry (0.1.4)
rex-rop_builder (0.1.3) rex-rop_builder (0.1.4)
metasm metasm
rex-core rex-core
rex-text rex-text
rex-socket (0.1.24) rex-socket (0.1.25)
rex-core rex-core
rex-sslscan (0.1.5) rex-sslscan (0.1.5)
rex-core rex-core
rex-socket rex-socket
rex-text rex-text
rex-struct2 (0.1.2) rex-struct2 (0.1.3)
rex-text (0.2.28) rex-text (0.2.29)
rex-zip (0.1.3) rex-zip (0.1.4)
rex-text rex-text
rkelly-remix (0.0.7) rkelly-remix (0.0.7)
ruby-macho (2.3.0) ruby-macho (2.5.0)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
ruby2_keywords (0.0.2) ruby2_keywords (0.0.2)
ruby_smb (2.0.6) ruby_smb (2.0.7)
bindata bindata
openssl-ccm openssl-ccm
openssl-cmac openssl-cmac
@ -348,17 +357,17 @@ GEM
tilt (~> 2.0) tilt (~> 2.0)
sqlite3 (1.4.2) sqlite3 (1.4.2)
sshkey (2.0.0) sshkey (2.0.0)
thin (1.7.2) thin (1.8.0)
daemons (~> 1.0, >= 1.0.9) daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4) eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3) rack (>= 1, < 3)
thor (1.0.1) thor (1.0.1)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.10) tilt (2.0.10)
ttfunk (1.6.2.1) ttfunk (1.7.0)
tzinfo (1.2.7) tzinfo (1.2.9)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo-data (1.2020.4) tzinfo-data (1.2020.6)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
@ -372,7 +381,8 @@ GEM
xdr (3.0.2) xdr (3.0.2)
activemodel (>= 4.2, < 7.0) activemodel (>= 4.2, < 7.0)
activesupport (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0)
xmlrpc (0.3.0) xmlrpc (0.3.1)
zeitwerk (2.4.2)
PLATFORMS PLATFORMS
ruby ruby

4
pkgs/tools/security/metasploit/default.nix
View File

@ -8,13 +8,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.0.12"; version = "6.0.25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs"; sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];

272
pkgs/tools/security/metasploit/gemset.nix
View File

@ -84,10 +84,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16irs6rai9pasv36yy31glijs3p2pvgry5g1lh03vnzg8xpb1msp"; sha256 = "12wgkhajfsm3fgk43zf7xyxrx7q2kc4ggq459p1az6p0b9jscarx";
type = "gem"; type = "gem";
}; };
version = "2.11.0"; version = "2.12.0";
}; };
Ascii85 = { Ascii85 = {
groups = ["default"]; groups = ["default"];
@ -114,30 +114,30 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "04i4bry59c3g1anbjpsz9g1pz7yy23kh4vvhg7z611amlcr48zvb"; sha256 = "1348hdy6wf1av75nvlwp4b0pp4vshc9vrzic5vzrwnx9fg6cib08";
type = "gem"; type = "gem";
}; };
version = "1.385.0"; version = "1.415.0";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xmppcxq7jm8lffqibkhq257hfwfbv82zm2y1fbhwm3icgxzwlfx"; sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4";
type = "gem"; type = "gem";
}; };
version = "3.109.1"; version = "3.110.0";
}; };
aws-sdk-ec2 = { aws-sdk-ec2 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0fsf9qhlxczz8cz755xlcdpfqn384d4kr3ybx2p54n377wamdq08"; sha256 = "1x3hw3ld27gxj0mmbaj4dw6aw90kr06mkjfx5wxxb807krp5giza";
type = "gem"; type = "gem";
}; };
version = "1.202.0"; version = "1.220.0";
}; };
aws-sdk-iam = { aws-sdk-iam = {
groups = ["default"]; groups = ["default"];
@ -154,20 +154,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a"; sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4";
type = "gem"; type = "gem";
}; };
version = "1.39.0"; version = "1.40.0";
}; };
aws-sdk-s3 = { aws-sdk-s3 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "021yqghdb1i980vn249hv44jajr0v3hq4ik4r6fqh9kwp04fsbqv"; sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7";
type = "gem"; type = "gem";
}; };
version = "1.83.1"; version = "1.87.0";
}; };
aws-sigv4 = { aws-sigv4 = {
groups = ["default"]; groups = ["default"];
@ -194,10 +194,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445";
type = "gem"; type = "gem";
}; };
version = "1.0.1"; version = "1.1.0";
}; };
bindata = { bindata = {
groups = ["default"]; groups = ["default"];
@ -224,10 +224,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bm64q413wrrm3pda6ha2kn1yipyl0qp5240fwsdw1hkqhbjdnjm"; sha256 = "12v95l3v7n7lh3mk8k1jdrkpn2vjnkb8k636hcygaczzv4jdsdfp";
type = "gem"; type = "gem";
}; };
version = "4.11.0"; version = "4.11.1";
}; };
builder = { builder = {
groups = ["default"]; groups = ["default"];
@ -284,10 +284,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0i4mq4zm8bqd0ik908gnn8nm3kph268af7q173wlq4krg3nw562x"; sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx";
type = "gem"; type = "gem";
}; };
version = "1.61.4"; version = "1.61.5";
}; };
ed25519 = { ed25519 = {
groups = ["default"]; groups = ["default"];
@ -324,10 +324,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
type = "gem"; type = "gem";
}; };
version = "1.9.0"; version = "1.10.0";
}; };
eventmachine = { eventmachine = {
groups = ["default"]; groups = ["default"];
@ -344,20 +344,30 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6"; sha256 = "1l0dvswigzxaz9558wmfix3v8cmwwkgdvrx1fmpd3qnr5hky1qrk";
type = "gem"; type = "gem";
}; };
version = "2.14.0"; version = "2.15.1";
}; };
faraday = { faraday = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35"; sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
type = "gem"; type = "gem";
}; };
version = "1.1.0"; version = "1.3.0";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d";
type = "gem";
};
version = "1.0.0";
}; };
faye-websocket = { faye-websocket = {
groups = ["default"]; groups = ["default"];
@ -414,10 +424,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv";
type = "gem"; type = "gem";
}; };
version = "1.8.5"; version = "1.8.7";
}; };
io-console = { io-console = {
groups = ["default"]; groups = ["default"];
@ -434,10 +444,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10d9xr1hdpkqhljxhvdm44c2qbxdjfqm5x00d4v6aw0fym1w7r2g"; sha256 = "0a7gkibv9485dbh64k3r5j20bf553dg0kmxy3hhgl2jsgqyvrl1y";
type = "gem"; type = "gem";
}; };
version = "1.2.7"; version = "1.3.0";
}; };
jmespath = { jmespath = {
groups = ["default"]; groups = ["default"];
@ -464,20 +474,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem"; type = "gem";
}; };
version = "2.3.1"; version = "2.5.1";
}; };
loofah = { loofah = {
groups = ["default"]; groups = ["default"];
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";
}; };
metasm = { metasm = {
groups = ["default"]; groups = ["default"];
@ -494,62 +504,62 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10a9dr0pi25vsnk7x1bavx2ja62lqswdkym0hvhjsds6awvx1cf2"; sha256 = "19cz0g463wl35gpdy1630n88a9m7fhhlcylspvvwc0m01sipc33g";
type = "gem"; type = "gem";
}; };
version = "3.0.0"; version = "3.0.1";
}; };
metasploit-credential = { metasploit-credential = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "03339i3v6lgz0cymn2i7y0sylpw2nihsc8h75c4yn3bq9p6wk6sx"; sha256 = "1f6cjvk68yypciycp8vdvhc5hrwmc8qi4y06s1cd77zj4m2skkmn";
type = "gem"; type = "gem";
}; };
version = "4.0.2"; version = "4.0.3";
}; };
metasploit-framework = { metasploit-framework = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "8ba313ed85b03ef54bec32086c2a8708a7e1df58"; rev = "7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c";
sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs"; sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.0.12"; version = "6.0.25";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0szwqs6djh882alpnmnnkx46s548jg3vb0ya61hibw3kqcw3i1ig"; sha256 = "0gmh23c3hc4my244m5lpd4kiysrsprag4rn6kvnnphxiflxvi4f7";
type = "gem"; type = "gem";
}; };
version = "3.1.2"; version = "3.1.3";
}; };
metasploit-payloads = { metasploit-payloads = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1yiwwyc12f9jln58l4j26yjbixij1v5h3spp4ci3ik4dxyk2r4zb"; sha256 = "1gpv327750b7g243w0dmynji1gabwk81kb424y5hlbq9vqpgamnb";
type = "gem"; type = "gem";
}; };
version = "2.0.22"; version = "2.0.26";
}; };
metasploit_data_models = { metasploit_data_models = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1n7vb6pg446jadjsgrc29kxnc9b6ga29hw8pg52dnrzhp7rwhiyl"; sha256 = "1czqg49b7n9n2iqp6r4f1cxh8kd39gbjvydq09hzmzdmkwxh3x1f";
type = "gem"; type = "gem";
}; };
version = "4.1.0"; version = "4.1.1";
}; };
metasploit_payloads-mettle = { metasploit_payloads-mettle = {
groups = ["default"]; groups = ["default"];
@ -576,20 +586,20 @@
platforms = []; 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"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j";
type = "gem"; type = "gem";
}; };
version = "5.14.2"; version = "5.14.3";
}; };
mqtt = { mqtt = {
groups = ["default"]; groups = ["default"];
@ -646,10 +656,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n";
type = "gem"; type = "gem";
}; };
version = "0.16.3"; version = "0.17.0";
}; };
net-ssh = { net-ssh = {
groups = ["default"]; groups = ["default"];
@ -681,25 +691,35 @@
}; };
version = "7.2.1"; version = "7.2.1";
}; };
nio4r = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk";
type = "gem";
};
version = "2.5.4";
};
nokogiri = { nokogiri = {
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";
}; };
octokit = { octokit = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24"; sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
type = "gem"; type = "gem";
}; };
version = "4.19.0"; version = "4.20.0";
}; };
openssl-ccm = { openssl-ccm = {
groups = ["default"]; groups = ["default"];
@ -791,6 +811,26 @@
}; };
version = "4.0.6"; version = "4.0.6";
}; };
puma = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b";
type = "gem";
};
version = "5.1.1";
};
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 = [];
@ -856,10 +896,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
type = "gem"; type = "gem";
}; };
version = "13.0.1"; version = "13.0.3";
}; };
rb-readline = { rb-readline = {
groups = ["default"]; groups = ["default"];
@ -876,170 +916,170 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vxnm9ld3rn8xxccq9jyhzz6558bqfxdb3sd4na20frg9f5pflb7"; sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69";
type = "gem"; type = "gem";
}; };
version = "2.3.15"; version = "2.3.18";
}; };
redcarpet = { redcarpet = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
type = "gem"; type = "gem";
}; };
version = "3.5.0"; version = "3.5.1";
}; };
reline = { reline = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sspfd5x8aq80pmkdj0dzd20iclhrdjan1ibkrivgk7j8af23hbk"; sha256 = "109gpk4c9712cc3ilvidgks9i42y8gwnjpw6j4w4hci09pasz7i1";
type = "gem"; type = "gem";
}; };
version = "0.1.6"; version = "0.2.0";
}; };
rex-arch = { rex-arch = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0cvdy2ysiphdig258lkicbxqq2y47bkl69kgj4kkj8w338rb5kwa"; sha256 = "1gi9641869pg30ij7ba3r2z89flvdqsma4spbpww6c8ph62iy4bp";
type = "gem"; type = "gem";
}; };
version = "0.1.13"; version = "0.1.14";
}; };
rex-bin_tools = { rex-bin_tools = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "19q4cj7cis29k3zx9j2gp4h3ib0zig2fa4rs56c1gjr32f192zzk"; sha256 = "16w219ashxrgrgb5via9k45h7whrib77rmwy0f7akqf409pzjdp7";
type = "gem"; type = "gem";
}; };
version = "0.1.6"; version = "0.1.7";
}; };
rex-core = { rex-core = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1b9pf7f8m2zjck65dpp8h8v4n0a05kfas6cn9adv0w8d9z58aqvv"; sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw";
type = "gem"; type = "gem";
}; };
version = "0.1.13"; version = "0.1.14";
}; };
rex-encoder = { rex-encoder = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z"; sha256 = "0lnrlii8d3r35927wp42bpdzh37dx3jqgdxk6lk5d6xvz6h14kp7";
type = "gem"; type = "gem";
}; };
version = "0.1.4"; version = "0.1.5";
}; };
rex-exploitation = { rex-exploitation = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0inrf2vahmpxhjf84i8ak2b7gcirsrjrmb1rnvvqqr9kl0xw5xm3"; sha256 = "0z4dn579mxl22qdxcnbmxp0diia6kr7c20giv0bn4r0viavz49gc";
type = "gem"; type = "gem";
}; };
version = "0.1.24"; version = "0.1.26";
}; };
rex-java = { rex-java = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0j58k02p5g9snkpak64sb4aymkrvrh9xpqh8wsnya4w7b86w2y6i"; sha256 = "0g8xdj7ij4y51wgh6l29al6i107bqn6pwql6za7ahms75m8s9dys";
type = "gem"; type = "gem";
}; };
version = "0.1.5"; version = "0.1.6";
}; };
rex-mime = { rex-mime = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a"; sha256 = "0wzw1qcdgbn3iyskppy5038mcdrzplyai45pilm5qjj4fwvjdl6m";
type = "gem"; type = "gem";
}; };
version = "0.1.5"; version = "0.1.6";
}; };
rex-nop = { rex-nop = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny"; sha256 = "0yjlmgmaaa65lkd6jrm71g8yfn8xy91jl07nd1v90xp9jrzrrl92";
type = "gem"; type = "gem";
}; };
version = "0.1.1"; version = "0.1.2";
}; };
rex-ole = { rex-ole = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww"; sha256 = "0rlsy1a4lig7iqvb4zn60fpf125v8k4bjrjzakks74prjb2qmqnp";
type = "gem"; type = "gem";
}; };
version = "0.1.6"; version = "0.1.7";
}; };
rex-powershell = { rex-powershell = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "11wi8dpb2s8bvkqhbf80g16nyj2hscs3vz31ffzl1g0g6imcs0dl"; sha256 = "02bzkraz4722zkjkm5cn9kvhx2mbkrhd5g123bkqgfkd19kbfjif";
type = "gem"; type = "gem";
}; };
version = "0.1.87"; version = "0.1.88";
}; };
rex-random_identifier = { rex-random_identifier = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0fg94sczff5c2rlvqqgw2dndlqyzjil5rjk3p9f46ss2hc8zxlbk"; sha256 = "0pqd8pfcxqd44ql8dawk59k9s5jnhx7inc8wnpjhkbx0y0sldq8q";
type = "gem"; type = "gem";
}; };
version = "0.1.4"; version = "0.1.5";
}; };
rex-registry = { rex-registry = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0wv812ghnz143vx10ixmv32ypj1xrzr4rh4kgam8d8wwjwxsgw1q"; sha256 = "09b6jhcih4srrh0j52v49vbffqz8ngki6qpmq9b2wdabqnw63d1v";
type = "gem"; type = "gem";
}; };
version = "0.1.3"; version = "0.1.4";
}; };
rex-rop_builder = { rex-rop_builder = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy"; sha256 = "0ssynxq3kc86v3xnc6jx8pg5zh13q61wl2klqbi9hzn2n8lhdgvj";
type = "gem"; type = "gem";
}; };
version = "0.1.3"; version = "0.1.4";
}; };
rex-socket = { rex-socket = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1y6p1sw0wiw4x4dk89lwhf7vzsb0cjgpbr8hf7m119lg2kzm5g8y"; sha256 = "1601b7vhp56sif21lk7mqcn3bbkhdrp6zz0vag8yzma3ji707pqg";
type = "gem"; type = "gem";
}; };
version = "0.1.24"; version = "0.1.25";
}; };
rex-sslscan = { rex-sslscan = {
groups = ["default"]; groups = ["default"];
@ -1056,30 +1096,30 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1nbdn53264a20cr2m2nq2v4mg0n33dvrd1jj1sixl37qjzw2k452"; sha256 = "1hp8yv55j995dl587hismwa7ydyprs03c75gia6rwp7v5bhshy4n";
type = "gem"; type = "gem";
}; };
version = "0.1.2"; version = "0.1.3";
}; };
rex-text = { rex-text = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0wx8pncrk7yb2zxxqaycm4ikvb577zj7rma8jdfi74a0c5119c44"; sha256 = "05s0izxlb4rrhr42d6dz6idxdj4hrb7bdkk22qfwnaqdppb4w536";
type = "gem"; type = "gem";
}; };
version = "0.2.28"; version = "0.2.29";
}; };
rex-zip = { rex-zip = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7"; sha256 = "0azm4g4dm9k6vrav769vn0gffrv7pgxknlj4dr9yav632920cvqj";
type = "gem"; type = "gem";
}; };
version = "0.1.3"; version = "0.1.4";
}; };
rkelly-remix = { rkelly-remix = {
groups = ["default"]; groups = ["default"];
@ -1096,10 +1136,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "12khgv5hx90a4dxqca2hzbksalx9czb51bsz0bhq0czsql9pwby8"; sha256 = "05nfdv5isk3g13qhzm6axg70bghg1z5nbsl04dwqqhaifjys0dhf";
type = "gem"; type = "gem";
}; };
version = "2.3.0"; version = "2.5.0";
}; };
ruby-rc4 = { ruby-rc4 = {
groups = ["default"]; groups = ["default"];
@ -1126,10 +1166,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0fsdnvisswchk27knii6ijq8sjsc7qm9jiffdsf71q195ga2qi66"; sha256 = "0px84i3d9kqb40ff7nk3k7hb3w3kk80w5zsgi61svgddp1dbzh1n";
type = "gem"; type = "gem";
}; };
version = "2.0.6"; version = "2.0.7";
}; };
rubyntlm = { rubyntlm = {
groups = ["default"]; groups = ["default"];
@ -1206,10 +1246,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
type = "gem"; type = "gem";
}; };
version = "1.7.2"; version = "1.8.0";
}; };
thor = { thor = {
groups = ["default"]; groups = ["default"];
@ -1246,30 +1286,30 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0w0bjn6k38xv46mr02p3038gwk5jj5hl398bv5kr625msxkdhqzn"; sha256 = "15iaxz9iak5643bq2bc0jkbjv8w2zn649lxgvh5wg48q9d4blw13";
type = "gem"; type = "gem";
}; };
version = "1.6.2.1"; version = "1.7.0";
}; };
tzinfo = { tzinfo = {
groups = ["default"]; groups = ["default"];
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";
}; };
tzinfo-data = { tzinfo-data = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a"; sha256 = "131dgg2sz3j15vp71xaijlb72nlii9fn8v5dc4vr6q7hrdq4kjf4";
type = "gem"; type = "gem";
}; };
version = "1.2020.4"; version = "1.2020.6";
}; };
unf = { unf = {
groups = ["default"]; groups = ["default"];
@ -1346,9 +1386,19 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683"; sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1";
type = "gem"; type = "gem";
}; };
version = "0.3.0"; version = "0.3.1";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
type = "gem";
};
version = "2.4.2";
}; };
} }

4
pkgs/tools/text/diffstat/default.nix
View File

@ -1,14 +1,14 @@
{ fetchurl, lib, stdenv }: { fetchurl, lib, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "diffstat-1.63"; name = "diffstat-1.64";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"ftp://ftp.invisible-island.net/diffstat/${name}.tgz" "ftp://ftp.invisible-island.net/diffstat/${name}.tgz"
"https://invisible-mirror.net/archives/diffstat/${name}.tgz" "https://invisible-mirror.net/archives/diffstat/${name}.tgz"
]; ];
sha256 = "0vyw200s5dv1257pmrh6c6fdkmw3slyz5szpqfx916xr04sdbpby"; sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w=";
}; };
meta = with lib; { meta = with lib; {

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

@ -2432,6 +2432,8 @@ in
klipper = callPackage ../servers/klipper { }; klipper = callPackage ../servers/klipper { };
klog = qt5.callPackage ../applications/radio/klog { };
lcdproc = callPackage ../servers/monitoring/lcdproc { }; lcdproc = callPackage ../servers/monitoring/lcdproc { };
languagetool = callPackage ../tools/text/languagetool { }; languagetool = callPackage ../tools/text/languagetool { };
@ -4427,6 +4429,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
git-hound = callPackage ../tools/security/git-hound { };
git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { }; git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { };
@ -4539,6 +4543,8 @@ in
gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { }; gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };
gitleaks = callPackage ../tools/security/gitleaks { };
gitaly = callPackage ../applications/version-management/gitlab/gitaly { gitaly = callPackage ../applications/version-management/gitlab/gitaly {
ruby = ruby_2_7; ruby = ruby_2_7;
}; };

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

@ -7932,6 +7932,8 @@ in {
uritools = callPackage ../development/python-modules/uritools { }; uritools = callPackage ../development/python-modules/uritools { };
url-normalize = callPackage ../development/python-modules/url-normalize { };
urlgrabber = callPackage ../development/python-modules/urlgrabber { }; urlgrabber = callPackage ../development/python-modules/urlgrabber { };
urllib3 = callPackage ../development/python-modules/urllib3 { }; urllib3 = callPackage ../development/python-modules/urllib3 { };