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

Merge branch 'staging-next' into staging 

The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <1bdda029cd>
- apparmor rules rewritten <b280e64078>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
This commit is contained in:
Jan Tojnar 2021-05-06 08:42:50 +02:00
parent bc29d22a2c 305e1c9446
commit d9f177eb4d
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
73 changed files with 365 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/modules.nix
View File

@ -23,6 +23,7 @@ let
isAttrs isAttrs
isBool isBool
isFunction isFunction
isList
isString isString
length length
mapAttrs mapAttrs
@ -188,6 +189,9 @@ rec {
loadModule = args: fallbackFile: fallbackKey: m: loadModule = args: fallbackFile: fallbackKey: m:
if isFunction m || isAttrs m then if isFunction m || isAttrs m then
unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args) unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args)
else if isList m then
let defs = [{ file = fallbackFile; value = m; }]; in
throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}"
else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args); else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args);
/* /*
@ -515,20 +519,11 @@ rec {
# yield a value computed from the definitions # yield a value computed from the definitions
value = if opt ? apply then opt.apply res.mergedValue else res.mergedValue; value = if opt ? apply then opt.apply res.mergedValue else res.mergedValue;
# Issue deprecation warnings recursively over all nested types of the warnDeprecation =
# given type. But don't recurse if a type with the same name was already warnIf (opt.type.deprecationMessage != null)
# visited before in order to prevent infinite recursion. So this only "The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}";
# warns once per type name.
# Returns the new set of visited type names
recursiveWarn = visited: type:
let
maybeWarn = warnIf (type.deprecationMessage != null)
"The type `types.${type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${type.deprecationMessage}";
in
if visited ? ${type.name} then visited
else lib.foldl' recursiveWarn (maybeWarn visited // { ${type.name} = null; }) (lib.attrValues type.nestedTypes);
in builtins.seq (recursiveWarn {} opt.type) opt // in warnDeprecation opt //
{ value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
inherit (res.defsFinal') highestPrio; inherit (res.defsFinal') highestPrio;
definitions = map (def: def.value) res.defsFinal; definitions = map (def: def.value) res.defsFinal;

6
lib/tests/modules.sh
View File

@ -272,12 +272,6 @@ checkConfigError 'A definition for option .fun.\[function body\]. is not of type
checkConfigOutput "b a" config.result ./functionTo/list-order.nix checkConfigOutput "b a" config.result ./functionTo/list-order.nix
checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix
## Type deprecation
checkConfigError 'The type `types.simple'\'' of option `simple'\'' defined in .* is deprecated. simple shall not be used' config.simple ./type-deprecation.nix
checkConfigError 'The type `types.infinite'\'' of option `infinite'\'' defined in .* is deprecated. infinite shall not be used' config.infinite ./type-deprecation.nix
checkConfigError 'The type `types.left'\'' of option `nested'\'' defined in .* is deprecated. left shall not be used' config.nested ./type-deprecation.nix
checkConfigError 'The type `types.right'\'' of option `nested'\'' defined in .* is deprecated. right shall not be used' config.nested ./type-deprecation.nix
cat <<EOF cat <<EOF
====== module tests ====== ====== module tests ======
$pass Pass $pass Pass

39
lib/tests/modules/type-deprecation.nix
View File

@ -1,39 +0,0 @@
{ lib, ... }: {
options.simple = lib.mkOption {
type = lib.mkOptionType {
name = "simple";
deprecationMessage = "simple shall not be used";
};
default = throw "";
};
options.infinite = lib.mkOption {
type =
let
t = lib.mkOptionType {
name = "infinite";
deprecationMessage = "infinite shall not be used";
};
r = lib.types.either t (lib.types.attrsOf r);
in r;
default = throw "";
};
options.nested = lib.mkOption {
type =
let
left = lib.mkOptionType {
name = "left";
deprecationMessage = "left shall not be used";
};
right = lib.mkOptionType {
name = "right";
deprecationMessage = "right shall not be used";
};
in lib.types.either left right;
default = throw "";
};
}

43
pkgs/applications/audio/picard/default.nix
View File

@ -1,4 +1,9 @@
{ lib, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 { lib
, python3Packages
, fetchFromGitHub
, gettext
, chromaprint
, qt5
, enablePlayback ? true , enablePlayback ? true
, gst_all_1 , gst_all_1
}: }:
@ -10,43 +15,45 @@ let
else else
pythonPackages.pyqt5 pythonPackages.pyqt5
; ;
in pythonPackages.buildPythonApplication rec { in
pythonPackages.buildPythonApplication rec {
pname = "picard"; pname = "picard";
version = "2.5.6"; version = "2.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "metabrainz"; owner = "metabrainz";
repo = pname; repo = pname;
rev = "release-${version}"; rev = "release-${version}";
sha256 = "1mkbg44bm642mlpfxsdlw947var6a3sf9m6c897b4n0742hsdkbc"; sha256 = "1dhkdzc3601rhg8pqljbv3dz7j0mx75brpfhlizhgwgv65qk3ifj";
}; };
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
++ lib.optionals (pyqt5.multimediaEnabled) [ ++ lib.optionals (pyqt5.multimediaEnabled) [
qt5.qtmultimedia.bin qt5.qtmultimedia.bin
gst_all_1.gstreamer gst_all_1.gst-libav
gst_all_1.gst-vaapi gst_all_1.gst-plugins-base
gst_all_1.gst-libav gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-base gst_all_1.gst-vaapi
gst_all_1.gst-plugins-good gst_all_1.gstreamer
] ]
; ;
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pyqt5
mutagen
chromaprint chromaprint
discid
dateutil dateutil
discid
fasteners
mutagen
pyqt5
]; ];
# In order to spare double wrapping, we use: # In order to spare double wrapping, we use:
preFixup = '' preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}") makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'' ''
+ lib.optionalString (pyqt5.multimediaEnabled) '' + lib.optionalString (pyqt5.multimediaEnabled) ''
makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
'' ''
; ;
meta = with lib; { meta = with lib; {

6
pkgs/applications/blockchains/go-ethereum.nix
View File

@ -8,17 +8,17 @@ let
in buildGoModule rec { in buildGoModule rec {
pname = "go-ethereum"; pname = "go-ethereum";
version = "1.10.2"; version = "1.10.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ethereum"; owner = "ethereum";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-PJaJ9fCva9UUBcQrnVa2c7dk4koi6AyX6bj3JStUMwM="; sha256 = "sha256-85aUR7MvaPeRilC+4oj6XW2IEUvxRUsVz63tQ/Jc7xw=";
}; };
runVend = true; runVend = true;
vendorSha256 = "sha256-qLpwrV9NkmUO0yoK2/gwb5oe/lky/w/P0QVoFSTNuMU="; vendorSha256 = "sha256-8zhVQ8FUdzog7h9RBfuq8uBp0zjulXbDOLAPljp4deA=";
doCheck = false; doCheck = false;

16
pkgs/applications/blockchains/openethereum/default.nix
View File

@ -10,26 +10,20 @@
, darwin , darwin
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
pname = "openethereum"; pname = "openethereum";
version = "3.2.4"; version = "3.2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openethereum"; owner = "openethereum";
repo = "openethereum"; repo = "openethereum";
rev = "v${version}"; rev = "v${version}";
sha256 = "143w0b0ff1s73qzr844l25w90d2y2z0b3w2fr5kkbc1wsnpcq7jp"; sha256 = "1g48fkznvr9fs3j9zy2d9pcwnahmyghxg2b9bsn2mxpyczmfqrki";
}; };
cargoSha256 = "1gm02pcfll362add8a0dcb0sk0mag8z0q23b87yb6fs870bqvhib"; cargoSha256 = "02nlm5ariv4dr6b3rckzs7hw1xrl83yvhimrzb0g5l0j0sxh1nhc";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [
cmake
llvmPackages.clang
llvmPackages.libclang
pkg-config
];
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ lib.optionals stdenv.isLinux [ systemd ] ++ lib.optionals stdenv.isLinux [ systemd ]

10
pkgs/applications/misc/1password/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "1password"; pname = "1password";
version = "1.8.0"; version = "1.9.1";
src = src =
if stdenv.isLinux then fetchzip { if stdenv.isLinux then fetchzip {
url = { url = {
@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
"aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip"; "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip";
}.${stdenv.hostPlatform.system}; }.${stdenv.hostPlatform.system};
sha256 = { sha256 = {
"i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A="; "i686-linux" = "1x5khnp6yqrjf513x3y6l38rb121nib7d4aiz4cz7fh029kxjhd1";
"x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw="; "x86_64-linux" = "1ar8lzkndl7xzcinv93rzg8q25vb23fggbjkhgchgc5x9wkwk8hw";
"aarch64-linux" = "0932bspm1likky1n0rg15d01gspkm1fns2ma82qyb91yr6d18ddk"; "aarch64-linux" = "1q81pk6qmp96p1dbhx1ijln8f54rac8r81d4ghqx9v756s9szrr1";
}.${stdenv.hostPlatform.system}; }.${stdenv.hostPlatform.system};
stripRoot = false; stripRoot = false;
} else fetchurl { } else fetchurl {
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg";
sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d"; sha256 = "0904wwy3wdhfvbkvpdap8141a9gqmn0dw45ikrzsqpg7pv1r2zch";
}; };
buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ];

4
pkgs/applications/misc/devdocs-desktop/default.nix
View File

@ -1,13 +1,13 @@
{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: { lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }:
let let
version = "0.7.1"; version = "0.7.2";
pname = "devdocs-desktop"; pname = "devdocs-desktop";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage"; url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage";
sha256 = "5bba99a34c90a65eff67aface0b7446cbf43d620a1c195f27e7bb33ab6d3d0c2"; sha256 = "sha256-4ugpzh0Dweae6tKb6uqRhEW9HT+iVIo8MQRbVKTdRFw=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

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

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "free42"; pname = "free42";
version = "3.0.2"; version = "3.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thomasokken"; owner = "thomasokken";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-dU8c+tpt+4nCWQj3P2rl6CJNtWFcXaYb3ZESg8hAllQ="; sha256 = "sha256-2TOYvZBI2EW9xjbjA4Bh+TgjbyEXRzOByalLYBW8Ba8=";
}; };
nativeBuildInputs = [ copyDesktopItems pkg-config ]; nativeBuildInputs = [ copyDesktopItems pkg-config ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fuzzel"; pname = "fuzzel";
version = "1.5.3"; version = "1.5.4";
src = fetchzip { src = fetchzip {
url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"; url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz";
sha256 = "sha256-n2eXS4NdOBgn48KOJ+0sQeNMKL7OxB8tUB99narQG0o="; sha256 = "sha256-Zg9KrRf2ntg2FU6lhllt/Fd63KJak6zB7hu4ujj/9AI=";
}; };
nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; nativeBuildInputs = [ pkg-config meson ninja scdoc git ];

4
pkgs/applications/misc/moonlight-embedded/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, perl { lib, stdenv, fetchFromGitHub, cmake, perl
, alsaLib, libevdev, libopus, udev, SDL2 , alsaLib, libevdev, libopus, udev, SDL2
, ffmpeg_3, pkg-config, xorg, libvdpau, libpulseaudio, libcec , ffmpeg, pkg-config, xorg, libvdpau, libpulseaudio, libcec
, curl, expat, avahi, enet, libuuid, libva , curl, expat, avahi, enet, libuuid, libva
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl ]; nativeBuildInputs = [ cmake perl ];
buildInputs = [ buildInputs = [
alsaLib libevdev libopus udev SDL2 alsaLib libevdev libopus udev SDL2
ffmpeg_3 pkg-config xorg.libxcb libvdpau libpulseaudio libcec ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec
xorg.libpthreadstubs curl expat avahi enet libuuid libva xorg.libpthreadstubs curl expat avahi enet libuuid libva
]; ];

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

@ -2,12 +2,12 @@
let let
pname = "lens"; pname = "lens";
version = "4.2.0"; version = "4.2.4";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage"; url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage";
sha256 = "0g60d1h2dn41qdzdnqavwknqynjqil7s8kcqy01h021r81rdpn2q"; sha256 = "0fzhv8brwwl1ihx6jqq4pi77489hr6f9hpppqq3n8d2imjsqgvlw";
name="${pname}.AppImage"; name="${pname}.AppImage";
}; };

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

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nerdctl"; pname = "nerdctl";
version = "0.8.0"; version = "0.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containerd"; owner = "containerd";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-It/p2Hk4/fkYgHTPynf7p7zs4ajjo0Fv3yTzhrWUusE="; sha256 = "sha256-Lu1LJ57jF4lMIfQn/zyT2cc/mkc3RPPlu4gI7qv8blI=";
}; };
vendorSha256 = "sha256-Vg6SHyQkeUvd2hT0JV32y+F0t/qb81MrgOFcr785a8M="; vendorSha256 = "sha256-fEzA/+iKye8lzH4JoXLPqnwjrXPPNuL8gPPbkYJ1glw=";
nativeBuildInputs = [ makeWrapper installShellFiles ]; nativeBuildInputs = [ makeWrapper installShellFiles ];

4
pkgs/applications/networking/gopher/sacc/default.nix
View File

@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
CFLAGS = lib.optionals stdenv.isDarwin [
"-D_DARWIN_C_SOURCE"
];
postPatch = '' postPatch = ''
substituteInPlace config.mk \ substituteInPlace config.mk \
--replace curses ncurses \ --replace curses ncurses \

4
pkgs/applications/networking/remote/anydesk/default.nix
View File

@ -18,14 +18,14 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "anydesk"; pname = "anydesk";
version = "6.1.0"; version = "6.1.1";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz"
"https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz"
]; ];
sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r"; sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh";
}; };
passthru = { passthru = {

4
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "lefthook"; pname = "lefthook";
version = "0.7.3"; version = "0.7.4";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "evilmartians"; owner = "evilmartians";
repo = "lefthook"; repo = "lefthook";
sha256 = "sha256-VrAkmLRsYNDX5VfAxsvjsOv1bv7Nk53OjdaJm/D2GRk="; sha256 = "sha256-wW8Obh0YmAZHKrXLQ8364+TrAmLIYKRir2qXdWLtVkE=";
}; };
vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko="; vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko=";

3
pkgs/applications/virtualization/qemu/default.nix
View File

@ -17,6 +17,7 @@
, usbredirSupport ? spiceSupport, usbredir , usbredirSupport ? spiceSupport, usbredir
, xenSupport ? false, xen , xenSupport ? false, xen
, cephSupport ? false, ceph , cephSupport ? false, ceph
, glusterfsSupport ? false, glusterfs, libuuid
, openGLSupport ? sdlSupport, mesa, epoxy, libdrm , openGLSupport ? sdlSupport, mesa, epoxy, libdrm
, virglSupport ? openGLSupport, virglrenderer , virglSupport ? openGLSupport, virglrenderer
, libiscsiSupport ? true, libiscsi , libiscsiSupport ? true, libiscsi
@ -72,6 +73,7 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ] ++ optionals xenSupport [ xen ]
++ optionals cephSupport [ ceph ] ++ optionals cephSupport [ ceph ]
++ optionals glusterfsSupport [ glusterfs libuuid ]
++ optionals openGLSupport [ mesa epoxy libdrm ] ++ optionals openGLSupport [ mesa epoxy libdrm ]
++ optionals virglSupport [ virglrenderer ] ++ optionals virglSupport [ virglrenderer ]
++ optionals libiscsiSupport [ libiscsi ] ++ optionals libiscsiSupport [ libiscsi ]
@ -142,6 +144,7 @@ stdenv.mkDerivation rec {
++ optional gtkSupport "--enable-gtk" ++ optional gtkSupport "--enable-gtk"
++ optional xenSupport "--enable-xen" ++ optional xenSupport "--enable-xen"
++ optional cephSupport "--enable-rbd" ++ optional cephSupport "--enable-rbd"
++ optional glusterfsSupport "--enable-glusterfs"
++ optional openGLSupport "--enable-opengl" ++ optional openGLSupport "--enable-opengl"
++ optional virglSupport "--enable-virglrenderer" ++ optional virglSupport "--enable-virglrenderer"
++ optional tpmSupport "--enable-tpm" ++ optional tpmSupport "--enable-tpm"

4
pkgs/data/fonts/inter/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "3.15"; version = "3.18";
in fetchzip { in fetchzip {
name = "inter-${version}"; name = "inter-${version}";
@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
''; '';
sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0"; sha256 = "sha256-+wbN1vSS8v1Z1VIfDNeY9DB8Kr6v7UnFg37EPPAD7wI=";
meta = with lib; { meta = with lib; {
homepage = "https://rsms.me/inter/"; homepage = "https://rsms.me/inter/";

4
pkgs/data/fonts/stix-two/default.nix
View File

@ -1,13 +1,13 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "2.12"; version = "2.13";
in in
fetchzip { fetchzip {
name = "stix-two-${version}"; name = "stix-two-${version}";
url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip";
sha256 = "1a6v8p5zbjlv1gfhph0rzkvnmvxf4n1y0mdrdgng01yyl1nngrn9"; sha256 = "sha256-cBtZe/oq4bQCscSAhJ4YuTSghDleD9O/+3MHOJyI50o=";
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts/ mkdir -p $out/share/fonts/

9
pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
View File

@ -3,16 +3,11 @@
mkXfceDerivation { mkXfceDerivation {
category = "panel-plugins"; category = "panel-plugins";
pname = "xfce4-clipman-plugin"; pname = "xfce4-clipman-plugin";
version = "1.6.1"; version = "1.6.2";
sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl"; sha256 = "0pm4pzq3imc0m09mg0zk6kwcn5yzdgiqgdbpws01q3xz58jmb4a6";
buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ];
postPatch = ''
# exo-csource has been dropped from exo
substituteInPlace panel-plugin/Makefile.am --replace exo-csource xdt-csource
'';
meta = { meta = {
description = "Clipboard manager for Xfce panel"; description = "Clipboard manager for Xfce panel";
}; };

6
pkgs/development/interpreters/evcxr/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "evcxr"; pname = "evcxr";
version = "0.8.1"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "evcxr"; repo = "evcxr";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-5YbvPDyGaoKPelLep2tVica08SI7Cyo9SLMnE6dmWe4="; sha256 = "sha256-89+RZrG/QUo3JY9N5eTiMigUnlUP+wZWRW8PSnCcsrY=";
}; };
cargoSha256 = "sha256-hqVmNBrvagqhGPWTaBXuY8lULolWIoR5ovEhH5k1tz4="; cargoSha256 = "sha256-gZLSTWS5cLfJvk4/tv8FG2I2vH3PKljWbJDOflNDmTQ=";
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";

4
pkgs/development/interpreters/php/7.3.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args; generic = (import ./generic.nix) _args;
base = callPackage generic (_args // { base = callPackage generic (_args // {
version = "7.3.27"; version = "7.3.28";
sha256 = "00z0vadxazm2flks9g8qmchj2pwkli880kg313jgbb1mx3shc84x"; sha256 = "0r4r8famg3a8x6ch24y1370nsphkxg4k9zq5x8v88f4l8mj6wqwg";
# https://bugs.php.net/bug.php?id=76826 # https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

4
pkgs/development/interpreters/php/7.4.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args; generic = (import ./generic.nix) _args;
base = callPackage generic (_args // { base = callPackage generic (_args // {
version = "7.4.16"; version = "7.4.18";
sha256 = "0gnfb4vaj71fiap0q9lk6vs1xs7l6sha60isw6aaw3zxgh00ywc5"; sha256 = "0bw4q7svijsqi5vinaspzzqyli2pvmpz6yf83ndqixf6x4r5ji9f";
}); });
in base.withExtensions ({ all, ... }: with all; ([ in base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/interpreters/php/8.0.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args; generic = (import ./generic.nix) _args;
base = callPackage generic (_args // { base = callPackage generic (_args // {
version = "8.0.3"; version = "8.0.5";
sha256 = "04mh5sznbgwv67x9p0qz4i377zwdb5cc6r1mb3925y1lkqfn5y4m"; sha256 = "1q08xx9pbn7plsnfh6j16jj294vm968ng1n5kaqw7apgxd7r6p8r";
}); });
in base.withExtensions ({ all, ... }: with all; ([ in base.withExtensions ({ all, ... }: with all; ([

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

@ -1,6 +1,7 @@
{ lib, stdenv, fetchsvn, darwin, libtiff { lib, stdenv, fetchsvn, darwin, libtiff
, libpng, zlib, libwebp, libraw, openexr, openjpeg , libpng, zlib, libwebp, libraw, openexr, openjpeg
, libjpeg, jxrlib, pkg-config }: , libjpeg, jxrlib, pkg-config
, fixDarwinDylibNames }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "freeimage"; pname = "freeimage";
@ -17,7 +18,12 @@ stdenv.mkDerivation {
prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib";
patches = [ ./unbundle.diff ]; patches = [ ./unbundle.diff ];
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin darwin.cctools; nativeBuildInputs = [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
darwin.cctools
fixDarwinDylibNames
];
buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ];
postBuild = lib.optionalString (!stdenv.isDarwin) '' postBuild = lib.optionalString (!stdenv.isDarwin) ''

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3 }: { lib, stdenv, fetchFromGitHub, python3, fixDarwinDylibNames }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jxrlib"; pname = "jxrlib";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace '.so' '.dylib' --replace '.so' '.dylib'
''; '';
nativeBuildInputs = [ python3 ]; nativeBuildInputs = [ python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
strictDeps = true; strictDeps = true;

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

@ -9,6 +9,7 @@
, enableXen ? false, xen ? null , enableXen ? false, xen ? null
, enableIscsi ? false, openiscsi , enableIscsi ? false, openiscsi
, enableCeph ? false, ceph , enableCeph ? false, ceph
, enableGlusterfs ? false, glusterfs
}: }:
with lib; with lib;
@ -72,6 +73,8 @@ in stdenv.mkDerivation rec {
openiscsi openiscsi
] ++ optionals enableCeph [ ] ++ optionals enableCeph [
ceph ceph
] ++ optionals enableGlusterfs [
glusterfs
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
libiconv gmp libiconv gmp
]; ];
@ -119,6 +122,7 @@ in stdenv.mkDerivation rec {
"-Dsecdriver_apparmor=enabled" "-Dsecdriver_apparmor=enabled"
"-Dnumad=enabled" "-Dnumad=enabled"
"-Dstorage_disk=enabled" "-Dstorage_disk=enabled"
(opt "glusterfs" enableGlusterfs)
(opt "storage_rbd" enableCeph) (opt "storage_rbd" enableCeph)
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
"-Dinit_script=none" "-Dinit_script=none"

1
pkgs/development/libraries/openexr/default.nix
View File

@ -1,6 +1,5 @@
{ lib { lib
, stdenv , stdenv
, buildPackages
, fetchFromGitHub , fetchFromGitHub
, zlib , zlib
, ilmbase , ilmbase

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

@ -2,17 +2,15 @@
, numactl, rdma-core, libbfd, libiberty, perl, zlib , numactl, rdma-core, libbfd, libiberty, perl, zlib
}: }:
let stdenv.mkDerivation rec {
version = "1.9.0"; pname = "ucx";
version = "1.10.0";
in stdenv.mkDerivation {
name = "ucx-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openucx"; owner = "openucx";
repo = "ucx"; repo = "ucx";
rev = "v${version}"; rev = "v${version}";
sha256 = "0i0ji5ivzxjqh3ys1m517ghw3am7cw1hvf40ma7hsq3wznsyx5s1"; sha256 = "1j2gfw4anixb5ajgiyn7bcca8pgjvsaf0y0b2xz88s9hdx0h6gs9";
}; };
nativeBuildInputs = [ autoreconfHook doxygen ]; nativeBuildInputs = [ autoreconfHook doxygen ];

28
pkgs/development/php-packages/deployer/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
mkDerivation rec {
pname = "deployer";
version = "6.8.0";
src = fetchurl {
url = "https://deployer.org/releases/v${version}/${pname}.phar";
sha256 = "09mxwfa7yszsiljbkxpsd4sghqngl08cn18v4g1fbsxp3ib3kxi5";
};
dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/deployer/deployer.phar
makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar"
'';
meta = with lib; {
description = "A deployment tool for PHP";
license = licenses.mit;
homepage = "https://deployer.org/";
maintainers = with maintainers; teams.php.members;
};
}

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

@ -42,6 +42,11 @@ buildPythonPackage rec {
pytest-httpx pytest-httpx
]; ];
disabledTests = [
# fails with pytest-httpx>=0.12.0
"test__query_rmv_api_fail"
];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/cgtobi/PyRMVtransport"; homepage = "https://github.com/cgtobi/PyRMVtransport";
description = "Get transport information from opendata.rmv.de"; description = "Get transport information from opendata.rmv.de";

10
pkgs/development/python-modules/aiobotocore/default.nix
View File

@ -10,18 +10,18 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiobotocore"; pname = "aiobotocore";
version = "1.2.2"; version = "1.3.0";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "37c23166603a3bd134e5f6fc22dbbf8c274d4d24c71418fba292ed2cd7a0bf43"; sha256 = "17pcdi69bwdfw2wv3a0fhira5gimw88sp2wf47yqz50z1ckhv2c1";
}; };
# relax version constraints: aiobotocore works with newer botocore versions # relax version constraints: aiobotocore works with newer botocore versions
# the pinning used to match some `extras_require` we're not using. # the pinning used to match some `extras_require` we're not using.
preConfigure = '' postPatch = ''
substituteInPlace setup.py --replace 'botocore>=1.17.44,<1.17.45' 'botocore' substituteInPlace setup.py --replace 'botocore>=1.20.49,<1.20.50' 'botocore'
''; '';
propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ];
@ -31,7 +31,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "aiobotocore" ]; pythonImportsCheck = [ "aiobotocore" ];
meta = with lib; { meta = with lib; {
description = "Async client for amazon services using botocore and aiohttp/asyncio."; description = "Python client for amazon services";
license = licenses.asl20; license = licenses.asl20;
homepage = "https://github.com/aio-libs/aiobotocore"; homepage = "https://github.com/aio-libs/aiobotocore";
maintainers = with maintainers; [ teh ]; maintainers = with maintainers; [ teh ];

39
pkgs/development/python-modules/aniso8601/default.nix
View File

@ -1,22 +1,35 @@
{ lib, buildPythonPackage, fetchPypi { lib
, dateutil, mock, isPy3k }: , buildPythonPackage
, dateutil
, fetchPypi
, isPy3k
, mock
, pytestCheckHook
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aniso8601"; pname = "aniso8601";
version = "9.0.1"; version = "9.0.1";
meta = with lib; {
description = "Parses ISO 8601 strings.";
homepage = "https://bitbucket.org/nielsenb/aniso8601";
license = licenses.bsd3;
};
propagatedBuildInputs = [ dateutil ];
checkInputs = lib.optional (!isPy3k) mock;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973"; sha256 = "sha256-cuMRdmfu32aVG7LZP0KWpWuUsHioqVkFoFJhH7PxuXM=";
};
propagatedBuildInputs = [
dateutil
];
checkInputs = [
pytestCheckHook
] ++ lib.optional (!isPy3k) mock;
pythonImportsCheck = [ "aniso8601" ];
meta = with lib; {
description = "Python Parser for ISO 8601 strings";
homepage = "https://bitbucket.org/nielsenb/aniso8601";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
}; };
} }

33
pkgs/development/python-modules/astropy-healpix/default.nix
View File

@ -3,25 +3,42 @@
, fetchPypi , fetchPypi
, numpy , numpy
, astropy , astropy
, astropy-helpers , astropy-extension-helpers
, setuptools-scm
, pytestCheckHook
, pytest-doctestplus
, hypothesis
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "astropy-healpix"; pname = "astropy-healpix";
version = "0.6"; version = "0.6";
doCheck = false; # tests require pytest-astropy
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit version;
pname = lib.replaceStrings ["-"] ["_"] pname;
sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690"; sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690";
}; };
propagatedBuildInputs = [ numpy astropy astropy-helpers ]; nativeBuildInputs = [
astropy-extension-helpers
setuptools-scm
];
# Disable automatic update of the astropy-helper module propagatedBuildInputs = [
postPatch = '' numpy
substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" astropy
];
checkInputs = [
pytestCheckHook
pytest-doctestplus
hypothesis
];
# tests must be run in the build directory
preCheck = ''
cd build/lib*
''; '';
meta = with lib; { meta = with lib; {

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

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "breezy"; pname = "breezy";
version = "3.1.0"; version = "3.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be"; sha256 = "sha256-lwKPk+UxKAhfIgUb1xPLJ/za53VdHenmBrr85RTpEps=";
}; };
propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ]; propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];

7
pkgs/development/python-modules/debugpy/default.nix
View File

@ -17,13 +17,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "debugpy"; pname = "debugpy";
version = "1.2.1"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Microsoft"; owner = "Microsoft";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1dgjbbhy228w2zbfq5pf0hkai7742zw8mmybnzjdc9l6pw7360rq"; hash = "sha256-YGzc9mMIzPTmUgIXuZROLdYKjUm69x9SR+JtYRVpn24=";
}; };
patches = [ patches = [
@ -33,6 +33,7 @@ buildPythonPackage rec {
inherit gdb; inherit gdb;
}) })
# Use nixpkgs version instead of versioneer
(substituteAll { (substituteAll {
src = ./hardcode-version.patch; src = ./hardcode-version.patch;
inherit version; inherit version;
@ -87,6 +88,8 @@ buildPythonPackage rec {
"gevent" "gevent"
]; ];
pythonImportsCheck = [ "debugpy" ];
meta = with lib; { meta = with lib; {
description = "An implementation of the Debug Adapter Protocol for Python"; description = "An implementation of the Debug Adapter Protocol for Python";
homepage = "https://github.com/microsoft/debugpy"; homepage = "https://github.com/microsoft/debugpy";

4
pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch
View File

@ -1,8 +1,8 @@
diff --git a/tests/debug/session.py b/tests/debug/session.py diff --git a/tests/debug/session.py b/tests/debug/session.py
index 2b39106..6d45a10 100644 index 101492f..4ee7cfb 100644
--- a/tests/debug/session.py --- a/tests/debug/session.py
+++ b/tests/debug/session.py +++ b/tests/debug/session.py
@@ -625,6 +625,7 @@ class Session(object): @@ -630,6 +630,7 @@ class Session(object):
if "PYTHONPATH" in self.config.env: if "PYTHONPATH" in self.config.env:
# If specified, launcher will use it in lieu of PYTHONPATH it inherited # If specified, launcher will use it in lieu of PYTHONPATH it inherited
# from the adapter when spawning debuggee, so we need to adjust again. # from the adapter when spawning debuggee, so we need to adjust again.

6
pkgs/development/python-modules/discordpy/default.nix
View File

@ -5,25 +5,23 @@
, libopus , libopus
, pynacl , pynacl
, pythonOlder , pythonOlder
, websockets
, withVoice ? true , withVoice ? true
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "discord.py"; pname = "discord.py";
version = "1.7.1"; version = "1.7.2";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Rapptz"; owner = "Rapptz";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-dpASIqe6rJEyiWJyPbQhq9M54lX1ilfp4UuGnbJcFLo="; sha256 = "sha256-NY1/RKp8w9gAqGYXnCNhNZqR/inGMvUvxjJ1MMs62B8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
websockets
] ++ lib.optionalString withVoice [ ] ++ lib.optionalString withVoice [
libopus libopus
pynacl pynacl

15
pkgs/development/python-modules/elmax/default.nix
View File

@ -4,12 +4,15 @@
, httpx , httpx
, poetry-core , poetry-core
, pythonOlder , pythonOlder
, pytest-asyncio
, pytest-httpx
, pytestCheckHook
, yarl , yarl
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "elmax"; pname = "elmax";
version = "0.1.1"; version = "0.1.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -17,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem"; owner = "home-assistant-ecosystem";
repo = "python-elmax"; repo = "python-elmax";
rev = version; rev = version;
sha256 = "sha256-vDISJ/CVOjpM+GPF2TCm3/AMFTWTM0b/+ZPCpAEvNvY="; sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ=";
}; };
nativeBuildInputs = [ poetry-core ]; nativeBuildInputs = [ poetry-core ];
@ -27,8 +30,12 @@ buildPythonPackage rec {
yarl yarl
]; ];
# Project has no tests checkInputs = [
doCheck = false; pytest-asyncio
pytest-httpx
pytestCheckHook
];
pythonImportsCheck = [ "elmax" ]; pythonImportsCheck = [ "elmax" ];
meta = with lib; { meta = with lib; {

19
pkgs/development/python-modules/glymur/default.nix
View File

@ -2,10 +2,10 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, numpy , numpy
, python
, scikitimage , scikitimage
, openjpeg , openjpeg
, procps , procps
, pytestCheckHook
, contextlib2 , contextlib2
, mock , mock
, importlib-resources , importlib-resources
@ -14,13 +14,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "glymur"; pname = "glymur";
version = "0.8.18"; version = "0.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quintusdias"; owner = "quintusdias";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1zbghzw1q4fljb019lsrhka9xrnn4425qnxrjbmbv7dssgkkywd7"; sha256 = "1xlpax56qg5qqh0s19xidgvv2483sc684zj7rh6zw1m1z9m37drr";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -30,16 +30,21 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
scikitimage scikitimage
procps procps
pytestCheckHook
]; ];
postConfigure = '' postConfigure = ''
substituteInPlace glymur/config.py \ substituteInPlace glymur/config.py \
--replace "path = read_config_file(libname)" "path = '${openjpeg}/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}"
''; '';
checkPhase = '' disabledTestPaths = [
${python.interpreter} -m unittest discover # this test involves glymur's different ways of finding the openjpeg path on
''; # fsh systems by reading an .rc file and such, and is obviated by the patch
# in postConfigure
"tests/test_config.py"
];
meta = with lib; { meta = with lib; {
description = "Tools for accessing JPEG2000 files"; description = "Tools for accessing JPEG2000 files";

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

@ -5,24 +5,25 @@
, h11 , h11
, h2 , h2
, pproxy , pproxy
, pytest-asyncio
, pytest-trio
, pytestCheckHook , pytestCheckHook
, pytestcov , pytestcov
, sniffio , sniffio
, uvicorn
, trustme , trustme
, trio , uvicorn
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "httpcore"; pname = "httpcore";
version = "0.12.3"; version = "0.13.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "encode"; owner = "encode";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "09hbjc5wzhrnri5y3idxcq329d7jiaxljc7y6npwv9gh9saln109"; sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -33,18 +34,19 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
pproxy pproxy
pytest-asyncio
pytest-trio
pytestCheckHook pytestCheckHook
pytestcov pytestcov
uvicorn
trustme trustme
trio uvicorn
]; ];
pytestFlagsArray = [ disabledTestPaths = [
# these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
"--ignore=tests/test_threadsafety.py" "tests/test_threadsafety.py"
"--ignore=tests/sync_tests/test_interfaces.py" "tests/sync_tests/test_interfaces.py"
"--ignore=tests/sync_tests/test_retries.py" "tests/sync_tests/test_retries.py"
]; ];
pythonImportsCheck = [ "httpcore" ]; pythonImportsCheck = [ "httpcore" ];

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

@ -18,14 +18,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "httpx"; pname = "httpx";
version = "0.17.1"; version = "0.18.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "encode"; owner = "encode";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-P4Uki+vlAgVECBUz9UGvv1ip49jmf0kYbyU2/mkWE3U="; sha256 = "sha256-6EYBTRXaVHBgW/JzZvWLz55AqgocOyym2FVtu2Nkp/U=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pykmtronic"; pname = "pykmtronic";
version = "0.2.0"; version = "0.3.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9d0301882f06a0c4865c89bb6c2a381c4a1ba6fe2a7a07d56351bdf5f96c9fa5"; sha256 = "sha256-8qLyBJp7C93x0PWbgDAtNEDJ5VLNfwZ3DRZfudRCBgo=";
}; };
propagatedBuildInputs = [ aiohttp lxml ]; propagatedBuildInputs = [ aiohttp lxml ];

16
pkgs/development/python-modules/pytest-doctestplus/default.nix
View File

@ -4,7 +4,9 @@
, isPy27 , isPy27
, six , six
, pytest , pytest
, pytestCheckHook
, numpy , numpy
, setuptools_scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,7 +19,12 @@ buildPythonPackage rec {
sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a";
}; };
buildInputs = [ pytest ]; nativeBuildInputs = [
setuptools_scm
];
buildInputs = [
pytest
];
propagatedBuildInputs = [ propagatedBuildInputs = [
six six
@ -25,14 +32,9 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
pytest pytestCheckHook
]; ];
# check_distribution incorrectly pulls pytest version
checkPhase = ''
pytest -k 'not check_distribution'
'';
meta = with lib; { meta = with lib; {
description = "Pytest plugin with advanced doctest features"; description = "Pytest plugin with advanced doctest features";
homepage = "https://astropy.org"; homepage = "https://astropy.org";

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

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytest-httpx"; pname = "pytest-httpx";
version = "0.11.0"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Colin-b"; owner = "Colin-b";
repo = "pytest_httpx"; repo = "pytest_httpx";
rev = "v${version}"; rev = "v${version}";
sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi"; sha256 = "sha256-Awhsm8jmoCZTBnfrrauLxAEKtpxTzjPMXmx7HR0f/g4=";
}; };
buildInputs = [ pytest ]; buildInputs = [ pytest ];

20
pkgs/development/python-modules/radio_beam/default.nix
View File

@ -2,9 +2,8 @@
, fetchPypi , fetchPypi
, buildPythonPackage , buildPythonPackage
, astropy , astropy
, pytest , pytestCheckHook
, pytest-astropy , pytest-doctestplus
, astropy-helpers
, scipy , scipy
}: }:
@ -13,25 +12,18 @@ buildPythonPackage rec {
version = "0.3.3"; version = "0.3.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit version;
pname = "radio-beam";
sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd";
}; };
propagatedBuildInputs = [ astropy ]; propagatedBuildInputs = [ astropy ];
nativeBuildInputs = [ astropy-helpers ]; checkInputs = [ pytestCheckHook pytest-doctestplus scipy ];
# Disable automatic update of the astropy-helper module
postPatch = ''
substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"
'';
checkInputs = [ pytest pytest-astropy scipy ];
# Tests must be run in the build directory # Tests must be run in the build directory
checkPhase = '' preCheck = ''
cd build/lib cd build/lib
pytest
''; '';
meta = { meta = {

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

@ -11,13 +11,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "respx"; pname = "respx";
version = "0.16.3"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lundberg"; owner = "lundberg";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0if9sg83rznl37hsjw6pfk78jpxi421g9p21wd92jcd6073g4nbd"; sha256 = "sha256-unGAIsslGXOUHXr0FKzC9bX6+Q3mNGZ9Z/dtjz0gkj4=";
}; };
# Coverage is under 100 % due to the excluded tests # Coverage is under 100 % due to the excluded tests

6
pkgs/development/python-modules/sanic-testing/default.nix
View File

@ -20,6 +20,12 @@ buildPythonPackage rec {
hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs="; hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs=";
}; };
postPatch = ''
substituteInPlace setup.py \
--replace 'httpx>=0.16, <0.18' 'httpx' \
--replace 'httpcore==0.12.*' 'httpcore'
'';
propagatedBuildInputs = [ httpx sanic websockets httpcore ]; propagatedBuildInputs = [ httpx sanic websockets httpcore ];
# `sanic` is explicitly set to null when building `sanic` itself # `sanic` is explicitly set to null when building `sanic` itself

18
pkgs/development/python-modules/spectral-cube/default.nix
View File

@ -1,11 +1,12 @@
{ lib { lib
, fetchPypi , fetchPypi
, fetchpatch
, buildPythonPackage , buildPythonPackage
, aplpy , aplpy
, joblib , joblib
, astropy , astropy
, radio_beam , radio_beam
, pytest , pytestCheckHook
, pytest-astropy , pytest-astropy
, astropy-helpers , astropy-helpers
}: }:
@ -20,13 +21,18 @@ buildPythonPackage rec {
sha256 = "17zisr26syfb8kn89xj17lrdycm0hsmy5yp5zrn236wgd8rjriki"; sha256 = "17zisr26syfb8kn89xj17lrdycm0hsmy5yp5zrn236wgd8rjriki";
}; };
patches = [
# Fix compatibility with radio_beam >= 0.3.3. Will be included
# in the next release of spectral cube > 0.5.0
(fetchpatch {
url = "https://github.com/radio-astro-tools/spectral-cube/commit/bbe4295ebef7dfa6fe4474275a29acd6cb0cb544.patch";
sha256 = "1qddfm3364kc34yf6wd9nd6rxh4qc2v5pqilvz9adwb4a50z28bf";
})
];
nativeBuildInputs = [ astropy-helpers ]; nativeBuildInputs = [ astropy-helpers ];
propagatedBuildInputs = [ astropy radio_beam joblib ]; propagatedBuildInputs = [ astropy radio_beam joblib ];
checkInputs = [ aplpy pytest pytest-astropy ]; checkInputs = [ pytestCheckHook aplpy pytest-astropy ];
checkPhase = ''
pytest spectral_cube
'';
meta = { meta = {
description = "Library for reading and analyzing astrophysical spectral data cubes"; description = "Library for reading and analyzing astrophysical spectral data cubes";

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

@ -11,6 +11,7 @@
, beautifulsoup4 , beautifulsoup4
, drms , drms
, glymur , glymur
, h5netcdf
, hypothesis , hypothesis
, matplotlib , matplotlib
, numpy , numpy
@ -50,6 +51,7 @@ buildPythonPackage rec {
pandas pandas
astropy astropy
astropy-helpers astropy-helpers
h5netcdf
parfive parfive
sqlalchemy sqlalchemy
scikitimage scikitimage

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

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "frugal"; pname = "frugal";
version = "3.14.3"; version = "3.14.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Workiva"; owner = "Workiva";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zns2XcydY4xxgF8FB6eje0pAt0DZnFOIAqXaSX0xoMg="; sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng=";
}; };
subPackages = [ "." ]; subPackages = [ "." ];

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

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ginkgo"; pname = "ginkgo";
version = "1.16.1"; version = "1.16.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "onsi"; owner = "onsi";
repo = "ginkgo"; repo = "ginkgo";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-nlNft9jOp8V8ks32LOb4wUTkRrXJ5K49gbHuRmCKz/0="; sha256 = "sha256-u2roJsZZ5oG2dHo4kmSsoySjm1HRQJ659+D2M+LezCc=";
}; };
vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y="; vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y=";
doCheck = false; doCheck = false;

10
pkgs/development/tools/rust/cargo-watch/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }: { stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-watch"; pname = "cargo-watch";
version = "7.6.1"; version = "7.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "passcod"; owner = "passcod";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vjX8xfwv/DOogji+OQCB9l5ebGBNoLW722TGpZ5Wg80="; sha256 = "sha256-ocibNgH2xw0BrJRmHCAahO6hPLmlDmwjjzo7mMWp9FU=";
}; };
cargoSha256 = "sha256-ku+tI0DIofV0EZ413sPjbJDUSqwTxiT8NWBeURrJW1k="; cargoSha256 = "sha256-6ztMEfVOlsyUtIeH+Qd/l7khC7XOHKc4bWsDd27RNu8=";
buildInputs = lib.optional stdenv.isDarwin CoreServices; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
# `test with_cargo` tries to call cargo-watch as a cargo subcommand # `test with_cargo` tries to call cargo-watch as a cargo subcommand
# (calling cargo-watch with command `cargo watch`) # (calling cargo-watch with command `cargo watch`)

4
pkgs/development/tools/rust/sqlx-cli/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }: { stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "sqlx-cli"; pname = "sqlx-cli";
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ] buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ]; ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security libiconv ];
meta = with lib; { meta = with lib; {
description = description =

4
pkgs/misc/vscode-extensions/terraform/default.nix
View File

@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = { mktplcRef = {
name = "terraform"; name = "terraform";
publisher = "hashicorp"; publisher = "hashicorp";
version = "2.10.1"; version = "2.10.2";
}; };
vsix = fetchurl { vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix";
sha256 = "1galibrk4fx4qwa6q17mmwlikx78nmhgv1h98haiyak666cinzcq"; sha256 = "0fkkjkybjshgzbkc933jscxyxqwmqnhq3718pnw9hsac8qv0grrz";
}; };
patches = [ ./fix-terraform-ls.patch ]; patches = [ ./fix-terraform-ls.patch ];

4
pkgs/os-specific/linux/kernel/linux-lqx.nix
View File

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

4
pkgs/os-specific/linux/lxc/default.nix
View File

@ -9,11 +9,11 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lxc"; pname = "lxc";
version = "4.0.8"; version = "4.0.9";
src = fetchurl { src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
sha256 = "16qbmysiyrvb1inbbdr8qwqa0c6h9mwyrbx4ry18x0kvrhmqamdc"; sha256 = "0az56xpvhqiwmf9wfxzaz89s5idrgd9ynd13psscw3hlx480dkqz";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch { lib, stdenv, fetchurl
# native deps. # native deps.
, runCommand, pkg-config, meson, ninja, makeWrapper , runCommand, pkg-config, meson, ninja, makeWrapper
# build+runtime deps. # build+runtime deps.
@ -17,11 +17,11 @@ lua = luajitPackages;
unwrapped = stdenv.mkDerivation rec { unwrapped = stdenv.mkDerivation rec {
pname = "knot-resolver"; pname = "knot-resolver";
version = "5.3.1"; version = "5.3.2";
src = fetchurl { src = fetchurl {
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
sha256 = "9d4d6b7bcdf114acc948e5ee68c83fcbb3944f48a13b9751dbbbc190cdd729c9"; sha256 = "8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

6
pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wireguard-exporter"; pname = "wireguard-exporter";
version = "3.4.2"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MindFlavor"; owner = "MindFlavor";
repo = "prometheus_wireguard_exporter"; repo = "prometheus_wireguard_exporter";
rev = version; rev = version;
sha256 = "sha256-nzY+pCkj0/m7cWPq5+xvQ1b1/PqdI6QuxNdTRT030tY="; sha256 = "sha256-LHhqQ0p2qt6ZAdkpY1SEAcGXH47TPhHvlDv+eL8GC58=";
}; };
cargoSha256 = "sha256-L2ohowt5+F3XJSzoihtJ2prW2bzZiNMUL9vqHIZBy1M="; cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE=";
buildInputs = lib.optional stdenv.isDarwin Security; buildInputs = lib.optional stdenv.isDarwin Security;

6
pkgs/tools/admin/eksctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "eksctl"; pname = "eksctl";
version = "0.46.0"; version = "0.47.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weaveworks"; owner = "weaveworks";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-fPs9xB27fxUnsXndqpcifmMPGA8hEyeYC7tq+W9eBKI="; sha256 = "sha256-fJL6Fs2rt3Q26cUww0Ca/FZnRN7/KHtp9mHUrpwTLuY=";
}; };
vendorSha256 = "sha256-ZC5Rk5HcnxU9X5o/t+oz8qx36WjOVYVEXxxa875UrZk="; vendorSha256 = "sha256-SeO5RNpGrA28xOKr7EoRtMtyOlAPFYEAFtodhIbe1Zk=";
doCheck = false; doCheck = false;

4
pkgs/tools/audio/abcmidi/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "abcMIDI"; pname = "abcMIDI";
version = "2021.03.30"; version = "2021.04.26";
src = fetchzip { src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
sha256 = "sha256-eOQbvs/mtFn7AmvSezO/jRm8+cO5tF7ggcF9DwwfqVc="; sha256 = "sha256-L6SfPRVIclAVloYfZ+kKfZaGHYnYNAgToRN2e5ZfJZ4=";
}; };
meta = with lib; { meta = with lib; {

4
pkgs/tools/graphics/agi/default.nix
View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "agi"; pname = "agi";
version = "1.1.0-dev-20210430"; version = "1.1.0-dev-20210504";
src = fetchzip { src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
sha256 = "sha256-Sb2N3GPS+A55O39/kqua7M18O1F76zz6sNFghSFRBmk="; sha256 = "sha256-q9xWe1gGX7SV/tAUHu/uBB709aqegIsNLTPM5zljgYY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/tools/graphics/perceptualdiff/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A program that compares two images using a perceptually based image metric"; description = "A program that compares two images using a perceptually based image metric";
homepage = "https://github.com/myint/perceptualdiff"; homepage = "https://github.com/myint/perceptualdiff";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ uri-canva ]; maintainers = with maintainers; [ uri-canva ];
platforms = platforms.x86; platforms = platforms.x86;
}; };

9
pkgs/tools/networking/burpsuite/default.nix
View File

@ -2,12 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "burpsuite"; pname = "burpsuite";
version = "2020.12.1"; version = "2021.4.2";
src = fetchurl { src = fetchurl {
name = "burpsuite.jar"; name = "burpsuite.jar";
url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; urls = [
sha256 = "AcoPyVXUf2YGfX2/GbtGZeQ4P7zSsYFb9L57trXive0="; "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
"https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
];
sha256 = "034c9d0a7e0b5e7b1b286949c6b31b475ff2a15e75f1230ccc07e236fc61d2aa";
}; };
dontUnpack = true; dontUnpack = true;

4
pkgs/tools/networking/dnsproxy/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "dnsproxy"; pname = "dnsproxy";
version = "0.37.2"; version = "0.37.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AdguardTeam"; owner = "AdguardTeam";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI="; sha256 = "sha256-8lZDWvd5Lq8uHBt47gRhg0MLeJ5iRheMBUjkfaJueDI=";
}; };
vendorSha256 = null; vendorSha256 = null;

6
pkgs/tools/package-management/disnix/DisnixWebService/default.nix
View File

@ -1,10 +1,10 @@
{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: {lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "DisnixWebService-0.10"; name = "DisnixWebService-0.10.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10.1/DisnixWebService-0.10.1.tar.gz";
sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr";
}; };
buildInputs = [ apacheAnt jdk ]; buildInputs = [ apacheAnt jdk ];
PREFIX = "\${env.out}"; PREFIX = "\${env.out}";

10
pkgs/tools/package-management/disnix/default.nix
View File

@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: { lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "disnix-0.10"; name = "disnix-0.10.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10.1/disnix-0.10.1.tar.gz";
sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; buildInputs = [ glib libxml2 libxslt getopt libintl libiconv dysnomia ];
meta = { meta = {
description = "A Nix-based distributed service deployment tool"; description = "A Nix-based distributed service deployment tool";

6
pkgs/tools/package-management/disnix/disnixos/default.nix
View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: { lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "disnixos-0.9"; name = "disnixos-0.9.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9.1/disnixos-0.9.1.tar.gz";
sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

10
pkgs/tools/package-management/disnix/dydisnix/default.nix
View File

@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version="2020-07-04"; version="2020-11-02";
name = "dydisnix-${version}"; name = "dydisnix-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "svanderburg"; owner = "svanderburg";
repo = "dydisnix"; repo = "dydisnix";
rev = "e99091f1c2329d562097e35faedee80622d387f0"; rev = "12ca1516bc1e5d161ac68f5d8252a0a2f353c8cf";
sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; sha256 = "00f341274hwwil8mlgcgq331vfca9sscvpdbgkxsjvbhcqd8qa52";
}; };
nativeBuildInputs = [ pkg-config autoconf automake libtool ]; nativeBuildInputs = [ pkg-config autoconf automake libtool ];
buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ];
preConfigure = '' preConfigure = ''
./bootstrap ./bootstrap
''; '';

30
pkgs/tools/package-management/disnix/dysnomia/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, netcat { lib, stdenv, fetchurl, netcat
, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null , systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null, nginx ? null, s6-rc ? null, xinetd ? null
, enableApacheWebApplication ? false , enableApacheWebApplication ? false
, enableAxis2WebService ? false , enableAxis2WebService ? false
, enableEjabberdDump ? false , enableEjabberdDump ? false
@ -10,7 +10,10 @@
, enableMongoDatabase ? false , enableMongoDatabase ? false
, enableInfluxDatabase ? false , enableInfluxDatabase ? false
, enableSupervisordProgram ? false , enableSupervisordProgram ? false
, enableDockerContainer ? true , enableDockerContainer ? false
, enableNginxWebApplication ? false
, enableXinetdService ? false
, enableS6RCService ? false
, enableLegacy ? false , enableLegacy ? false
, catalinaBaseDir ? "/var/tomcat" , catalinaBaseDir ? "/var/tomcat"
, jobTemplate ? "systemd" , jobTemplate ? "systemd"
@ -25,16 +28,17 @@ assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
assert enableInfluxDatabase -> influxdb != null; assert enableInfluxDatabase -> influxdb != null;
assert enableSupervisordProgram -> supervisor != null; assert enableSupervisordProgram -> supervisor != null;
assert enableDockerContainer -> docker != null; assert enableDockerContainer -> docker != null;
assert enableNginxWebApplication -> nginx != null;
assert enableS6RCService -> s6-rc != null;
assert enableXinetdService -> xinetd != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dysnomia-0.10"; name = "dysnomia-0.10.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10.1/dysnomia-0.10.1.tar.gz";
sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3";
}; };
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
configureFlags = [ configureFlags = [
(if enableApacheWebApplication then "--with-apache" else "--without-apache") (if enableApacheWebApplication then "--with-apache" else "--without-apache")
(if enableAxis2WebService then "--with-axis2" else "--without-axis2") (if enableAxis2WebService then "--with-axis2" else "--without-axis2")
@ -47,6 +51,10 @@ stdenv.mkDerivation {
(if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb")
(if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord")
(if enableDockerContainer then "--with-docker" else "--without-docker") (if enableDockerContainer then "--with-docker" else "--without-docker")
(if enableNginxWebApplication then "--with-nginx" else "--without-nginx")
(if enableXinetdService then "--with-xinetd" else "--without-xinetd")
(if enableS6RCService then "--with-s6-rc" else "--without-s6-rc")
(if stdenv.isDarwin then "--with-launchd" else "--without-launchd")
"--with-job-template=${jobTemplate}" "--with-job-template=${jobTemplate}"
] ++ lib.optional enableLegacy "--enable-legacy"; ] ++ lib.optional enableLegacy "--enable-legacy";
@ -56,11 +64,13 @@ stdenv.mkDerivation {
++ lib.optional enableMySQLDatabase mysql.out ++ lib.optional enableMySQLDatabase mysql.out
++ lib.optional enablePostgreSQLDatabase postgresql ++ lib.optional enablePostgreSQLDatabase postgresql
++ lib.optional enableSubversionRepository subversion ++ lib.optional enableSubversionRepository subversion
++ lib.optional enableMongoDatabase mongodb ++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ]
++ lib.optional enableMongoDatabase mongodb-tools
++ lib.optional enableInfluxDatabase influxdb ++ lib.optional enableInfluxDatabase influxdb
++ lib.optional enableSupervisordProgram supervisor ++ lib.optional enableSupervisordProgram supervisor
++ lib.optional enableDockerContainer docker; ++ lib.optional enableDockerContainer docker
++ lib.optional enableNginxWebApplication nginx
++ lib.optional enableS6RCService s6-rc
++ lib.optional enableXinetdService xinetd;
meta = { meta = {
description = "Automated deployment of mutable components and services for Disnix"; description = "Automated deployment of mutable components and services for Disnix";

10
pkgs/tools/security/kbs2/default.nix
View File

@ -1,24 +1,24 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }: { lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit, libiconv }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "kbs2"; pname = "kbs2";
version = "0.2.6"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "woodruffw"; owner = "woodruffw";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-PtXTC0VufUR5kle9C5KhCHHEQtQZvTTU1Q/cRMCB1g0="; sha256 = "sha256-Mh56VjFHwjiZ0fvOF3fFw+1IU5HwkRdMlFrt3tZjcZY=";
}; };
cargoSha256 = "sha256-S2czYglyHRkRN3Dq5reXFOaB1i/oIHXTY8Ile+Twvzo="; cargoSha256 = "sha256-hjUDLA5vNCCIEFQsAhv3hDur1LIGQKYO2rR6AoEb+wA=";
nativeBuildInputs = [ installShellFiles ] nativeBuildInputs = [ installShellFiles ]
++ lib.optionals stdenv.isLinux [ python3 ]; ++ lib.optionals stdenv.isLinux [ python3 ];
buildInputs = [ ] buildInputs = [ ]
++ lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isLinux [ libxcb ]
++ lib.optionals stdenv.isDarwin [ AppKit ]; ++ lib.optionals stdenv.isDarwin [ AppKit libiconv ];
preCheck = '' preCheck = ''
export HOME=$TMPDIR export HOME=$TMPDIR

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

@ -20801,7 +20801,7 @@ in
prototool = callPackage ../development/tools/prototool { }; prototool = callPackage ../development/tools/prototool { };
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; }); qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; });
# See `xenPackages` source for explanations. # See `xenPackages` source for explanations.
# Building with `xen` instead of `xen-slim` is possible, but makes no sense. # Building with `xen` instead of `xen-slim` is possible, but makes no sense.
@ -27568,7 +27568,7 @@ in
zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
openethereum = callPackage ../applications/blockchains/openethereum { }; openethereum = callPackage ../applications/blockchains/openethereum { stdenv = llvmPackages_12.stdenv; };
parity-ui = callPackage ../applications/blockchains/parity-ui { }; parity-ui = callPackage ../applications/blockchains/parity-ui { };

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

@ -31,6 +31,8 @@ lib.makeScope pkgs.newScope (self: with self; {
composer1 = callPackage ../development/php-packages/composer/1.x.nix { }; composer1 = callPackage ../development/php-packages/composer/1.x.nix { };
deployer = callPackage ../development/php-packages/deployer { };
php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };
php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };