Merge branch 'master' into staging-next

This commit is contained in:
Martin Weinelt 2021-04-16 01:32:09 +02:00 committed by GitHub
commit cd7a519012
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 753 additions and 203 deletions

View file

@ -211,6 +211,7 @@ in
users = optionalAttrs (cfg.user == defaultUser) {
users.${defaultUser} = {
isSystemUser = true;
group = defaultUser;
home = cfg.dataDir;
};

View file

@ -1,40 +1,47 @@
{ stdenv
, lib
, fetchurl
, fetchFromGitHub
, autoreconfHook
, perl
, pkg-config
, libsidplayfp
, alsaSupport ? stdenv.hostPlatform.isLinux
, alsaLib
, pulseSupport ? stdenv.hostPlatform.isLinux
, libpulseaudio
, out123Support ? stdenv.hostPlatform.isDarwin
, mpg123
}:
assert alsaSupport -> alsaLib != null;
assert pulseSupport -> libpulseaudio != null;
let
inherit (lib) optional;
inherit (lib.versions) majorMinor;
in
stdenv.mkDerivation rec {
pname = "sidplayfp";
version = "2.0.2";
version = "2.1.1";
src = fetchurl {
url = "mirror://sourceforge/sidplay-residfp/sidplayfp/${majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "1s2dfs9z1hwarpfzawg11wax9nh0zcqx4cafwq7iysckyg4scz4k";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "sidplayfp";
rev = "v${version}";
sha256 = "0s3xmg3yzfqbsnlh2y46w7b5jim5zq7mshs6hx03q8wdr75cvwh4";
};
nativeBuildInputs = [ pkg-config ]
++ optional alsaSupport alsaLib
++ optional pulseSupport libpulseaudio;
nativeBuildInputs = [ autoreconfHook perl pkg-config ];
buildInputs = [ libsidplayfp ];
buildInputs = [ libsidplayfp ]
++ lib.optional alsaSupport alsaLib
++ lib.optional pulseSupport libpulseaudio
++ lib.optional out123Support mpg123;
configureFlags = lib.optionals out123Support [
"--with-out123"
];
enableParallelBuilding = true;
meta = with lib; {
description = "A SID player using libsidplayfp";
homepage = "https://sourceforge.net/projects/sidplay-residfp/";
homepage = "https://github.com/libsidplayfp/sidplayfp";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ dezgeg ];
platforms = with platforms; linux;
maintainers = with maintainers; [ dezgeg OPNA2608 ];
platforms = platforms.all;
};
}

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "openethereum";
version = "3.2.1";
version = "3.2.3";
src = fetchFromGitHub {
owner = "openethereum";
repo = "openethereum";
rev = "v${version}";
sha256 = "sha256-+bzMo0s+wdp8T/YjPk6mrPSPid1G8WScB8FJhXdL9JQ=";
sha256 = "1j7wfgpnvf9pcprd53sbd3pa7yz9588z81i1bx12wmj1fja3xa0j";
};
cargoSha256 = "sha256-ibjjJ5zGF6wbO24/RoYKsTYsMNXHb1EdekDwSICPc5g=";
cargoSha256 = "0ha18caw8mxzrh984y2z148cmdijrjxf0rc8j4ccwvmrbdsaz1xn";
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
nativeBuildInputs = [

View file

@ -1,25 +1,26 @@
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper
, fetchpatch, cargo, pkg-config, curl, coreutils, boost174, db62, hexdump
, libsodium, libevent, utf8cpp, util-linux, withWallet ? true, withDaemon ? true
, withUtils ? true
, cargo, pkg-config, curl, coreutils, boost174, db62, hexdump, libsodium
, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true
, withUtils ? true, withWallet ? true, withZmq ? true, zeromq
}:
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
pname = "zcash";
version = "4.3.0";
version = "4.4.0";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
sha256 = "00pn1jw8j90y7i8nc92b51znz4gczphvdzbkbcjx63cf6vk7v4ks";
sha256 = "19vhblyqkaf1lapx8s4v88xjpslqmrd1jnar46rschzcz0mm9sq4";
};
cargoSha256 = "1rl9sjbvpfrv1mlyb04vw1935qx0kz9cs177xl7izdva1ixk9blr";
cargoSha256 = "1yiy1506ijndxb9bx79p7fkfvw1c5zdsljil4m55xz1mv8dzhbgm";
nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];
buildInputs = [ boost174 libevent libsodium utf8cpp ]
++ lib.optional withWallet db62;
++ lib.optional withWallet db62
++ lib.optional withZmq zeromq;
# Use the stdenv default phases (./configure; make) instead of the
# ones from buildRustPackage.
@ -28,14 +29,6 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
checkPhase = "checkPhase";
installPhase = "installPhase";
patches = [
# See https://github.com/zcash/zcash/pull/5015
(fetchpatch {
url = "https://github.com/zcash/zcash/commit/a0ac27ec6ed434a233c7ad2468258f6e6e7e9688.patch";
sha256 = "0pmx1spql9p8vvpjgw7qf3qy46f4mh9ni16bq4ss1xz1z9zgjc4k";
})
];
postPatch = ''
# Have to do this here instead of in preConfigure because
# cargoDepsCopy gets unset after postPatch.
@ -49,7 +42,8 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
] ++ lib.optional (!withWallet) "--disable-wallet"
++ lib.optional (!withDaemon) "--without-daemon"
++ lib.optional (!withUtils) "--without-utils";
++ lib.optional (!withUtils) "--without-utils"
++ lib.optional (!withMining) "--disable-mining";
enableParallelBuilding = true;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gh";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "03i1x1j07vpq81c9dmpvpya21hwz9q54zm4przvc12jadgb31y1i";
sha256 = "1nrbz049nizrrfxdpws05gj0bqk47l4mrl4wcvfb6nwispc74ib0";
};
vendorSha256 = "0j2jy7n7hca5ybwwgh7cvm77j96ngaq1a1l5bl70vjpd8hz2qapc";

View file

@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv }:
let
version = "0.23.0";
version = "0.24.2";
suffix = {
x86_64-linux = "x86_64";
@ -9,33 +9,28 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
fetchbin = name: sha256: fetchurl {
url = "${baseurl}/v${version}/${name}-v${version}-${suffix}";
dlbin = sha256: fetchurl {
url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz";
sha256 = sha256."${stdenv.hostPlatform.system}";
};
firecracker-bin = fetchbin "firecracker" {
x86_64-linux = "11h6qkq55y1w0mlkfkbnpxxai73rzxkiz07i747m7a9azbrmldp8";
aarch64-linux = "0zyx7md54w0fhqk1anfyjfdqrkg2mjyy17y9jk17p34yrw8j9y29";
};
jailer-bin = fetchbin "jailer" {
x86_64-linux = "15slr2azqvyqlhvlh7zk1n0rkfq282kj0pllp19r0yl1w8ns1gw5";
aarch64-linux = "1d92jhd6fb7w7ciz15rcfp8jf74r2503w2fl1b6pznpc8h4qscfd";
};
in
stdenv.mkDerivation {
pname = "firecracker";
inherit version;
srcs = [ firecracker-bin jailer-bin ];
unpackPhase = ":";
sourceRoot = ".";
src = dlbin {
x86_64-linux = "0l7x9sfyx52n0mwrmicdcnhm8z10q57kk1a5wf459l8lvp59xw08";
aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b";
};
configurePhase = ":";
buildPhase = ''
cp ${firecracker-bin} firecracker
cp ${jailer-bin} jailer
mv firecracker-* firecracker
mv jailer-* jailer
chmod +x firecracker jailer
'';

View file

@ -0,0 +1,24 @@
{ lib, fetchzip }:
let
version = "unstable-2019-12-05";
repo = "CourierPrime";
rev = "7f6d46a766acd9391d899090de467c53fd9c9cb0";
in fetchzip rec {
name = "courier-prime-${version}";
url = "https://github.com/quoteunquoteapps/${repo}/archive/${rev}/${name}.zip";
sha256 = "1xh4pkksm6zrafhb69q4lq093q6pl245zi9qhqw3x6c1ab718704";
postFetch = ''
unzip $downloadedFile
install -m444 -Dt $out/share/fonts/truetype ${repo}-${rev}/fonts/ttf/*.ttf
'';
meta = with lib; {
description = "Monospaced font designed specifically for screenplays";
homepage = "https://github.com/quoteunquoteapps/CourierPrime";
license = licenses.ofl;
maintainers = [ maintainers.austinbutler ];
platforms = platforms.all;
};
}

View file

@ -1,10 +1,10 @@
{ lib, fetchzip, version ? "3.000" }:
{ lib, fetchzip, version ? "3.100" }:
let
new = lib.versionAtLeast version "3.000";
sha256 = {
"2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z";
"3.000" = "12sd2mjqb80ijc73y7p0iw6j3wy9i60a3aar3ywrxz4khpya48jw";
"3.100" = "0svnc7l3z3vvm27zx6msyx56n2fpv6ywb5lm75bym48slkccypn7";
}."${version}";
in fetchzip rec {

View file

@ -22,9 +22,9 @@ let
sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
};
nativeBuildInputs = [ pkg-config autoconf unzip ];
nativeBuildInputs = [ pkg-config autoconf ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [

View file

@ -0,0 +1,164 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
, file, which, unzip, zip, perl, cups, freetype, alsaLib, libjpeg, giflib
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap
, setJavaClassPath
, headless ? false
, enableJavaFX ? openjfx.meta.available, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:
let
version = {
feature = "16";
interim = "0";
build = "36";
};
openjdk = stdenv.mkDerivation {
pname = "openjdk" + lib.optionalString headless "-headless";
version = "${version.feature}+${version.build}";
src = fetchFromGitHub {
owner = "openjdk";
repo = "jdk${version.feature}u";
rev = "jdk-${version.feature}+${version.build}";
sha256 = "165nr15dqfcxzsl5z95g4iklln4rlfkgdigdma576mx8813ldi44";
};
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
];
patches = [
./fix-java-home-jdk10.patch
./read-truststore-from-env-jdk10.patch
./currency-date-range-jdk10.patch
./increase-javadoc-heap-jdk13.patch
# -Wformat etc. are stricter in newer gccs, per
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
# so grab the work-around from
# https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
(fetchurl {
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
})
] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk13.patch
];
prePatch = ''
chmod +x configure
patchShebangs --build configure
'';
configureFlags = [
"--with-boot-jdk=${openjdk16-bootstrap.home}"
"--with-version-build=${version.build}"
"--with-version-opt=nixos"
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"
"--with-zlib=system"
"--with-lcms=system"
"--with-stdc++lib=dynamic"
] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
++ lib.optional headless "--enable-headless-only"
++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
separateDebugInfo = true;
NIX_CFLAGS_COMPILE = "-Wno-error";
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
]);
buildFlags = [ "all" ];
installPhase = ''
mkdir -p $out/lib
mv build/*/images/jdk $out/lib/openjdk
# Remove some broken manpages.
rm -rf $out/lib/openjdk/man/ja*
# Mirror some stuff in top-level.
mkdir -p $out/share
ln -s $out/lib/openjdk/include $out/include
ln -s $out/lib/openjdk/man $out/share/man
ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
# Remove crap from the installation.
rm -rf $out/lib/openjdk/demo
${lib.optionalString headless ''
rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
''}
ln -s $out/lib/openjdk/bin $out/bin
'';
preFixup = ''
# Propagate the setJavaClassPath setup hook so that any package
# that depends on the JDK has $CLASSPATH set up properly.
mkdir -p $out/nix-support
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat <<EOF > $out/nix-support/setup-hook
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
EOF
'';
postFixup = ''
# Build the set of output library directories to rpath against
LIBDIRS=""
for output in $outputs; do
if [ "$output" = debug ]; then continue; fi
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
done
# Add the local library paths to remove dependencies on the bootstrap
for output in $outputs; do
if [ "$output" = debug ]; then continue; fi
OUTPUTDIR=$(eval echo \$$output)
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
echo "$BINLIBS" | while read i; do
patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
patchelf --shrink-rpath "$i" || true
done
done
'';
disallowedReferences = [ openjdk16-bootstrap ];
meta = with lib; {
homepage = "https://openjdk.java.net/";
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
};
passthru = {
architecture = "";
home = "${openjdk}/lib/openjdk";
inherit gtk3;
};
};
in openjdk

View file

@ -7,12 +7,12 @@ let
};
jdk = stdenv.mkDerivation rec {
pname = "zulu15.28.51-ca-jdk";
version = "15.0.1";
pname = "zulu16.28.11-ca-jdk";
version = "16.0.0";
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/${pname}${version}-macosx_x64.tar.gz";
sha256 = "0h738pbnwcn7pjp0qyryzazqj5nw5sy2f8l0ycl39crm9ia6akvh";
sha256 = "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};

View file

@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
version = "0.1.4";
src = fetchurl {
url = "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz";
urls = [
"https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"
"https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz"
];
hash = "sha256-C0rgwK51Ij9EZCm9GeiVnWIkEkse0d60ok8G9hm2a5U=";
};

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, perl
}:
stdenv.mkDerivation rec {
@ -8,22 +9,39 @@ stdenv.mkDerivation rec {
version = "2.3.11";
src = fetchurl {
url = "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz";
urls = [
"https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"
"https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz"
];
hash = "sha256-MvIWTJnjBSGOmSlwhW3Y4jCbXLasR1jXsq/jv+vJAS0=";
};
checkInputs = [ perl ];
dontConfigure = true;
postPatch = ''
substituteInPlace Makefile \
--replace "DESTDIR" "PREFIX" \
--replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \
--replace "LDD = gcc" "LDD = ${stdenv.cc.targetPrefix}cc" \
--replace "LD = gcc" "LD = ${stdenv.cc.targetPrefix}cc" \
--replace "CFLAGS = -O2" "CFLAGS ?=" \
--replace "LDFLAGS = -lc" "LDFLAGS ?= -lc"
'';
makeFlags = [ "PREFIX=${placeholder "out"}" ];
makeFlags = [
"DESTDIR:=${placeholder "out"}"
];
enableParallelBuilding = true;
doCheck = true;
# Running tests in parallel does not work
enableParallelChecking = false;
preCheck = ''
patchShebangs tests
'';
meta = with lib; {
homepage = "https://www.floodgap.com/retrotech/xa/";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mujs";
version = "1.0.9";
version = "1.1.1";
src = fetchurl {
url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
sha256 = "sha256-zKjWafQtO2OEPelF370s5KkArbT+gQv3lQQpYdGw6HY=";
sha256 = "sha256-meYfyWGfHVULVjVyA7NJ2Ih9CjbffblWc1yijU/3e7A=";
};
buildInputs = [ readline ];
@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
description = "A lightweight, embeddable Javascript interpreter";
platforms = platforms.unix;
maintainers = with maintainers; [ pSub ];
license = licenses.gpl3;
license = licenses.isc;
};
}

View file

@ -0,0 +1,33 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config
, libqb, libxml2, libnl, lksctp-tools
, nss, openssl, bzip2, lzo, lz4, xz, zlib, zstd
, doxygen
}:
stdenv.mkDerivation rec {
pname = "kronosnet";
version = "1.20";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-lP5W+4b9McU2Uqibh2SucIu2y4KluO3B1RpAJKgYq/M=";
};
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
buildInputs = [
libqb libxml2 libnl lksctp-tools
nss openssl
bzip2 lzo lz4 xz zlib zstd
];
meta = with lib; {
description = "VPN on steroids";
homepage = "https://kronosnet.org/";
license = with licenses; [ lgpl21Plus gpl2Plus ];
maintainers = with maintainers; [ ryantm ];
};
}

View file

@ -0,0 +1,47 @@
{ stdenv
, lib
, fetchFromGitHub
, autoreconfHook
, pkg-config
, docSupport ? true
, doxygen
, libftdi1
}:
stdenv.mkDerivation rec {
pname = "libexsid";
version = "2.1";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "exsid-driver";
rev = version;
sha256 = "1qbiri549fma8c72nmj3cpz3sn1vc256kfafnygkmkzg7wdmgi7r";
};
outputs = [ "out" ]
++ lib.optional docSupport "doc";
nativeBuildInputs = [ autoreconfHook pkg-config ]
++ lib.optional docSupport doxygen;
buildInputs = [ libftdi1 ];
enableParallelBuilding = true;
installTargets = [ "install" ]
++ lib.optional docSupport "doc";
postInstall = lib.optionalString docSupport ''
mkdir -p $doc/share/libexsid/doc
cp -r docs/html $doc/share/libexsid/doc/
'';
meta = with lib; {
description = "Driver for exSID USB";
homepage = "http://hacks.slashdirt.org/hw/exsid/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;
};
}

View file

@ -1,45 +1,88 @@
{ stdenv
, lib
, fetchurl
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, pkg-config
, perl
, unittest-cpp
, xa
, libgcrypt
, libexsid
, docSupport ? true
, doxygen ? null
, graphviz ? null
, doxygen
, graphviz
}:
assert docSupport -> doxygen != null && graphviz != null;
let
inherit (lib) optionals optionalString;
inherit (lib.versions) majorMinor;
in
stdenv.mkDerivation rec {
pname = "libsidplayfp";
version = "2.0.5";
version = "2.1.1";
src = fetchurl {
url = "mirror://sourceforge/sidplay-residfp/${pname}/${majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "libsidplayfp";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0487gap2b0ypikyra74lk1qwqwr0vncldamk5xb1db2x97v504fd";
};
nativeBuildInputs = [ pkg-config ]
++ optionals docSupport [ doxygen graphviz ];
# https://github.com/libsidplayfp/libsidplayfp/issues/13
# Remove on next version bump
patches = [
(fetchpatch {
url = "https://github.com/libsidplayfp/libsidplayfp/commit/84f5498f5653261ed84328e1b5676c31e3ba9e6e.patch";
sha256 = "1vysbl4fkdzm11k40msng2ag6i6mb6z9jsw32vyj9calcfha5957";
})
(fetchpatch {
url = "https://github.com/libsidplayfp/libsidplayfp/commit/c1a1b732cc2e791d910522d58f47c6d094493c6d.patch";
sha256 = "1d3sgdly0q9dysgkx5afxbwfas6p0m8n3lw1hmj4n6wm3j9sdz4g";
})
];
postPatch = ''
patchShebangs .
'';
nativeBuildInputs = [ autoreconfHook pkg-config perl xa ]
++ lib.optionals docSupport [ doxygen graphviz ];
buildInputs = [ libgcrypt libexsid ];
doCheck = true;
checkInputs = [ unittest-cpp ];
enableParallelBuilding = true;
installTargets = [ "install" ]
++ optionals docSupport [ "doc" ];
++ lib.optionals docSupport [ "doc" ];
outputs = [ "out" ]
++ optionals docSupport [ "doc" ];
++ lib.optionals docSupport [ "doc" ];
postInstall = optionalString docSupport ''
configureFlags = [
"--enable-hardsid"
"--with-gcrypt"
"--with-exsid"
]
++ lib.optional doCheck "--enable-tests";
postInstall = lib.optionalString docSupport ''
mkdir -p $doc/share/doc/libsidplayfp
mv docs/html $doc/share/doc/libsidplayfp/
'';
meta = with lib; {
description = "A library to play Commodore 64 music derived from libsidplay2";
homepage = "https://sourceforge.net/projects/sidplay-residfp/";
longDescription = ''
libsidplayfp is a C64 music player library which integrates
the reSID SID chip emulation into a cycle-based emulator
environment, constantly aiming to improve emulation of the
C64 system and the SID chips.
'';
homepage = "https://github.com/libsidplayfp/libsidplayfp";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; unix;
maintainers = with maintainers; [ ramkromberg OPNA2608 ];
platforms = platforms.all;
};
}

View file

@ -2,22 +2,19 @@
stdenv.mkDerivation rec {
pname = "wcslib";
version = "7.5";
version = "7.6";
src = fetchurl {
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
sha256 = "1536gmcpm6pckn9xrb6j8s4pm1vryjhzvhfaj9wx3jwxcpbdy0dw";
sha256 = "sha256-VLuMkhZ6fxP4qnP8S4oJeFJW0smCE0Z968eigqQxMYs=";
};
buildInputs = [ flex ];
prePatch = ''
substituteInPlace GNUmakefile --replace 2775 0775
substituteInPlace C/GNUmakefile --replace 2775 0775
'';
nativeBuildInputs = [ flex ];
enableParallelBuilding = true;
outputs = [ "out" "man" ];
meta = with lib; {
homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/";
description = "World Coordinate System library for astronomy";

View file

@ -8,20 +8,22 @@
, nose
, pyopenssl
, pytestCheckHook
, pythonOlder
, pythonAtLeast
, pytz
, tzlocal
}:
buildPythonPackage rec {
pname = "aioimaplib";
version = "0.7.18";
version = "0.8.0";
disabled = pythonAtLeast "3.9";
src = fetchFromGitHub {
owner = "bamthomas";
repo = pname;
rev = version;
sha256 = "037fxwmkdfb95cqcykrhn37p138wg9pvlsgdf45vyn1mhz5crky5";
sha256 = "sha256-ume25EwLNB6szokHXonDXHGKVK76CiZYOBXVUf37/x8=";
};
checkInputs = [
@ -36,9 +38,6 @@ buildPythonPackage rec {
tzlocal
];
# Project is using asynctest with doesn't work with Python 3.8 and above
# https://github.com/bamthomas/aioimaplib/issues/54
doCheck = pythonOlder "3.8";
pythonImportsCheck = [ "aioimaplib" ];
meta = with lib; {

View file

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "beautifultable";
version = "1.0.1";
src = fetchFromGitHub {
owner = "pri22296";
repo = pname;
rev = "v${version}";
sha256 = "12ci6jy8qmbphsvzvj98466nlhclfzs0a0pmbsv3mf5bfcdwvbh7";
};
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "test.py" ];
pythonImportsCheck = [ "beautifultable" ];
meta = with lib; {
description = "Python package for printing visually appealing tables";
homepage = "https://github.com/CERT-Polska/mwdblib";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, chardet
, fetchFromGitHub
, karton-core
, mwdblib
, python
}:
buildPythonPackage rec {
pname = "karton-mwdb-reporter";
version = "1.0.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "0ks8jrc4v87q6zhwqg40w6xv2wfkzslmnfmsmmkfjj8mak8nk70f";
};
propagatedBuildInputs = [
karton-core
mwdblib
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "karton-core==4.0.4" "karton-core" \
--replace "mwdblib==3.3.1" "mwdblib"
'';
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "karton.mwdb_reporter" ];
meta = with lib; {
description = "Karton service that uploads analyzed artifacts and metadata to MWDB Core";
homepage = "https://github.com/CERT-Polska/karton-mwdb-reporter";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,49 @@
{ lib
, beautifultable
, buildPythonPackage
, click
, click-default-group
, fetchFromGitHub
, humanize
, keyring
, python
, python-dateutil
, requests
}:
buildPythonPackage rec {
pname = "mwdblib";
version = "3.4.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "0dbdmps4a3mav02m4h37bj2bw8pg6h52yf3gpdkhi3k9hl9f942h";
};
propagatedBuildInputs = [
beautifultable
click
click-default-group
humanize
keyring
python-dateutil
requests
];
checkPhase = ''
runHook preCheck
${python.interpreter} -m unittest discover
runHook postCheck
'';
pythonImportsCheck = [ "mwdblib" ];
meta = with lib; {
description = "Python client library for the mwdb service";
homepage = "https://github.com/CERT-Polska/mwdblib";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -2,11 +2,12 @@
, buildPythonPackage
, fetchPypi
, isPy3k
, dask
, numba
, numpy
, scipy
, numba
, pytest
# Test Inputs
, pytestCheckHook
, dask
}:
buildPythonPackage rec {
@ -20,20 +21,20 @@ buildPythonPackage rec {
sha256 = "2c95c3b8ee00211a5aa4ef5e46006d25bf35009a66e406b7ea9b25b327fb9516";
};
checkInputs = [ pytest dask ];
propagatedBuildInputs = [
numba
numpy
scipy
numba
];
checkInputs = [ pytestCheckHook dask ];
checkPhase = ''
pytest sparse
'';
pythonImportsCheck = [ "sparse" ];
meta = with lib; {
description = "Sparse n-dimensional arrays computations";
homepage = "https://github.com/pydata/sparse/";
homepage = "https://sparse.pydata.org/en/stable/";
changelog = "https://sparse.pydata.org/en/stable/changelog.html";
downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
};

View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, six
, tldextract
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "surt";
version = "0.3.1";
src = fetchFromGitHub {
owner = "internetarchive";
repo = "surt";
rev = "6934c321b3e2f66af9c001d882475949f00570c5"; # Has no git tag
sha256 = "sha256-pSMNpFfq2V0ANWNFPcb1DwPHccbfddo9P4xZ+ghwbz4=";
};
propagatedBuildInputs = [
six
tldextract
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "surt" ];
meta = with lib; {
description = "Sort-friendly URI Reordering Transform (SURT) python module";
homepage = "https://github.com/internetarchive/surt";
license = licenses.agpl3Only;
maintainers = with maintainers; [ Luflosi ];
};
}

View file

@ -394,10 +394,6 @@ in
'';
};
mimemagic = attrs: {
FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}/share/mime/packages/freedesktop.org.xml";
};
msgpack = attrs: {
buildInputs = [ msgpack ];
};

View file

@ -14,13 +14,13 @@
buildGoModule rec {
pname = "skopeo";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
sha256 = "sha256-7FHfqDgc91BdtbvcElZDWj2jXD2LcMPo9RLnYZe3Xw8=";
sha256 = "sha256-GhLw8wt5eDixKNGtxGA0Fjw3auQ3AsjKa+0M4mLTQlg=";
};
outputs = [ "out" "man" ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "devilutionx";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "diasurgical";
repo = "devilutionX";
rev = version;
sha256 = "034xkz0a7j2nba17mh44r0kamcblvykdwfsjvjwaz2mrcsmzkr9z";
sha256 = "sha256-PgYlNO1p78d0uiL474bDJOL++SxJfeBLK65czdaylHU=";
};
postPatch = ''

View file

@ -1,13 +1,14 @@
{ appimageTools, lib, fetchurl, makeDesktopItem }:
let
name = "lunar-client";
version = "2.4.0";
version = "2.6.0";
desktopItem = makeDesktopItem {
name = "Lunar Client";
exec = "lunar-client";
icon = "lunarclient";
comment = "Optimized Minecraft Client for 1.7.10 and 1.8.9";
comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client";
desktopName = "Lunar Client";
genericName = "Minecraft Client";
categories = "Game;";
@ -20,7 +21,7 @@ let
src = fetchurl {
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
name = "lunar-client.AppImage";
sha256 = "bb85a62127a9b3848cc60796c20ac75655794f1d3cd17cb6b5499bbf19d16019";
sha256 = "1pmblnnvs5jv5v7y5nnxr3liw9xfp5h6l44x7pln8kr9zg85dzma";
};
in appimageTools.wrapType1 rec {
inherit name src;
@ -31,11 +32,13 @@ in appimageTools.wrapType1 rec {
cp -r ${appimageContents}/usr/share/icons/ $out/share/
'';
extraPkgs = pkgs: [ pkgs.libpulseaudio ];
meta = with lib; {
description = "Minecraft 1.7.10 & 1.8.9 PVP Client";
description = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client";
homepage = "https://www.lunarclient.com/";
license = with licenses; [ unfree ];
maintainers = with maintainers; [ zyansheep ];
maintainers = with maintainers; [ zyansheep Technical27 ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
mktplcRef = {
name = "vsliveshare";
publisher = "ms-vsliveshare";
version = "1.0.4116";
sha256 = "1wrqmsrrc80agrw5ii4vcp2v6gzps9hvpjizwn30p0vf43mmw3mj";
version = "1.0.4131";
sha256 = "167fwb1nri9xs5bx14zdg2q3fsmlbihcvnk90fv9av8zirpwa3vs";
};
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
nativeBuildInputs = nativeBuildInputs ++ [

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.11.13";
version = "5.11.14";
suffix = "lqx1";
in
@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "1yx0l90happm6g2cx1ar4lbhfv3a2aalpwhjqyzc8b15af0h0ddv";
sha256 = "0kgr6c3mpc9nmg4m2qfk58bji95paq3jwqsyl3h55xk40gshka32";
};
extraMeta = {

View file

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.11.13";
version = "5.11.14";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@ -12,7 +12,7 @@ in
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-LUbkccAfDS0/FnNhHn64bkC8qwBD0NKcdZRzNoSw4uA=";
sha256 = "sha256-kRbU1jheZi2U6mfNyhBFn3FJ7fjYkNUVwkx3w/DZNQI=";
extraPostFetch = ''
rm $out/.config
'';

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
let
version = "5.11.13";
version = "5.11.14";
suffix = "zen1";
in
@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "1m95kqi2njm4cdixy7rwmycdbg386nidrk3xr4qqm64wych9bqn8";
sha256 = "1n49h9s3jyvrdy662b6j9xjbmhxxdczk980vrlgs09fg5ny0k59a";
};
extraMeta = {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nss, nspr, libqb
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, kronosnet, nss, nspr, libqb
, dbus, rdma-core, libstatgrab, net-snmp
, enableDbus ? false
, enableInfiniBandRdma ? false
@ -10,17 +10,17 @@ with lib;
stdenv.mkDerivation rec {
pname = "corosync";
version = "2.4.5";
version = "3.1.2";
src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz";
sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb";
sha256 = "sha256-eAypUbDeGa3GKF/wJ602dyTW5FlkvjWeCRXT6h0d4zw=";
};
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [
nss nspr libqb
kronosnet nss nspr libqb
] ++ optional enableDbus dbus
++ optional enableInfiniBandRdma rdma-core
++ optional enableMonitoring libstatgrab
@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
"LOGROTATEDIR=$(out)/etc/logrotate.d"
];
enableParallelBuilding = true;
preConfigure = optionalString enableInfiniBandRdma ''
# configure looks for the pkg-config files
# of librdmacm and libibverbs
@ -61,13 +63,11 @@ stdenv.mkDerivation rec {
--prefix PATH ":" "$out/sbin:${libqb}/sbin"
'';
enableParallelBuilding = true;
meta = {
homepage = "http://corosync.org/";
description = "A Group Communication System with features for implementing high availability within applications";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ montag451 ];
maintainers = with maintainers; [ montag451 ryantm ];
};
}

View file

@ -0,0 +1,34 @@
{ stdenv, lib, fetchFromGitHub, installShellFiles }:
stdenv.mkDerivation rec {
pname = "cpufetch";
version = "0.94";
src = fetchFromGitHub {
owner = "Dr-Noob";
repo = "cpufetch";
rev = "v${version}";
sha256 = "1gncgkhqd8bnz254qa30yyl10qm28dwx6aif0dwrj38z5ql40ck9";
};
nativeBuildInputs = [ installShellFiles ];
installPhase = ''
runHook preInstall
mkdir $out
install -Dm755 cpufetch $out/bin/cpufetch
install -Dm644 LICENSE $out/share/licenses/cpufetch/LICENSE
installManPage cpufetch.8
runHook postInstall
'';
meta = with lib; {
description = "Simplistic yet fancy CPU architecture fetching tool";
license = licenses.mit;
homepage = "https://github.com/Dr-Noob/cpufetch";
changelog = "https://github.com/Dr-Noob/cpufetch/releases/tag/v${version}";
maintainers = with maintainers; [ devhell ];
};
}

View file

@ -1,16 +1,25 @@
{ lib, stdenv, fetchurl, openssl, zlib }:
{ lib
, stdenv
, fetchurl
, openssl
, zlib
}:
stdenv.mkDerivation rec {
name = "siege-4.0.7";
pname = "siege";
version = "4.0.8";
src = fetchurl {
url = "http://download.joedog.org/siege/${name}.tar.gz";
sha256 = "1y3dnl1ziw0c0d4nw30aj0sdmjvarn4xfxgfkswffwnkm8z5p9xz";
url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz";
sha256 = "01qhw52kyqwidp5bckw4xmz4ldqdwkjci7k421qm68kk0mx9l48g";
};
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
buildInputs = [ openssl zlib ];
buildInputs = [
openssl
zlib
];
prePatch = ''
sed -i -e 's/u_int32_t/uint32_t/g' -e '1i#include <stdint.h>' src/hash.c

View file

@ -3,22 +3,22 @@
}:
let
version = "4.37.0";
version = "4.37.3";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
sha256 = "00bw91n7210gsnc7bw2spl6k1yl2i7d1j55w98qf4rvn80z9d59r";
sha256 = "0gbkjlrx4ddaxb5f21m3sxbb55ilvm5kqlrys6ckrx0xyz9hj38y";
};
vendorSha256 = "sha256-sc001qWdmhhaUh0nmvaqwwVE2Ee8IFWYi4K8aAURWBE=";
vendorSha256 = "sha256-hPzIAXImAEJux1VRqCgslgn8giTf9BgZBcEZyF4Ut9Y=";
assets = {
# MIT licensed
"geoip.dat" = let
geoipRev = "202104010913";
geoipSha256 = "1kq6d68ii9hr2w0caxacqh5q8jran154b99aik4g7ripgx7lckpr";
geoipRev = "202104150006";
geoipSha256 = "0ppm5r4bycjm7q0vnxj62q8639kp06sfkkkrkk5gibyrwisr4vrp";
in fetchurl {
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
@ -26,8 +26,8 @@ let
# MIT licensed
"geosite.dat" = let
geositeRev = "20210403111045";
geositeSha256 = "1b64yci0dmvw9divfv3njpzczz2ag3cnvyr29c2mk8y85vp05ysc";
geositeRev = "20210415054336";
geositeSha256 = "0vs9fjbw45ipi7minh0r8zgh3pbwxqlrhwahpwyc6s0hyxgdi40w";
in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;

View file

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

View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 5cba6ecd3c745f45290400f0705400f26913852e
ref: refs/tags/6.0.39
revision: fb842915658f23b8997aa2cab4c3a62f3170cbbd
ref: refs/tags/6.0.40
specs:
metasploit-framework (6.0.39)
metasploit-framework (6.0.40)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -30,9 +30,9 @@ GIT
metasploit-concern (~> 3.0.0)
metasploit-credential (~> 4.0.0)
metasploit-model (~> 3.1.0)
metasploit-payloads (= 2.0.41)
metasploit-payloads (= 2.0.43)
metasploit_data_models (~> 4.1.0)
metasploit_payloads-mettle (= 1.0.8)
metasploit_payloads-mettle (= 1.0.9)
mqtt
msgpack
nessus_rest
@ -123,8 +123,8 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
aws-partitions (1.443.0)
aws-sdk-core (3.113.1)
aws-partitions (1.445.0)
aws-sdk-core (3.114.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
@ -138,7 +138,7 @@ GEM
aws-sdk-kms (1.43.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.93.0)
aws-sdk-s3 (1.93.1)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@ -212,7 +212,7 @@ GEM
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
metasploit-payloads (2.0.41)
metasploit-payloads (2.0.43)
metasploit_data_models (4.1.3)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -223,7 +223,7 @@ GEM
railties (~> 5.2.2)
recog (~> 2.0)
webrick
metasploit_payloads-mettle (1.0.8)
metasploit_payloads-mettle (1.0.9)
method_source (1.0.0)
mini_portile2 (2.5.0)
minitest (5.14.4)

View file

@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.39";
version = "6.0.40";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-9uoxxcuEJudJGRQfkVBUWDHoZ1sxaIb+Hjf/sEpcqik=";
sha256 = "sha256-QEaTHGCgBl1Lh6zZO1OSY3kS+6+xOr1lbHPNeS1DZZ8=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -114,20 +114,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vvav3449v3m0nyflcw07sbxlpgqf4pwa2fmirgjvc9r9asssi79";
sha256 = "1yvjc0vpcycr5plvkh63cjpivqi0slzq6sj60jllz8p99kli4xrj";
type = "gem";
};
version = "1.443.0";
version = "1.445.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i3x8p9gymc9977dcdkz5ca6mrmh7ym6p2mrscbh49nfd9gi5zg0";
sha256 = "09asbdcg96l165kq4hrks0hsk4hwr16h1qx22az4m7ld0ylvz3jc";
type = "gem";
};
version = "3.113.1";
version = "3.114.0";
};
aws-sdk-ec2 = {
groups = ["default"];
@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iy2f9z43pc6fgwmga2cz8nf9gy2pwcw4jib141vp8z8dhylqj94";
sha256 = "1x424hn32ipwxy21bhqn2wziz890w2gdr1xsli9lv2rrs1ibpnq7";
type = "gem";
};
version = "1.93.0";
version = "1.93.1";
};
aws-sigv4 = {
groups = ["default"];
@ -514,12 +514,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "5cba6ecd3c745f45290400f0705400f26913852e";
sha256 = "0adabi5b1zrp3vz8cs1ibdkyhcaqai8927ql354yf9l4rg2k3spn";
rev = "fb842915658f23b8997aa2cab4c3a62f3170cbbd";
sha256 = "17v58cnpkkbkdijvsfmimzxi4yb3j99kpndchx5ms1m0c0f96ij0";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.39";
version = "6.0.40";
};
metasploit-model = {
groups = ["default"];
@ -536,10 +536,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nnb6kidfm39qyhv694m7skbvmsp5sjw52633v89zq0ym4y5wld5";
sha256 = "1rr6g3gqjsvdjkqfbgpc3wfzpq367dk9zn3rzm8h9kd09hy3i760";
type = "gem";
};
version = "2.0.41";
version = "2.0.43";
};
metasploit_data_models = {
groups = ["default"];
@ -556,10 +556,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nq6wxsaghj0yqwn988z71d9f0qwglcrliwkgqr9f16vbbv33p36";
sha256 = "07l2ahb4c5ay6s5vbcfmipmya2qdj8i29blxk9vdmvs27yzkc8jk";
type = "gem";
};
version = "1.0.8";
version = "1.0.9";
};
method_source = {
groups = ["default"];

View file

@ -3620,6 +3620,8 @@ in
cpio = callPackage ../tools/archivers/cpio { };
cpufetch = callPackage ../tools/misc/cpufetch { };
crackxls = callPackage ../tools/security/crackxls { };
create-cycle-app = nodePackages.create-cycle-app;
@ -9035,9 +9037,7 @@ in
uwsgi = callPackage ../servers/uwsgi { };
v2ray = callPackage ../tools/networking/v2ray {
buildGoModule = buildGo115Module;
};
v2ray = callPackage ../tools/networking/v2ray { };
vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
@ -10740,27 +10740,33 @@ in
else
openjdk11.override { headless = true; };
openjdk15-bootstrap =
if adoptopenjdk-hotspot-bin-14.meta.available then
adoptopenjdk-hotspot-bin-14
openjdk16-bootstrap =
if adoptopenjdk-hotspot-bin-15.meta.available then
adoptopenjdk-hotspot-bin-15
else
/* adoptopenjdk not available for i686, so fall back to our old builds of 12, 13, & 14 for bootstrapping */
callPackage ../development/compilers/openjdk/14.nix {
callPackage ../development/compilers/openjdk/15.nix {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
inherit (gnome2) GConf gnome_vfs;
openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix {
openjdk15-bootstrap = callPackage ../development/compilers/openjdk/14.nix {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
inherit (gnome2) GConf gnome_vfs;
openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix {
stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
inherit (gnome2) GConf gnome_vfs;
openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix {
stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
inherit (gnome2) GConf gnome_vfs;
};
};
};
};
@ -10769,27 +10775,27 @@ in
jdk11_headless = openjdk11_headless;
/* Latest JDK */
openjdk15 =
openjdk16 =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk/darwin { }
else
callPackage ../development/compilers/openjdk {
callPackage ../development/compilers/openjdk/16.nix {
openjfx = openjfx15;
inherit (gnome2) GConf gnome_vfs;
};
openjdk15_headless =
openjdk16_headless =
if stdenv.isDarwin then
openjdk15
openjdk16
else
openjdk15.override { headless = true; };
openjdk16.override { headless = true; };
jdk15 = openjdk15;
jdk15_headless = openjdk15_headless;
jdk16 = openjdk16;
jdk16_headless = openjdk16_headless;
/* default JDK */
jdk = jdk15;
jdk = jdk16;
# Since the introduction of the Java Platform Module System in Java 9, Java
# no longer ships a separate JRE package.
@ -10798,13 +10804,13 @@ in
# 'jre_minimal' to build a bespoke JRE containing only the modules you need.
#
# For a general-purpose system, 'jre' defaults to the full JDK:
jre = jdk15;
jre_headless = jdk15_headless;
jre = jdk16;
jre_headless = jdk16_headless;
jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { };
openjdk = openjdk15;
openjdk_headless = openjdk15_headless;
openjdk = openjdk16;
openjdk_headless = openjdk16_headless;
inherit (callPackages ../development/compilers/graalvm {
gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc;
@ -15060,6 +15066,8 @@ in
krb5Full = krb5;
libkrb5 = krb5.override { type = "lib"; };
kronosnet = callPackage ../development/libraries/kronosnet { };
l-smash = callPackage ../development/libraries/l-smash {
stdenv = gccStdenv;
};
@ -15527,6 +15535,8 @@ in
libexosip = callPackage ../development/libraries/exosip {};
libexsid = callPackage ../development/libraries/libexsid { };
libextractor = callPackage ../development/libraries/libextractor {
libmpeg2 = mpeg2dec;
};
@ -15862,7 +15872,9 @@ in
libmilter = callPackage ../development/libraries/libmilter { };
libminc = callPackage ../development/libraries/libminc { };
libminc = callPackage ../development/libraries/libminc {
hdf5 = hdf5_1_10;
};
libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { };
@ -20978,6 +20990,8 @@ in
corefonts = callPackage ../data/fonts/corefonts { };
courier-prime = callPackage ../data/fonts/courier-prime { };
cozette = callPackage ../data/fonts/cozette { };
culmus = callPackage ../data/fonts/culmus { };

View file

@ -971,6 +971,8 @@ in {
beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { };
beautifultable = callPackage ../development/python-modules/beautifultable { };
bedup = callPackage ../development/python-modules/bedup { };
behave = callPackage ../development/python-modules/behave { };
@ -3497,6 +3499,8 @@ in {
karton-core = callPackage ../development/python-modules/karton-core { };
karton-mwdb-reporter = callPackage ../development/python-modules/karton-mwdb-reporter { };
karton-yaramatcher = callPackage ../development/python-modules/karton-yaramatcher { };
kazoo = callPackage ../development/python-modules/kazoo { };
@ -4217,6 +4221,8 @@ in {
mwclient = callPackage ../development/python-modules/mwclient { };
mwdblib = callPackage ../development/python-modules/mwdblib { };
mwoauth = callPackage ../development/python-modules/mwoauth { };
mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { };
@ -7627,6 +7633,8 @@ in {
surepy = callPackage ../development/python-modules/surepy { };
surt = callPackage ../development/python-modules/surt { };
survey = callPackage ../development/python-modules/survey { };
suseapi = callPackage ../development/python-modules/suseapi { };