Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
14ba82064f
|
|
@ -179,7 +179,7 @@ rec {
|
|||
they take effect as soon as the oldest release reaches end of life. */
|
||||
oldestSupportedRelease =
|
||||
# Update on master only. Do not backport.
|
||||
2111;
|
||||
2205;
|
||||
|
||||
/* Whether a feature is supported in all supported releases (at the time of
|
||||
release branch-off, if applicable). See `oldestSupportedRelease`. */
|
||||
|
|
|
|||
|
|
@ -3742,12 +3742,6 @@
|
|||
githubId = 2536303;
|
||||
name = "Enno Lohmeier";
|
||||
};
|
||||
elseym = {
|
||||
email = "elseym@me.com";
|
||||
github = "elseym";
|
||||
githubId = 907478;
|
||||
name = "Simon Waibl";
|
||||
};
|
||||
elvishjerricco = {
|
||||
email = "elvishjerricco@gmail.com";
|
||||
github = "ElvishJerricco";
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ let
|
|||
opt = options.services.vault;
|
||||
|
||||
configFile = pkgs.writeText "vault.hcl" ''
|
||||
# vault in dev mode will refuse to start if its configuration sets listener
|
||||
${lib.optionalString (!cfg.dev) ''
|
||||
listener "tcp" {
|
||||
address = "${cfg.address}"
|
||||
${if (cfg.tlsCertFile == null || cfg.tlsKeyFile == null) then ''
|
||||
|
|
@ -17,6 +19,7 @@ let
|
|||
''}
|
||||
${cfg.listenerExtraConfig}
|
||||
}
|
||||
''}
|
||||
storage "${cfg.storageBackend}" {
|
||||
${optionalString (cfg.storagePath != null) ''path = "${cfg.storagePath}"''}
|
||||
${optionalString (cfg.storageConfig != null) cfg.storageConfig}
|
||||
|
|
@ -30,8 +33,10 @@ let
|
|||
'';
|
||||
|
||||
allConfigPaths = [configFile] ++ cfg.extraSettingsPaths;
|
||||
|
||||
configOptions = escapeShellArgs (concatMap (p: ["-config" p]) allConfigPaths);
|
||||
configOptions = escapeShellArgs
|
||||
(lib.optional cfg.dev "-dev" ++
|
||||
lib.optional (cfg.dev && cfg.devRootTokenID != null) "-dev-root-token-id=${cfg.devRootTokenID}"
|
||||
++ (concatMap (p: ["-config" p]) allConfigPaths));
|
||||
|
||||
in
|
||||
|
||||
|
|
@ -47,6 +52,22 @@ in
|
|||
description = "This option specifies the vault package to use.";
|
||||
};
|
||||
|
||||
dev = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
In this mode, Vault runs in-memory and starts unsealed. This option is not meant production but for development and testing i.e. for nixos tests.
|
||||
'';
|
||||
};
|
||||
|
||||
devRootTokenID = mkOption {
|
||||
type = types.str;
|
||||
default = false;
|
||||
description = ''
|
||||
Initial root token. This only applies when <option>services.vault.dev</option> is true
|
||||
'';
|
||||
};
|
||||
|
||||
address = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1:8200";
|
||||
|
|
@ -186,6 +207,9 @@ in
|
|||
Group = "vault";
|
||||
ExecStart = "${cfg.package}/bin/vault server ${configOptions}";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
|
||||
StateDirectory = "vault";
|
||||
# In `dev` mode vault will put its token here
|
||||
Environment = lib.optional (cfg.dev) "HOME=/var/lib/vault";
|
||||
PrivateDevices = true;
|
||||
PrivateTmp = true;
|
||||
ProtectSystem = "full";
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ in
|
|||
|
||||
${pkgs.sqlite}/bin/sqlite3 ${appDb} "update settings set ${settings}"
|
||||
'' + optionalString (cfg.options.calibreLibrary != null) ''
|
||||
test -f ${cfg.options.calibreLibrary}/metadata.db || { echo "Invalid Calibre library"; exit 1; }
|
||||
test -f "${cfg.options.calibreLibrary}/metadata.db" || { echo "Invalid Calibre library"; exit 1; }
|
||||
''
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -590,6 +590,7 @@ in {
|
|||
uwsgi = handleTest ./uwsgi.nix {};
|
||||
v2ray = handleTest ./v2ray.nix {};
|
||||
vault = handleTest ./vault.nix {};
|
||||
vault-dev = handleTest ./vault-dev.nix {};
|
||||
vault-postgresql = handleTest ./vault-postgresql.nix {};
|
||||
vaultwarden = handleTest ./vaultwarden.nix {};
|
||||
vector = handleTest ./vector.nix {};
|
||||
|
|
|
|||
|
|
@ -1335,7 +1335,7 @@ mapAttrs
|
|||
'';
|
||||
|
||||
meta = with maintainers; {
|
||||
maintainers = [ willibutz elseym ];
|
||||
maintainers = [ willibutz ];
|
||||
};
|
||||
}
|
||||
)))
|
||||
|
|
|
|||
35
nixos/tests/vault-dev.nix
Normal file
35
nixos/tests/vault-dev.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
{
|
||||
name = "vault-dev";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ lnl7 mic92 ];
|
||||
};
|
||||
nodes.machine = { pkgs, config, ... }: {
|
||||
environment.systemPackages = [ pkgs.vault ];
|
||||
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
|
||||
environment.variables.VAULT_TOKEN = "phony-secret";
|
||||
|
||||
services.vault = {
|
||||
enable = true;
|
||||
dev = true;
|
||||
devRootTokenID = config.environment.variables.VAULT_TOKEN;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import json
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.wait_for_unit("vault.service")
|
||||
machine.wait_for_open_port(8200)
|
||||
out = machine.succeed("vault status -format=json")
|
||||
print(out)
|
||||
status = json.loads(out)
|
||||
assert status.get("initialized") == True
|
||||
machine.succeed("vault kv put secret/foo bar=baz")
|
||||
out = machine.succeed("vault kv get -format=json secret/foo")
|
||||
print(out)
|
||||
status = json.loads(out)
|
||||
assert status.get("data", {}).get("data", {}).get("bar") == "baz"
|
||||
'';
|
||||
})
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, dbus
|
||||
, ffmpeg
|
||||
, x264
|
||||
|
|
@ -11,6 +12,7 @@
|
|||
, libdrm
|
||||
, pkg-config
|
||||
, pango
|
||||
, pipewire
|
||||
, cmake
|
||||
, autoconf
|
||||
, libtool
|
||||
|
|
@ -23,13 +25,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "weylus";
|
||||
version = "0.11.4";
|
||||
version = "unstable-2022-06-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "H-M-H";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0gq2czxvahww97j4i3k18np29zl6wx85f8253wn3ibqrpfnklz6l";
|
||||
rev = "b169a6be2bf3e8d105273d92f032cca5438de53a";
|
||||
sha256 = "sha256-J9eVFIfmyBviVuT1MYKb5yoacbPqOAT3A8jahWv5qw8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -62,17 +64,27 @@ rustPlatform.buildRustPackage rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
nodePackages.typescript
|
||||
makeWrapper
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
autoconf
|
||||
libtool
|
||||
];
|
||||
|
||||
cargoSha256 = "1pigmch0sy9ipsafd83b8q54xwqjxdaif363n1q8n46arq4v81j0";
|
||||
cargoSha256 = "sha256-R46RSRdtfqi1PRQ0MaSIIqtj+Pr3yikm6NeMwwu1CSw=";
|
||||
|
||||
cargoBuildFlags = [ "--features=ffmpeg-system" ];
|
||||
cargoTestFlags = [ "--features=ffmpeg-system" ];
|
||||
|
||||
postFixup = let
|
||||
GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
|
||||
gst_all_1.gst-plugins-base
|
||||
pipewire
|
||||
];
|
||||
in lib.optionalString stdenv.isLinux ''
|
||||
wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -vDm755 weylus.desktop $out/share/applications/weylus.desktop
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,17 +1,8 @@
|
|||
{ lib, buildGoModule, kubernetes }:
|
||||
{ lib, kubernetes }:
|
||||
|
||||
buildGoModule rec {
|
||||
kubernetes.overrideAttrs (_: rec {
|
||||
pname = "kubectl";
|
||||
|
||||
inherit (kubernetes)
|
||||
buildPhase
|
||||
doCheck
|
||||
nativeBuildInputs
|
||||
src
|
||||
vendorSha256
|
||||
version
|
||||
;
|
||||
|
||||
outputs = [ "out" "man" "convert" ];
|
||||
|
||||
WHAT = lib.concatStringsSep " " [
|
||||
|
|
@ -38,4 +29,4 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/kubernetes/kubectl";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,40 +1,57 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr, git }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, libgcrypt
|
||||
, libintl
|
||||
, libotr
|
||||
, libtool
|
||||
, meson
|
||||
, ncurses
|
||||
, ninja
|
||||
, openssl
|
||||
, perl
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "irssi";
|
||||
version = "1.2.3";
|
||||
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
"owner" = "irssi";
|
||||
"repo" = "irssi";
|
||||
"rev" = "91dc3e4dfa1a9558c5a7fe0ea982cb9df0e2de65";
|
||||
"sha256" = "efnE4vuDd7TnOBxMPduiV0/nez1jVhTjbJ0vzN4ZMcg=";
|
||||
"leaveDotGit" = true;
|
||||
owner = "irssi";
|
||||
repo = "irssi";
|
||||
rev = version;
|
||||
hash = "sha256-HLcIhAZoJfCHoSNQCpoytBR0zmiZd919FcKWCl35G0A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf automake libtool git ];
|
||||
buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-proxy"
|
||||
"--with-bot"
|
||||
"--with-perl=yes"
|
||||
"--with-otr=yes"
|
||||
"--enable-true-color"
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://irssi.org";
|
||||
description = "A terminal based IRC client";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ lovek323 ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
buildInputs = [
|
||||
glib
|
||||
libgcrypt
|
||||
libintl
|
||||
libotr
|
||||
ncurses
|
||||
openssl
|
||||
perl
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"-Dwith-proxy=yes"
|
||||
"-Dwith-bot=yes"
|
||||
"-Dwith-perl=yes"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal based IRC client";
|
||||
homepage = "https://irssi.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ fab lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ mkDerivation rec {
|
|||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/Bz3vkV4+ZFlGBNtkLIGsBk51a3wxy32U1KYcA3awcw=";
|
||||
sha256 = "sha256-lNsAdYErd3m1bNhvSDVJ5Rfqt8lutNJ1+2DCmntL6pM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ let
|
|||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoModule rec {
|
||||
pname = stname;
|
||||
version = "1.20.2";
|
||||
version = "1.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U9sM7c2jCEVzTLBawRQGXZTS0jYbFH3OVFk7IkWk2bo=";
|
||||
hash = "sha256-8sxCTPFdf5VDysANUYqic6zq5gipTL6wmPXstJc+6bA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-NuiT2GytWaGkgSyl+qoe9DjCCL7wSHc6FU8C6rsy6Vc=";
|
||||
vendorSha256 = "sha256-CJFKY69Iz8GrVpvUdDveMQQFj6RXApfgYjP7B1wfgfo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,57 +8,24 @@
|
|||
, enableSSH ? false
|
||||
}:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
|
||||
grandalf = super.grandalf.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdcht";
|
||||
repo = "grandalf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T4pVzjz1WbfBA2ybN4IRK73PD/eb83YUW0BZrBESNLg=";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "setup_requires=['pytest-runner',]," ""
|
||||
'';
|
||||
});
|
||||
|
||||
scmrepo = super.scmrepo.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.0.19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = "scmrepo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-f/KV3NfIumkZcg9r421QhdyPU/274aAU4b78myi+fFY=";
|
||||
};
|
||||
});
|
||||
|
||||
};
|
||||
};
|
||||
in
|
||||
with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dvc";
|
||||
version = "2.10.2";
|
||||
version = "2.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-boaQSg0jajWQZKB5wvcP2musVR2/pifT4pU64Y5hiQ0=";
|
||||
hash = "sha256-d1Tjqomr8Lcf+X+LZgi0wHlxXBUqHq/nAzDBbrxHAl4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools-scm
|
||||
setuptools-scm-git-archive
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiohttp-retry
|
||||
appdirs
|
||||
colorama
|
||||
|
|
@ -69,6 +36,7 @@ buildPythonApplication rec {
|
|||
distro
|
||||
dpath
|
||||
dvclive
|
||||
dvc-data
|
||||
dvc-render
|
||||
flatten-dict
|
||||
flufl_lock
|
||||
|
|
@ -97,13 +65,17 @@ buildPythonApplication rec {
|
|||
voluptuous
|
||||
zc_lockfile
|
||||
] ++ lib.optional enableGoogle [
|
||||
gcsfs
|
||||
google-cloud-storage
|
||||
] ++ lib.optional enableAWS [
|
||||
aiobotocore
|
||||
boto3
|
||||
s3fs
|
||||
] ++ lib.optional enableAzure [
|
||||
azure-storage-blob
|
||||
azure-identity
|
||||
knack
|
||||
] ++ lib.optional enableSSH [
|
||||
paramiko
|
||||
bcrypt
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
|
|
@ -111,6 +83,11 @@ buildPythonApplication rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "grandalf==0.6" "grandalf" \
|
||||
--replace "scmrepo==0.0.25" "scmrepo" \
|
||||
--replace "dvc-data==0.0.16" "dvc-data" \
|
||||
--replace "dvc-render==0.0.6" "dvc-render"
|
||||
substituteInPlace dvc/daemon.py \
|
||||
--subst-var-by dvc "$out/bin/dcv"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -24,6 +24,9 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
readelf -d $out/bin/catatonit | grep 'There is no dynamic section in this file.'
|
||||
|
|
|
|||
|
|
@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
passthru.tests = { inherit (nixosTests) cri-o podman; };
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional (lib.elem stdenv.hostPlatform.system criu.meta.platforms) criu;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
# we need this before autoreconfHook does its thing in order to initialize
|
||||
# config.h with the correct values
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "polari";
|
||||
version = "42.0";
|
||||
version = "42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "WPFbv1tCwLASPv3td1cR07DyRJl1cwlAOMpVZGHgSTw=";
|
||||
sha256 = "r5DPCEjsvkB+sjBkBINpdP048xww1HT0bRspIYqWaz0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extensions";
|
||||
version = "42.2";
|
||||
version = "42.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "ZXGEQKocLxe7CSIv+AJpn2Qf1RJ5Ih8EyxkZOWjsCzA=";
|
||||
sha256 = "DsK+oy6fKKyAWJH2ExlNSPwMCR8JxIMTBlo4hPcic/w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -67,13 +67,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell";
|
||||
version = "42.2";
|
||||
version = "42.3.1";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Z+sTzRdeIDGoOMzqkukDdK4OnMumFoP7rNZ/9q/dWQ4=";
|
||||
sha256 = "ffqzLfrDzWTUYSkYyph8+zMjjvoJJ5h1PIhF/xaTX30=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@
|
|||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
pname = "mutter";
|
||||
version = "42.2";
|
||||
version = "42.3";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "vTDXi+fRcAE6CovMg3zsXubETXcP8AZ03N/CizQms0w=";
|
||||
sha256 = "naOmP5AoK7WUZ+fT39xoTnD6BVNX9qLd7R25jNzOELo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopg";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GHKsI6JATiwUg+YlGhWPBqtYl+GyXWNiDi/hzPDl2hE=";
|
||||
sha256 = "sha256-WzyBgUxqxLvyNNMoRO2FuLxAyNvhBrA7U5eZqHxaL4Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,6 +13,6 @@ buildPythonPackage rec {
|
|||
description = "Python wrapper for the portable curve25519-donna implementation";
|
||||
homepage = "http://code.google.com/p/curve25519-donna/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.20.43";
|
||||
version = "0.20.44";
|
||||
pname = "dulwich";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/MIWTgE7OQqe46EJ1+97ldjeKDsueJuwfpSqMRXjKeo=";
|
||||
hash = "sha256-EOjXN2PdMMhqmaFa3ov886uP6WUyzfSX6MsdEYMjUrg=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
|
|
|||
63
pkgs/development/python-modules/dvc-data/default.nix
Normal file
63
pkgs/development/python-modules/dvc-data/default.nix
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, dictdiffer
|
||||
, diskcache
|
||||
, dvc-objects
|
||||
, fetchFromGitHub
|
||||
, funcy
|
||||
, nanotime
|
||||
, pygtrie
|
||||
, pythonOlder
|
||||
, shortuuid
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "0.0.18";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-jS+96LjHJyhkCREjMhhlWOlvRBhjiKmfNtEcBVS+YCU=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dictdiffer
|
||||
diskcache
|
||||
dvc-objects
|
||||
funcy
|
||||
nanotime
|
||||
pygtrie
|
||||
shortuuid
|
||||
];
|
||||
|
||||
# Tests depend on upath which is unmaintained and only available as wheel
|
||||
doCheck = false;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "dvc-objects==" "dvc-objects>="
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dvc_data"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "DVC's data management subsystem";
|
||||
homepage = "https://github.com/iterative/dvc-data";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
62
pkgs/development/python-modules/dvc-objects/default.nix
Normal file
62
pkgs/development/python-modules/dvc-objects/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flatten-dict
|
||||
, fsspec
|
||||
, funcy
|
||||
, pygtrie
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, shortuuid
|
||||
, tqdm
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-objects";
|
||||
version = "0.0.18";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-mkL+E+PQqm+L7ejccJ0FFpXmIsi26KzfBnzlSuaC3ds=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flatten-dict
|
||||
fsspec
|
||||
funcy
|
||||
pygtrie
|
||||
shortuuid
|
||||
tqdm
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dvc_objects"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for DVC objects";
|
||||
homepage = "https://github.com/iterative/dvc-objects";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
, pytest-mock
|
||||
, pytest-test-utils
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, tabulate
|
||||
}:
|
||||
|
||||
|
|
@ -23,6 +24,12 @@ buildPythonPackage rec {
|
|||
hash = "sha256-l0efiCLoOVuSYoHWYYyu8FT1yosdFl6BeogzJyNKltw=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
funcy
|
||||
tabulate
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-UiyvhJ+F9kxsL5O0sP70GreFsrjTpz852xUmrnJd+ps=";
|
||||
sha256 = "sha256-swi9m2vM573h+im3p97DT73LtalipoCnGMbcnBFyCfw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcstatus";
|
||||
version = "9.1.0";
|
||||
version = "9.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "py-mine";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qKQs0uGPMUtueOryVzFk37Th+N9vmApr/IzJ6jZI2Ic=";
|
||||
hash = "sha256-poq/8+gRlKtrYpuLHmkPgS6OTTMTMaQw9rS1V2sfd6w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ buildPythonPackage rec {
|
|||
description = "A python interface for Nanoleaf Aurora lighting";
|
||||
homepage = "https://github.com/software-2/nanoleaf";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.12.49";
|
||||
version = "8.12.51";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-xpFmFhXr3JC+/0WPj798C/t48hoKpAolbMK6baQeOTs=";
|
||||
hash = "sha256-nUqUYBJ//SiK4HHdH3lC4jKdpbXF1X2Kq+cQNCfKfL8=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -78,6 +78,6 @@ buildPythonPackage rec {
|
|||
description = "Python client library for the Apple TV";
|
||||
homepage = "https://github.com/postlund/pyatv";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,6 @@ buildPythonPackage rec {
|
|||
description = "Python module for interacting with Neato Botvac Connected vacuum robots";
|
||||
homepage = "https://github.com/stianaske/pybotvac";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhumps";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "nficano";
|
||||
repo = "humps";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MxynGgl0bgRUNPdyGqtEpIo1OFEKsSfXFiG4lAL0aPQ=";
|
||||
hash = "sha256-nxiNYBpbX2GfzYj+DdU89bsyEHDnrKZIAGZY7ut/P6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,8 +33,8 @@ buildPythonPackage rec {
|
|||
# Fix naming, https://github.com/nficano/humps/pull/246
|
||||
(fetchpatch {
|
||||
name = "fix-naming.patch";
|
||||
url = "https://github.com/nficano/humps/commit/04739529247ec6c6715a0242a209863d8c66a24d.patch";
|
||||
sha256 = "sha256-6nCKO8BHSPXuT5pE/T/6Dsb6qKVdtRV22Ijbbgtm6ao=";
|
||||
url = "https://github.com/nficano/humps/commit/8c7de2040e3610760c4df604cdbe849a9b7f0074.patch";
|
||||
sha256 = "sha256-dNgPAOxPdCwDteobP4G2/GiVj/Xg+m7u/Or92vo8ilk=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,31 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmt";
|
||||
version = "0.9.1.dev132";
|
||||
format = "wheel"; # dev versions are only distributed as wheels
|
||||
version = "0.9.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PySMT";
|
||||
inherit format version;
|
||||
sha256 = "01iqs7yzms3alf1rdv0gnsnmfp7g8plkjcdqbari258zp4llf6x7";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pysmt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cE+WmKzggYof/olxQb5M7xPsBONr39KdjOTG4ofYPUM=";
|
||||
};
|
||||
|
||||
# No tests present, only GitHub release which is 0.9.0
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pysmt" ];
|
||||
pythonImportsCheck = [
|
||||
"pysmt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for SMT formulae manipulation and solving";
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ buildPythonPackage rec {
|
|||
description = "Python binding for Tado web API";
|
||||
homepage = "https://github.com/wmalgadey/PyTado";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-whois";
|
||||
version = "0.7.3";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "05jaxbnlw5wck0hl124py364jqrx7a4mmv0hy3d2jzvmp0012sk5";
|
||||
sha256 = "sha256-3TNtNRfqzip2iUBtt7uWraPF50MnQjFRru4+ZCJfYiA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, kerberos
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
|
|
@ -27,7 +26,6 @@ buildPythonPackage rec {
|
|||
requests
|
||||
requests_ntlm
|
||||
six
|
||||
kerberos
|
||||
xmltodict
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ buildPythonPackage rec {
|
|||
description = "Python-Tools to implement Secure Remote Password (SRP) authentication";
|
||||
homepage = "https://github.com/idlesign/srptools";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "typer";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Vkau8Nk2ssdhoQOT8DhO5rXH/guz5c1xCxcTTKHZnP8=";
|
||||
sha256 = "sha256-uCYcbAFS3XNHi1upa6Z35daUjHFcMQ98kQefMR9i7AM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, packaging
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -30,6 +31,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
packaging
|
||||
pandas
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.285";
|
||||
version = "4.14.286";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0ynkcq2cm0q2qcmll1jg76msfa2a186xy5rv81ahfvylbjdkijfs";
|
||||
sha256 = "1x26fys9c2zai69wvvwpcxhdbbl02vijn4h7g6k6nq4y36fvkfyx";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.249";
|
||||
version = "4.19.250";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "14aiypira32hsw7wy9bhdw9rvfn705r0sb4415n9pfvi091bsjyf";
|
||||
sha256 = "0p3mnl49708inhnrh461s6cnyn20qsqb9dw541h7crgsyd30mqvf";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.320";
|
||||
version = "4.9.321";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "16wq86i8ch488372v94r88xr9anda477d46xq43wkpmbj912gn9h";
|
||||
sha256 = "1kb976lgikv1qa2pd7spdhmf1l97ip5i1k1kw7j6r7y8f7bwnznl";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.127";
|
||||
version = "5.10.128";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "100m4b6w1kbc1lc3gwlmkp8xl42xai0v5wdbx0mxrq8y1gp374j1";
|
||||
sha256 = "0jyk3is94c3xin48saqywfr66iwqvzqq1rs5px4zkpfp139fjngc";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.51";
|
||||
version = "5.15.52";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1229m4r4n61n5l8anp2pcqdhajkwmavhr1z00n8gvx3yn9w4ifhz";
|
||||
sha256 = "01bdmgbl31nm0wg5mrzn6xgls4h5gig96mjrmn790npjm5fhls7l";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.18.8";
|
||||
version = "5.18.9";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0dhaj1zcsr5sfg62byzvvkhm9j419px6v9v04ngcy0d0vc2yn8q8";
|
||||
sha256 = "0g69ylrdb3khjnnz3v4m6xng49fzjlnvxfaqq77krznwrrpy50iq";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.202";
|
||||
version = "5.4.203";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0gak58h5l2d8rmbmjw48460bgqi73yf1m7swsbbhfsmbkvhvr8aw";
|
||||
sha256 = "12kr55nf6pmb0d52x5r3ilfssyqng9s8cpnbm9aglv062ddkz4zw";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "documize";
|
||||
homepage = "https://www.documize.com/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://freeradius.org/";
|
||||
description = "A modular, high performance free RADIUS suite";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ];
|
||||
maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,6 @@ buildGoModule rec {
|
|||
description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus";
|
||||
homepage = "https://github.com/unifi-poller/unifi-poller";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,59 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, mkYarnPackage
|
||||
, baseUrl ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkYarnPackage rec {
|
||||
pname = "synapse-admin";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/Awesome-Technologies/synapse-admin/releases/download/${version}/synapse-admin-${version}.tar.gz";
|
||||
hash = "sha256-5wMKRaLMVJer6W2q2WuofgzVwr8Myi90DQ8tBVAoUX4=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Awesome-Technologies";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0miHtEJ5e8MaqGc4ezPvwhGjoCZyOE7md0DUCC/ZOfk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
cp -r . $out
|
||||
yarnNix = ./yarn.nix;
|
||||
yarnLock = ./yarn.lock;
|
||||
packageJSON = ./package.json;
|
||||
|
||||
NODE_ENV = "production";
|
||||
${if baseUrl != null then "REACT_APP_SERVER" else null} = baseUrl;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
pushd deps/synapse-admin
|
||||
mv node_modules node_modules.bak
|
||||
cp -r $(readlink -f node_modules.bak) node_modules
|
||||
chmod +w node_modules
|
||||
yarn --offline run build
|
||||
popd
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
distPhase = ''
|
||||
runHook preDist
|
||||
|
||||
mkdir -p $out
|
||||
cp -r deps/synapse-admin/build/* $out
|
||||
|
||||
runHook postDist
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
dontInstall = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Admin UI for Synapse Homeservers";
|
||||
homepage = "https://github.com/Awesome-Technologies/synapse-admin";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
maintainers = with maintainers; [ mkg20001 ma27 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
61
pkgs/tools/admin/synapse-admin/package.json
Normal file
61
pkgs/tools/admin/synapse-admin/package.json
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{
|
||||
"name": "synapse-admin",
|
||||
"version": "0.8.5",
|
||||
"description": "Admin GUI for the Matrix.org server Synapse",
|
||||
"author": "Awesome Technologies Innovationslabor GmbH",
|
||||
"license": "Apache-2.0",
|
||||
"homepage": ".",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Awesome-Technologies/synapse-admin"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@testing-library/jest-dom": "^5.1.1",
|
||||
"@testing-library/react": "^11.2.6",
|
||||
"@testing-library/user-event": "^13.1.8",
|
||||
"eslint": "^7.25.0",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-prettier": "^3.1.2",
|
||||
"jest-fetch-mock": "^3.0.3",
|
||||
"prettier": "^2.2.0",
|
||||
"ra-test": "^3.15.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"papaparse": "^5.2.0",
|
||||
"prop-types": "^15.7.2",
|
||||
"ra-language-chinese": "^2.0.10",
|
||||
"ra-language-german": "^3.13.4",
|
||||
"react": "^17.0.0",
|
||||
"react-admin": "^3.19.7",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-scripts": "^4.0.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "REACT_APP_VERSION=$(git describe --tags) react-scripts start",
|
||||
"build": "REACT_APP_VERSION=$(git describe --tags) react-scripts build",
|
||||
"fix:other": "yarn prettier --write",
|
||||
"fix:code": "yarn test:lint --fix",
|
||||
"fix": "yarn fix:code && yarn fix:other",
|
||||
"prettier": "prettier --ignore-path .gitignore \"**/*.{js,jsx,json,md,scss,yaml,yml}\"",
|
||||
"test:code": "react-scripts test",
|
||||
"test:lint": "eslint --ignore-path .gitignore --ext .js,.jsx .",
|
||||
"test:style": "yarn prettier --list-different",
|
||||
"test": "yarn test:style && yarn test:lint && yarn test:code",
|
||||
"eject": "react-scripts eject"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": "react-app"
|
||||
},
|
||||
"browserslist": {
|
||||
"production": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not op_mini all"
|
||||
],
|
||||
"development": [
|
||||
"last 1 chrome version",
|
||||
"last 1 firefox version",
|
||||
"last 1 safari version"
|
||||
]
|
||||
}
|
||||
}
|
||||
12141
pkgs/tools/admin/synapse-admin/yarn.lock
Normal file
12141
pkgs/tools/admin/synapse-admin/yarn.lock
Normal file
File diff suppressed because it is too large
Load diff
12589
pkgs/tools/admin/synapse-admin/yarn.nix
Normal file
12589
pkgs/tools/admin/synapse-admin/yarn.nix
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ fuse3 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -100,6 +100,6 @@ with python.pkgs; buildPythonApplication rec {
|
|||
mit # The C++/runtime codebase of the ESPHome project (file extensions .c, .cpp, .h, .hpp, .tcc, .ino)
|
||||
gpl3Only # The python codebase and all other parts of this codebase
|
||||
];
|
||||
maintainers = with maintainers; [ globin elseym hexa ];
|
||||
maintainers = with maintainers; [ globin hexa ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ glib libcap libseccomp libslirp ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,6 @@ buildGoModule rec {
|
|||
homepage = "https://termshark.io/";
|
||||
description = "A terminal UI for wireshark-cli, inspired by Wireshark";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ winpat elseym ];
|
||||
maintainers = with maintainers; [ winpat ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ buildGoModule rec {
|
|||
description = "Userspace Go implementation of WireGuard";
|
||||
homepage = "https://git.zx2c4.com/wireguard-go/about/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elseym kirelagin yana zx2c4 ];
|
||||
maintainers = with maintainers; [ kirelagin yana zx2c4 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
|
||||
homepage = "https://www.wireguard.com/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ elseym ericsagnes zx2c4 globin ma27 d-xo ];
|
||||
maintainers = with maintainers; [ ericsagnes zx2c4 globin ma27 d-xo ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
|
|
@ -7,15 +6,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chain-bench";
|
||||
version = "0.0.3";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3cIJQ6MmdcC4u0AT8aBQtt0wko3af5Xm9xGE3k4mCIE=";
|
||||
sha256 = "sha256-8KsEjVZJtQ4oj4UVM2TRzAOPUeUWKVwPM+8zLzsvLq0=";
|
||||
};
|
||||
vendorSha256 = "sha256-FBc1H5L458jPz+G4MlB8gMGkfaR+x1AZ6tmCVr2hMk8=";
|
||||
vendorSha256 = "sha256-UWm6Bg6E6Vo6giztkPqCLaM7BBxJ+qmlXlYat3xlSYM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -54,9 +53,5 @@ buildGoModule rec {
|
|||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jk ];
|
||||
# TODO: see if this is an issue
|
||||
# # Need updated macOS SDK
|
||||
# # https://github.com/NixOS/nixpkgs/issues/101229
|
||||
# broken = (stdenv.isDarwin && stdenv.isx86_64);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubescape";
|
||||
version = "2.0.158";
|
||||
version = "2.0.160";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "armosec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bbTafsHllJQZ9Qn+qFnlr/AdU7NgB/vAvQGIgt/XDNQ=";
|
||||
hash = "sha256-IQ80AnI+mHdZxqgVuZvDLO6LuhLdgRGu6Hyz1kJ2v38=";
|
||||
};
|
||||
vendorSha256 = "sha256-zj2gDx5333AguLs1Gzu3bYXslDwvPFSbMmOTOFxmq6A=";
|
||||
vendorSha256 = "sha256-x+Sxe4fBhOvE5An0dIqL5q3eEKzNJwugToGZ8NZ5GGA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
postPatch = ''
|
||||
# Use default Python module
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'uuid = "^1.30"' ""
|
||||
--replace 'uuid = "^1.30"' "" \
|
||||
--replace 'python-whois = "^0.7.3"' 'python-whois = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ buildGoModule rec {
|
|||
--prefix PATH ${lib.makeBinPath [ gawk glibc ]}
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) vault vault-postgresql; };
|
||||
passthru.tests = { inherit (nixosTests) vault vault-postgresql vault-dev; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.vaultproject.io/";
|
||||
|
|
|
|||
|
|
@ -15,10 +15,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
sha256 = "sha256-nGAG+7FqEktc55i5Q2urKh52vm/i6kX4kvS2AVUAUjA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiocache
|
||||
aiosqlite
|
||||
|
|
@ -30,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
httpcore
|
||||
httpx
|
||||
humanize
|
||||
importlib-metadata
|
||||
loguru
|
||||
Mako
|
||||
markupsafe
|
||||
|
|
@ -37,10 +34,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
sqlalchemy
|
||||
tld
|
||||
yaswfp
|
||||
] ++ lib.optionals (python3.pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ httpx.optional-dependencies.brotli
|
||||
++ httpx.optional-dependencies.socks;
|
||||
++ httpx.optional-dependencies.socks;
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
respx
|
||||
|
|
@ -51,6 +46,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
postPatch = ''
|
||||
# Ignore pinned versions
|
||||
sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" setup.py
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov --cov-report=xml" ""
|
||||
'';
|
||||
|
|
@ -119,8 +116,9 @@ python3.pkgs.buildPythonApplication rec {
|
|||
# TypeError: Expected bytes or bytes-like object got: <class 'str'>
|
||||
"test_persister_upload"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires sslyze
|
||||
# Requires sslyze which is obsolete and was removed
|
||||
"tests/attack/test_mod_ssl.py"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -16063,7 +16063,9 @@ with pkgs;
|
|||
|
||||
kubeprompt = callPackage ../development/tools/kubeprompt { };
|
||||
|
||||
kubescape = callPackage ../tools/security/kubescape { };
|
||||
kubescape = callPackage ../tools/security/kubescape {
|
||||
buildGoModule = buildGo118Module;
|
||||
};
|
||||
|
||||
kubesec = callPackage ../tools/security/kubesec { };
|
||||
|
||||
|
|
|
|||
|
|
@ -2647,10 +2647,14 @@ in {
|
|||
|
||||
durus = callPackage ../development/python-modules/durus { };
|
||||
|
||||
dvclive = callPackage ../development/python-modules/dvclive { };
|
||||
dvc-data = callPackage ../development/python-modules/dvc-data { };
|
||||
|
||||
dvc-objects = callPackage ../development/python-modules/dvc-objects { };
|
||||
|
||||
dvc-render = callPackage ../development/python-modules/dvc-render { };
|
||||
|
||||
dvclive = callPackage ../development/python-modules/dvclive { };
|
||||
|
||||
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
|
||||
|
||||
dyn = callPackage ../development/python-modules/dyn { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue