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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-07 00:46:56 +00:00 committed by GitHub
parent 5f7ad00ae9 1bf5e3fa8d
commit eb1b758b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 301 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/modules.nix
View File

@ -128,7 +128,7 @@ rec {
let collected = collectModules let collected = collectModules
(specialArgs.modulesPath or "") (specialArgs.modulesPath or "")
(modules ++ [ internalModule ]) (modules ++ [ internalModule ])
({ inherit lib options config; } // specialArgs); ({ inherit lib options config specialArgs; } // specialArgs);
in mergeModules prefix (reverseList collected); in mergeModules prefix (reverseList collected);
options = merged.matchedOptions; options = merged.matchedOptions;

4
lib/strings.nix
View File

@ -659,7 +659,7 @@ rec {
Example: Example:
isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/bin/python" isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/bin/python"
=> false => false
isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/" isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11"
=> true => true
isStorePath pkgs.python isStorePath pkgs.python
=> true => true
@ -667,7 +667,7 @@ rec {
=> false => false
*/ */
isStorePath = x: isStorePath = x:
if isCoercibleToString x then if !(isList x) && isCoercibleToString x then
let str = toString x; in let str = toString x; in
substring 0 1 str == "/" substring 0 1 str == "/"
&& dirOf str == storeDir && dirOf str == storeDir

1
nixos/modules/services/misc/disnix.nix
View File

@ -53,6 +53,7 @@ in
environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles); environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles);
environment.variables.DISNIX_REMOTE_CLIENT = lib.optionalString (cfg.enableMultiUser) "disnix-client";
services.dbus.enable = true; services.dbus.enable = true;
services.dbus.packages = [ pkgs.disnix ]; services.dbus.packages = [ pkgs.disnix ];

4
nixos/modules/system/activation/top-level.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, modules, baseModules, ... }: { config, lib, pkgs, modules, baseModules, specialArgs, ... }:
with lib; with lib;
@ -13,7 +13,7 @@ let
# !!! fix this # !!! fix this
children = mapAttrs (childName: childConfig: children = mapAttrs (childName: childConfig:
(import ../../../lib/eval-config.nix { (import ../../../lib/eval-config.nix {
inherit baseModules; inherit baseModules specialArgs;
system = config.nixpkgs.initialSystem; system = config.nixpkgs.initialSystem;
modules = modules =
(optionals childConfig.inheritParentConfig modules) (optionals childConfig.inheritParentConfig modules)

7
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -76,8 +76,11 @@ let unwrapped = stdenv.mkDerivation rec {
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
# In particular, this detects missing python imports in some of the tools. # In particular, this detects missing python imports in some of the tools.
postInstallCheck = '' postFixup = let
for f in "''${!outputBin}"/bin/{purple-remote,pidgin}; do # TODO: python is a script, so it doesn't work as interpreter on darwin
binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch";
in lib.optionalString doInstallCheck ''
for f in "''${!outputBin}"/bin/{${binsToTest}}; do
echo "Testing: $f --help" echo "Testing: $f --help"
"$f" --help "$f" --help
done done

4
pkgs/applications/terminal-emulators/kitty/default.nix
View File

@ -21,14 +21,14 @@
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "kitty"; pname = "kitty";
version = "0.20.2"; version = "0.20.3";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kovidgoyal"; owner = "kovidgoyal";
repo = "kitty"; repo = "kitty";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-FquvC3tL565711OQmq2ddNwpyJQGgn4dhG/TYZdCRU0="; sha256 = "sha256-rORIrbUqtQZuU6TjjYP7IZHfCPeLnrNy6wInnAwhG48=";
}; };
buildInputs = [ buildInputs = [

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

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marwaita"; pname = "marwaita";
version = "8.0"; version = "9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "darkomarko42"; owner = "darkomarko42";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0ljigm5z13r0idfkjgy5ysq9pzdj66ql269p5phhp47aagmjcv3s"; sha256 = "12mgs9f8mwfpdpxdwyknw7zvgaqp96kzcv7fcrvrnm9i4ind5zra";
}; };
buildInputs = [ buildInputs = [

10
pkgs/desktops/xfce/core/xfce4-panel/default.nix
View File

@ -1,7 +1,6 @@
{ mkXfceDerivation { mkXfceDerivation
, exo , exo
, garcon , garcon
, gettext
, glib , glib
, gobject-introspection , gobject-introspection
, gtk3 , gtk3
@ -17,9 +16,9 @@
mkXfceDerivation { mkXfceDerivation {
category = "xfce"; category = "xfce";
pname = "xfce4-panel"; pname = "xfce4-panel";
version = "4.16.2"; version = "4.16.3";
sha256 = "0wy66viwjnp1c0lgf90fp3vyqy0f1m1kbfdym8a0yrv2b6sn3958"; sha256 = "085hxllsf792sgi8nn0qjfj5vclbrw2dgrgzl6gy55lxcbhkml9x";
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection
@ -45,9 +44,6 @@ mkXfceDerivation {
patches = [ ./xfce4-panel-datadir.patch ]; patches = [ ./xfce4-panel-datadir.patch ];
postPatch = '' postPatch = ''
for f in $(find . -name \*.sh); do
substituteInPlace $f --replace gettext ${gettext}/bin/gettext
done
substituteInPlace plugins/clock/clock.c \ substituteInPlace plugins/clock/clock.c \
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
''; '';
@ -56,6 +52,6 @@ mkXfceDerivation {
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
meta = { meta = {
description = "Xfce's panel"; description = "Panel for the Xfce desktop environment";
}; };
} }

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

@ -5,11 +5,13 @@ with lib; mkCoqDerivation {
owner = "fblanqui"; owner = "fblanqui";
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-version [ defaultVersion = with versions; switch coq.coq-version [
{case = range "8.12" "8.13"; out = "1.8.1"; }
{case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.10" "8.11"; out = "1.7.0"; }
{case = range "8.8" "8.9"; out = "1.6.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; }
{case = range "8.6" "8.7"; out = "1.4.0"; } {case = range "8.6" "8.7"; out = "1.4.0"; }
] null; ] null;
release."1.8.1".sha256 = "0knhca9fffmyldn4q16h9265i7ih0h4jhcarq4rkn0wnn7x8w8yw";
release."1.7.0".rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40"; release."1.7.0".rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40";
release."1.7.0".sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3"; release."1.7.0".sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3";
release."1.6.0".rev = "328aa06270584b578edc0d2925e773cced4f14c8"; release."1.6.0".rev = "328aa06270584b578edc0d2925e773cced4f14c8";

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

@ -9,14 +9,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.1.26"; version = "1.1.27";
pname = "azure-common"; pname = "azure-common";
disabled = isPyPy; disabled = isPyPy;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "b2866238aea5d7492cfb0282fc8b8d5f6d06fb433872345864d45753c10b6e4f"; sha256 = "9f3f5d991023acbd93050cf53c4e863c6973ded7e236c69e99c8ff5c7bad41ef";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -14,14 +14,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.12.0"; version = "1.13.0";
pname = "azure-core"; pname = "azure-core";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "adf2b1c6ef150a92295b4b405f982a9d2c55c4846728cb14760ca592acbb09ec"; sha256 = "624b46db407dbed9e03134ab65214efab5b5315949a1fbd6cd592c46fb272588";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -45,6 +45,8 @@ buildPythonPackage rec {
pytestFlagsArray = [ "tests/" ]; pytestFlagsArray = [ "tests/" ];
# disable tests which touch network # disable tests which touch network
disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ]; disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ];
# requires testing modules which aren't published, and likely to create cyclic dependencies
disabledTestPaths = [ "tests/test_connection_string_parsing.py" ];
meta = with lib; { meta = with lib; {
description = "Microsoft Azure Core Library for Python"; description = "Microsoft Azure Core Library for Python";

4
pkgs/development/python-modules/azure-datalake-store/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-datalake-store"; pname = "azure-datalake-store";
version = "0.0.51"; version = "0.0.52";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b871ebb3bcfd292e8a062dbbaacbc132793d98f1b60f549a8c3b672619603fc1"; sha256 = "4198ddb32614d16d4502b43d5c9739f81432b7e0e4d75d30e05149fe6007fea2";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -9,12 +9,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-eventgrid"; pname = "azure-eventgrid";
version = "4.1.0"; version = "4.1.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "c4f29b2d9b717dad7919048f0a458dd84f83637c3d5c8f5a7e64634b22086719"; sha256 = "c3bd28ccf6c837b58b58fc61275dace5348a823660c3ca21166a88aa2a8377a4";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
View File

@ -6,13 +6,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.0.0"; version = "2.0.0";
pname = "azure-mgmt-apimanagement"; pname = "azure-mgmt-apimanagement";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "3ad7e2c3d20dd0141f9e2c0ae923121f7cbe7333bb314850e6f8b606636e3589"; sha256 = "54fade87af54904c8ac9785efccebc537c58a3c1f8726e929e473698f06ebbfc";
extension = "zip"; extension = "zip";
}; };

4
pkgs/development/python-modules/azure-mgmt-cdn/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-cdn"; pname = "azure-mgmt-cdn";
version = "10.0.0"; version = "11.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "f1216f505126483c568be511a3e0e654f886f13730dae5368609ff0573528cf2"; sha256 = "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-compute/default.nix
View File

@ -6,13 +6,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "19.0.0"; version = "20.0.0";
pname = "azure-mgmt-compute"; pname = "azure-mgmt-compute";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "65afe759c6ee87dd89d65d59c8da4b2c04d197c07c1fbfdc56ef1aea468e4525"; sha256 = "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-containerservice"; pname = "azure-mgmt-containerservice";
version = "15.0.0"; version = "15.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "e205aada94bb630e1ba5ee57751849456e1535aec3f2173edf2cbf596b99c0d9"; sha256 = "51c64e01e614c9b88723b86b36b48f8417171610a098bf4690e39e71cefc32d9";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb"; pname = "azure-mgmt-cosmosdb";
version = "6.1.0"; version = "6.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "7eb28eae4354e0a68e098de314b380d92f6482f53b2947dc8a36913195bdfde0"; sha256 = "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix
View File

@ -1,21 +1,23 @@
{ lib, buildPythonPackage, fetchPypi { lib, buildPythonPackage, fetchPypi
, msrestazure , msrestazure
, azure-common , azure-common
, azure-mgmt-core
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-databoxedge"; pname = "azure-mgmt-databoxedge";
version = "0.2.0"; version = "1.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; sha256 = "04090062bc1e8f00c2f45315a3bceb0fb3b3479ec1474d71b88342e13499b087";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
msrestazure msrestazure
azure-common azure-common
azure-mgmt-core
]; ];
# no tests in pypi tarball # no tests in pypi tarball

6
pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
View File

@ -7,22 +7,24 @@
, msrestazure , msrestazure
, azure-common , azure-common
, azure-mgmt-nspkg , azure-mgmt-nspkg
, azure-mgmt-core
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-datamigration"; pname = "azure-mgmt-datamigration";
version = "4.1.0"; version = "9.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; sha256 = "70373dbeb35a7768a47341bb3b570c559197bc1ba36fc8f8bf15139e4c8bad70";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
msrest msrest
msrestazure msrestazure
azure-common azure-common
azure-mgmt-core
] ++ lib.optionals (!isPy3k) [ ] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg azure-mgmt-nspkg
]; ];

8
pkgs/development/python-modules/azure-mgmt-dns/default.nix
View File

@ -6,24 +6,24 @@
, msrest , msrest
, msrestazure , msrestazure
, azure-common , azure-common
, azure-mgmt-nspkg , azure-mgmt-core
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-dns"; pname = "azure-mgmt-dns";
version = "3.0.0"; version = "8.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "0zxkcczf01b64qfwj98jqdvnwqahygcyccf37rcxpdcfgpkg9kbf"; sha256 = "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
msrest msrest
msrestazure msrestazure
azure-common azure-common
azure-mgmt-nspkg azure-mgmt-core
]; ];
# this is still needed for when the version is overrided # this is still needed for when the version is overrided

6
pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
View File

@ -4,24 +4,26 @@
, msrest , msrest
, msrestazure , msrestazure
, azure-common , azure-common
, azure-mgmt-core
, azure-mgmt-nspkg , azure-mgmt-nspkg
, isPy3k , isPy3k
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-hanaonazure"; pname = "azure-mgmt-hanaonazure";
version = "0.15.0"; version = "1.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "f5699cd2f6ad09555c3f1a75c8703e12db76bbbb7ec8b621dcb948d4fc9829a5"; sha256 = "f2f8342fbfded8be4165fb0d6f010b68df074886811db3e2c9a50b360ee2dd3a";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
msrest msrest
msrestazure msrestazure
azure-common azure-common
azure-mgmt-core
] ++ lib.optionals (!isPy3k) [ ] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg azure-mgmt-nspkg
]; ];

4
pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
View File

@ -12,12 +12,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-keyvault"; pname = "azure-mgmt-keyvault";
version = "8.0.0"; version = "9.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; sha256 = "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-kusto/default.nix
View File

@ -6,13 +6,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.0.0"; version = "2.0.0";
pname = "azure-mgmt-kusto"; pname = "azure-mgmt-kusto";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "fa3ede0ebd6489bbf993f420bcb5fc63d9fad2a1e945c3c49b26fa012bb3534e"; sha256 = "81601479e2b6da3e69654462674ef1474218c4415ef25c1d9892939721732153";
extension = "zip"; extension = "zip";
}; };

4
pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
View File

@ -12,12 +12,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-loganalytics"; pname = "azure-mgmt-loganalytics";
version = "8.0.0"; version = "9.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; sha256 = "c0b702753c0774a25bcb49b967573b0ec2bef5262c24bc371c219a750ba3c4fd";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

12
pkgs/development/python-modules/azure-mgmt-managedservices/default.nix
View File

@ -1,21 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, isPy27 { lib, buildPythonPackage, fetchPypi, isPy27
, azure-common , azure-common
, azure-mgmt-core
, msrest , msrest
, msrestazure , msrestazure
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.0.0"; version = "6.0.0";
pname = "azure-mgmt-managedservices"; pname = "azure-mgmt-managedservices";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "06ddfqriqlvwjsjhqka9r5vhshardyj9c10xgjissfkpqsgkkn7y"; sha256 = "ec0cb3858bcf8edf5eee0eddee81560424eb84352e0df082ddc94eb99badfd5e";
extension = "zip"; extension = "zip";
}; };
propagatedBuildInputs = [ azure-common msrest msrestazure ]; propagatedBuildInputs = [
azure-common
azure-mgmt-core
msrest
msrestazure
];
# no tests included # no tests included
doCheck = false; doCheck = false;

8
pkgs/development/python-modules/azure-mgmt-maps/default.nix
View File

@ -6,24 +6,24 @@
, msrest , msrest
, msrestazure , msrestazure
, azure-common , azure-common
, azure-mgmt-nspkg , azure-mgmt-core
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-maps"; pname = "azure-mgmt-maps";
version = "0.1.0"; version = "1.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "c120e210bb61768da29de24d28b82f8d42ae24e52396eb6569b499709e22f006"; sha256 = "dafbe23bdbe9c01f88ce91c5b8587eefc73ac2d637ebcdc59ded6d332932e3ab";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
msrest msrest
msrestazure msrestazure
azure-common azure-common
azure-mgmt-nspkg azure-mgmt-core
]; ];
pythonNamespaces = [ "azure.mgmt" ]; pythonNamespaces = [ "azure.mgmt" ];

12
pkgs/development/python-modules/azure-mgmt-privatedns/default.nix
View File

@ -1,21 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, isPy27 { lib, buildPythonPackage, fetchPypi, isPy27
, azure-common , azure-common
, azure-mgmt-core
, msrest , msrest
, msrestazure , msrestazure
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.1.0"; version = "1.0.0";
pname = "azure-mgmt-privatedns"; pname = "azure-mgmt-privatedns";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "08wdvfkk8jh90m3l4nz7knd5vikgfvsx70lk7mkhcvl0xj6gv76j"; sha256 = "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45";
extension = "zip"; extension = "zip";
}; };
propagatedBuildInputs = [ azure-common msrest msrestazure ]; propagatedBuildInputs = [
azure-common
azure-mgmt-core
msrest
msrestazure
];
# no tests included # no tests included
doCheck = false; doCheck = false;

4
pkgs/development/python-modules/azure-mgmt-resource/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
version = "16.0.0"; version = "16.1.0";
pname = "azure-mgmt-resource"; pname = "azure-mgmt-resource";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "0bdbdc9c1ed2ef975d8dff45f358d1e06dc6761eace5b6817f13993447e48a68"; sha256 = "b814ee27b37f030fe69461ef6f514661340dc8b1f28736362541e1c0d31d90ae";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

40
pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
, isPy3k
, msrest
, msrestazure
, azure-common
, azure-mgmt-core
}:
buildPythonPackage rec {
pname = "azure-mgmt-servicefabricmanagedclusters";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-EJyjolHrt92zWg+IKWFKTapwZaFrwTtSyEIu5/mZXOg=";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
azure-mgmt-core
];
pythonNamespaces = [ "azure.mgmt" ];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Service Fabric Cluster Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [ jonringer ];
};
}

4
pkgs/development/python-modules/azure-mgmt-storage/default.nix
View File

@ -8,14 +8,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "17.0.0"; version = "17.1.0";
pname = "azure-mgmt-storage"; pname = "azure-mgmt-storage";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc"; sha256 = "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-synapse/default.nix
View File

@ -7,12 +7,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-synapse"; pname = "azure-mgmt-synapse";
version = "1.0.0"; version = "2.0.0";
disabled = pythonOlder "3"; disabled = pythonOlder "3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "d5514dfef93294a2d9b8ff6fdb353b3102abd5750f147d904e6012f24113ff9c"; sha256 = "bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8";
extension = "zip"; extension = "zip";
}; };

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

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-servicebus"; pname = "azure-servicebus";
version = "7.1.0"; version = "7.1.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "c5b3681ce4d7a44c223ddddfdec4c8d2eadede3b11b598ac09c4dbf4b729e89b"; sha256 = "58797defe666dd17ae11a8895395e7e844f11d2076ba4a9ce63682ac02f665d9";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -7,12 +7,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-servicefabric"; pname = "azure-servicefabric";
version = "7.2.0.46"; version = "8.0.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "c15fd5e8fe33a12295435f16e007edcfd8f660547795742f9b74ef8fb3a431ba"; sha256 = "f414cc114e28a358a7f39772205f3f15d7fc1aa30a08d106b0b80623f4303f1d";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-storage-blob/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-storage-blob"; pname = "azure-storage-blob";
version = "12.8.0"; version = "12.8.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "36b85a3423379d4a93f663022487cf53aa3043a355f8414321dde878c00cb577"; sha256 = "eb37b50ddfb6e558b29f6c8c03b0666514e55d6170bf4624e7261a3af93c6401";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-storage-file-share/default.nix
View File

@ -12,13 +12,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-storage-file-share"; pname = "azure-storage-file-share";
version = "12.4.1"; version = "12.4.2";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "7503d05882970abc977529ff5a4b81e79f62fd51b238fe306f72e13f57a522ca"; sha256 = "6c458d1e3db38fdd502d8f77107c81e6859654f02c0e7f2a98214289d9e0dde2";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -3,6 +3,7 @@
, fetchPypi , fetchPypi
, python , python
, azure-common , azure-common
, cryptography
, futures ? null , futures ? null
, dateutil , dateutil
, requests , requests
@ -18,7 +19,7 @@ buildPythonPackage rec {
sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv";
}; };
propagatedBuildInputs = [ azure-common dateutil requests ] propagatedBuildInputs = [ azure-common cryptography dateutil requests ]
++ pkgs.lib.optionals (!isPy3k) [ futures ]; ++ pkgs.lib.optionals (!isPy3k) [ futures ];
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/azure-synapse-artifacts/default.nix
View File

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-synapse-artifacts"; pname = "azure-synapse-artifacts";
version = "0.5.0"; version = "0.6.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "a13124dc9405277f697f6452728d7dcf4c50601ee76055fd42f12b51494d6579"; sha256 = "ec113d37386b8787862baaf9da0318364a008004a377d20fdfca31cfe8d16210";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ondilo"; pname = "ondilo";
version = "0.2.0"; version = "0.3.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JeromeHXP"; owner = "JeromeHXP";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0k7c9nacf7pxvfik3hkv9vvvda2sx5jrf6zwq7r077x7fw5l8d2b"; sha256 = "sha256-MI6K+41I/IVi+GRBdmRIHbljULDFLAwpo3W8tdxCOBM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -2,9 +2,7 @@
, buildPythonPackage , buildPythonPackage
, debugger , debugger
, fetchPypi , fetchPypi
, isPy3k
, Mako , Mako
, makeWrapper
, packaging , packaging
, pysocks , pysocks
, pygments , pygments
@ -20,7 +18,7 @@
, tox , tox
, unicorn , unicorn
, intervaltree , intervaltree
, fetchpatch , installShellFiles
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -39,6 +37,10 @@ buildPythonPackage rec {
sed -i 's/unicorn>=1.0.2rc1,<1.0.2rc4/unicorn>=1.0.2rc1/' setup.py sed -i 's/unicorn>=1.0.2rc1,<1.0.2rc4/unicorn>=1.0.2rc1/' setup.py
''; '';
nativeBuildInputs = [
installShellFiles
];
propagatedBuildInputs = [ propagatedBuildInputs = [
Mako Mako
packaging packaging
@ -60,6 +62,10 @@ buildPythonPackage rec {
doCheck = false; # no setuptools tests for the package doCheck = false; # no setuptools tests for the package
postInstall = ''
installShellCompletion --bash extra/bash_completion.d/shellcraft
'';
postFixup = '' postFixup = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
makeWrapper "${debugger}/bin/${lib.strings.getName debugger}" "$out/bin/pwntools-gdb" makeWrapper "${debugger}/bin/${lib.strings.getName debugger}" "$out/bin/pwntools-gdb"

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

@ -16,11 +16,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "uamqp"; pname = "uamqp";
version = "1.2.13"; version = "1.4.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-zDUFe/yMCThn+qJqDekMrUHEf1glGxBw4pioExLLoqg="; sha256 = "sha256-XzfiLzRK1/DCmnxPW/H+KqnBuCbpYPawS2JnTQq+Vbw=";
}; };
patches = [ patches = [

38
pkgs/development/tools/altair-graphql-client/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }:
let
pname = "altair";
version = "4.0.2";
name = "${pname}-v${version}";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-HCoK+ljcTmyBZSCDe6u2x2urqrQfi3DIlXfCqGWvl3E=";
};
appimageContents = appimageTools.extract { inherit name src; };
in
appimageTools.wrapType2 {
inherit src name;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "A feature-rich GraphQL Client IDE";
homepage = "https://github.com/imolorhe/altair";
license = licenses.mit;
maintainers = with maintainers; [ evalexpr ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/development/tools/analysis/tflint/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "tflint"; pname = "tflint";
version = "0.28.0"; version = "0.28.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terraform-linters"; owner = "terraform-linters";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1d746016iyswb9kw7gprg32vj5rcfa2y9j11r2hsp61hsjfvmg8c"; sha256 = "0bx6y1y6cfqz77m23w4ab1j2i7s83kv301razv9rkkyxpnpb16hi";
}; };
vendorSha256 = "0whd0b9rll0s42hrr2fqp412d5frzmrnqnynpq75wda5rqzmaf8r"; vendorSha256 = "0rfbjhi78qcaghn9xw658xcxl2x4ln4gnnyi9hsf3wz4cbybird7";
doCheck = false; doCheck = false;

12
pkgs/development/tools/misc/distcc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk2, runCommand { lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk3, runCommand
, gcc, autoconf, automake, which, procps, libiberty_static , gcc, autoconf, automake, which, procps, libiberty_static
, runtimeShell , runtimeShell
, sysconfDir ? "" # set this parameter to override the default value $out/etc , sysconfDir ? "" # set this parameter to override the default value $out/etc
@ -7,18 +7,18 @@
let let
name = "distcc"; name = "distcc";
version = "2016-02-24"; version = "2021-03-11";
distcc = stdenv.mkDerivation { distcc = stdenv.mkDerivation {
name = "${name}-${version}"; name = "${name}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "distcc"; owner = "distcc";
repo = "distcc"; repo = "distcc";
rev = "b2fa4e21b4029e13e2c33f7b03ca43346f2cecb8"; rev = "de21b1a43737fbcf47967a706dab4c60521dbbb1";
sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [popt avahi pkg-config python3 gtk2 autoconf automake which procps libiberty_static]; buildInputs = [popt avahi pkg-config python3 gtk3 autoconf automake which procps libiberty_static];
preConfigure = preConfigure =
'' ''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
@ -30,7 +30,7 @@ let
${if static then "LDFLAGS=-static" else ""} ${if static then "LDFLAGS=-static" else ""}
--with${if static == true || popt == null then "" else "out"}-included-popt --with${if static == true || popt == null then "" else "out"}-included-popt
--with${if avahi != null then "" else "out"}-avahi --with${if avahi != null then "" else "out"}-avahi
--with${if gtk2 != null then "" else "out"}-gtk --with${if gtk3 != null then "" else "out"}-gtk
--without-gnome --without-gnome
--enable-rfc2553 --enable-rfc2553
--disable-Werror # a must on gcc 4.6 --disable-Werror # a must on gcc 4.6

4
pkgs/games/hedgewars/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_3, freeglut { mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs , zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools , qtbase, qttools
@ -29,7 +29,7 @@ mkDerivation rec {
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
fpc lua5_1 fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg_3 freeglut physfs ffmpeg freeglut physfs
qtbase qtbase
] ++ lib.optional withServer ghc; ] ++ lib.optional withServer ghc;

4
pkgs/servers/sql/postgresql/ext/timescaledb.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "timescaledb"; pname = "timescaledb";
version = "2.2.0"; version = "2.2.1";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ]; buildInputs = [ postgresql openssl ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale"; owner = "timescale";
repo = "timescaledb"; repo = "timescaledb";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "0gl2jjk9k0s5h7s4yq1qb60lvcqvhp88rh1fhlpyx1vm1hifhhik"; sha256 = "1hk3yyiddhz9lxls981101malzs9b5vnw9wiiw2cxzcslkmg2gv9";
}; };
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ] cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]

6
pkgs/servers/tailscale/default.nix
View File

@ -2,20 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "tailscale"; pname = "tailscale";
version = "1.6.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tailscale"; owner = "tailscale";
repo = "tailscale"; repo = "tailscale";
rev = "v${version}"; rev = "v${version}";
sha256 = "07dzcqd98nsrdv72wp93q6f23mn3pfmpyyi61dx6c26w0j5n4r0p"; sha256 = "urgXbfXEVu5ES140pIAZnQTjU3xWkkk9MPDmlRXa544=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
CGO_ENABLED = 0; CGO_ENABLED = 0;
vendorSha256 = "0wbw9pc0cv05bw2gsps3099zipwjj3r23vyf87qy6g21r08xrrm8"; vendorSha256 = "NBdPGCmUyGKNr76CKwkXmqSVo502ZVrsbboNc+xnB04=";
doCheck = false; doCheck = false;

6
pkgs/tools/admin/azure-cli/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }: { stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
let let
version = "2.20.0"; version = "2.23.0";
srcName = "azure-cli-${version}-src"; srcName = "azure-cli-${version}-src";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -9,7 +9,7 @@ let
owner = "Azure"; owner = "Azure";
repo = "azure-cli"; repo = "azure-cli";
rev = "azure-cli-${version}"; rev = "azure-cli-${version}";
sha256 = "sha256-unG17oiqZZJNGg8QCg7xY0GzuMu2gaAIIgGF8TlMBQQ="; sha256 = "sha256-uIM1U9hub1A1YT6CzwQHmefNBuU4tDapu7VC6EP5kuM=";
}; };
# put packages that needs to be overriden in the py package scope # put packages that needs to be overriden in the py package scope
@ -50,6 +50,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
azure-datalake-store azure-datalake-store
azure-functions-devops-build azure-functions-devops-build
azure-graphrbac azure-graphrbac
azure-identity
azure-keyvault azure-keyvault
azure-keyvault-administration azure-keyvault-administration
azure-loganalytics azure-loganalytics
@ -110,6 +111,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
azure-mgmt-security azure-mgmt-security
azure-mgmt-servicebus azure-mgmt-servicebus
azure-mgmt-servicefabric azure-mgmt-servicefabric
azure-mgmt-servicefabricmanagedclusters
azure-mgmt-signalr azure-mgmt-signalr
azure-mgmt-sql azure-mgmt-sql
azure-mgmt-sqlvirtualmachine azure-mgmt-sqlvirtualmachine

98
pkgs/tools/admin/azure-cli/python-packages.nix
View File

@ -144,8 +144,8 @@ let
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip"
"1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd";
azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.1.0rc1" "zip" azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "8.1.0b4" "zip"
"0jg242pjbxvcqskgrmw0q17mhafkip1d8p40hls0w0wn77cnic65"; "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs=";
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip"
"0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1";
@ -153,8 +153,8 @@ let
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip" azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip"
"f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b";
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.0.0" "zip" azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.1.0" "zip"
"sha256-h3nif64OgekSh4mjOSTbom8qDXVrIVNksbQ3LwILnx8="; "sha256-XPnO6OiwjTbfxz9Q3JkuCPnfTtmdU2cqP14w9ZVIcBE=";
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip" azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip"
"b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f";
@ -162,8 +162,8 @@ let
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip" azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip"
"059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx"; "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx";
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "19.0.0" "zip" azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "20.0.0" "zip"
"34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879a"; "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8";
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
"12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
@ -171,20 +171,23 @@ let
azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip"
"1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7";
azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.4.0" "zip" azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.1.0" "zip"
"1jfs2v0bblpn8lg98zgll6f7k7247r6vwrr0p1898xvhdh8881nr"; "sha256-7d9UlMudNd4hMcaNxJ+slL/tFyaI6BmBR6DlI3Blzq4=";
azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip"
"8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998";
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "3.0.0" "zip" azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.2.0" "zip"
"sha256-/WV5vxXOg9CUT+NAnhpOG7f+QBGfUlTNVO26LTtuIoM="; "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74";
azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip"
"sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA=";
azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip"
"0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";
azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc7" "zip" azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc9" "zip"
"1m5905mn362pn03sf89zsnylkrbgs4p1lkafrw3nxa2gnwcfpyb8"; "sha256-txWYthg9QI5OSW6yE5lY+Gpb+/E6x3jb/obfSQuaAcg=";
azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip"
"0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc";
@ -201,20 +204,26 @@ let
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.15.0" "zip" azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "2.0.0" "zip"
"sha256-XpjDYGCad7RDsv5DHgM35ctwW08C0CBHkfmYX3zmiDY="; "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e";
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8";
azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip" azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip"
"3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f";
azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.1.0" "zip" azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "18.0.0" "zip"
"f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab"; "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a";
azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "0.1.0" "zip" azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "0.1.0" "zip"
"sha256-baEkJcurDMYvJG5yZrTWev9r3QMey+UMdULC8rJECtQ="; "sha256-wSDiELthdo2ineJNKLgvjUKuJOUjlutlabSZcJ4i8AY=";
azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip"
"sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk=";
azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip"
"68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8";
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "3.0.0" "zip" azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "3.0.0" "zip"
"sha256-iUR3VyXFJTYU0ldXbYQe5or6NPVwsFwJJKf3Px2yiiQ="; "sha256-iUR3VyXFJTYU0ldXbYQe5or6NPVwsFwJJKf3Px2yiiQ=";
@ -222,8 +231,11 @@ let
azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip"
"0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6";
azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.48.0" "zip" azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "0.1.0" "zip"
"1v41k9rsflbm9g06mhi6jsygv9542da53qwjpjkp532jawxrw3ys"; "sha256-0pz9jOyAbgZnPZOC0/V2b8Zdmp3nW0JHBQlKNKfbjSM=";
azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "2.0.0" "zip"
"0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e";
azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip"
"1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn";
@ -261,14 +273,14 @@ let
azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip" azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip"
"186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85"; "186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85";
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip" azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.0.0" "zip"
"2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "7.0.0" "zip" azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip"
"sha256-6abJoZs5cbodve75bApaLDWUYzp1R6YOa/y4Azhk7jg="; "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907";
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc16" "zip" azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc17" "zip"
"eT5gH0K4q2Qr1lEpuqjxQhOUrA6bEsAktj+PKsfMXTo="; "sha256-M6lenj1rVEJZ+EJyBXkqokFfr1e5sqRgcAbUc0W0svo=";
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip"
"e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82";
@ -282,8 +294,8 @@ let
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip"
"0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m";
azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.0.0" "zip" azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.1.0" "zip"
"c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc"; "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600";
azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip"
"1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj";
@ -294,8 +306,8 @@ let
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.2.0" "zip" azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.2.0" "zip"
"sha256-Myxg3G0+OAk/bh4k5TOEGGJuyEBtYA2edNlbIXnWE4M="; "sha256-Myxg3G0+OAk/bh4k5TOEGGJuyEBtYA2edNlbIXnWE4M=";
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.0" "tar.gz" azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.2" "tar.gz"
"sha256-2AWpGyle31IFf/qya3FBYJBUBr3V16Gj+T9s3D7ehBI="; "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc";
azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec {
version = "0.60.0"; version = "0.60.0";
@ -327,21 +339,21 @@ let
}); });
azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec {
version = "0.3.0"; version = "0.6.0";
src = super.fetchPypi { src = super.fetchPypi {
inherit (oldAttrs) pname; inherit (oldAttrs) pname;
inherit version; inherit version;
sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a"; sha256 = "ec113d37386b8787862baaf9da0318364a008004a377d20fdfca31cfe8d16210";
extension = "zip"; extension = "zip";
}; };
}); });
azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec {
version = "0.2.0"; version = "0.5.0";
src = super.fetchPypi { src = super.fetchPypi {
inherit (oldAttrs) pname; inherit (oldAttrs) pname;
inherit version; inherit version;
sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; sha256 = "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ=";
extension = "zip"; extension = "zip";
}; };
}); });
@ -417,6 +429,16 @@ let
''; '';
}); });
adal = super.adal.overridePythonAttrs(oldAttrs: rec {
version = "1.2.7";
src = super.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
sha256 = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE=";
};
});
semver = super.semver.overridePythonAttrs(oldAttrs: rec { semver = super.semver.overridePythonAttrs(oldAttrs: rec {
version = "2.13.0"; version = "2.13.0";
@ -438,12 +460,12 @@ let
}); });
knack = super.knack.overridePythonAttrs(oldAttrs: rec { knack = super.knack.overridePythonAttrs(oldAttrs: rec {
version = "0.8.0rc2"; version = "0.8.1";
src = super.fetchPypi { src = super.fetchPypi {
inherit (oldAttrs) pname; inherit (oldAttrs) pname;
inherit version; inherit version;
sha256 = "sha256-4pzgVwOVcT5UsjbyGkE30xashMASUzoQe2OGHSnK5do="; sha256 = "sha256-5h2a5OJxmaLXTCYfgen4L1NTpdHC4a0lYAp9UQkXTuA=";
}; };
}); });

4
pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fcitx5-m17n"; pname = "fcitx5-m17n";
version = "5.0.4"; version = "5.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fcitx"; owner = "fcitx";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-yI6Svr1KEdHqAX3qd7t7GvD0EcWg0A2vZpuJw1U9oKQ="; sha256 = "sha256-duL9FgXPCr4/rMuguw8cf3EIdK6MW/alUNeh1yduY68=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -7,11 +7,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "siege"; pname = "siege";
version = "4.0.8"; version = "4.0.9";
src = fetchurl { src = fetchurl {
url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz";
sha256 = "01qhw52kyqwidp5bckw4xmz4ldqdwkjci7k421qm68kk0mx9l48g"; sha256 = "0xzjfljhv9wcf58qw2c1sbpa5nqz1pb6rjpgvz7bxrv90n31bghx";
}; };
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
@ -32,8 +32,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "HTTP load tester"; description = "HTTP load tester";
homepage = "https://www.joedog.org/siege-home/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.gpl2Plus;
}; };
} }

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

@ -1,7 +1,9 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix }: { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib
, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version="2020-11-02"; version = "unstable-2020-11-02";
name = "dydisnix-${version}"; name = "dydisnix-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -13,13 +15,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoconf automake libtool ]; nativeBuildInputs = [ pkg-config autoconf automake libtool ];
buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ]; buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ];
preConfigure = '' preConfigure = ''
./bootstrap ./bootstrap
''; '';
meta = { meta = {
description = "A toolset enabling self-adaptive redeployment on top of Disnix"; description = "A toolset enabling self-adaptive redeployment on top of Disnix";
longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; longDescription = ''
Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems.
'';
license = lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
maintainers = [ lib.maintainers.tomberek ]; maintainers = [ lib.maintainers.tomberek ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;

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

@ -1,5 +1,11 @@
{ 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, nginx ? null, s6-rc ? null, xinetd ? null
# Optional packages
, 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
# Configuration flags
, enableApacheWebApplication ? false , enableApacheWebApplication ? false
, enableAxis2WebService ? false , enableAxis2WebService ? false
, enableEjabberdDump ? false , enableEjabberdDump ? false

6
pkgs/tools/security/nuclei/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nuclei"; pname = "nuclei";
version = "2.3.4"; version = "2.3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-qjbr3kTgIFdxyzRwSvWyh5krrlzD8i1nMeoLZYSbr6g="; sha256 = "sha256-9C/r1B+lEveRHRLgD0ay9xhi6100c/SGfUaiP7qwstc=";
}; };
vendorSha256 = "sha256-qmuua7HXnwuy24CSqHKALqNDmXBvSIXYTVu3kaGVoeU="; vendorSha256 = "sha256-GAJxEBLZmbSmCeuAEYIHQ4xEzbTJYlJU+JCAL5hlVzY=";
modRoot = "./v2"; modRoot = "./v2";
subPackages = [ subPackages = [

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

@ -12344,6 +12344,8 @@ in
alloy5 alloy5
alloy; alloy;
altair = callPackage ../development/tools/altair-graphql-client { };
ameba = callPackage ../development/tools/ameba { }; ameba = callPackage ../development/tools/ameba { };
augeas = callPackage ../tools/system/augeas { }; augeas = callPackage ../tools/system/augeas { };

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

@ -845,6 +845,8 @@ in {
azure-mgmt-servicefabric = callPackage ../development/python-modules/azure-mgmt-servicefabric { }; azure-mgmt-servicefabric = callPackage ../development/python-modules/azure-mgmt-servicefabric { };
azure-mgmt-servicefabricmanagedclusters = callPackage ../development/python-modules/azure-mgmt-servicefabricmanagedclusters { };
azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { }; azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { };
azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { }; azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { };