Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8ab0b85ead
|
|
@ -1,12 +1,12 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.pykms;
|
||||
libDir = "/var/lib/pykms";
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
|
||||
imports = [
|
||||
|
|
@ -46,14 +46,14 @@ in {
|
|||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
type = types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" "MINI" ];
|
||||
type = types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" "MININFO" ];
|
||||
default = "INFO";
|
||||
description = "How much to log";
|
||||
};
|
||||
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
default = [ ];
|
||||
description = "Additional arguments";
|
||||
};
|
||||
};
|
||||
|
|
@ -74,8 +74,9 @@ in {
|
|||
ExecStartPre = "${getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db";
|
||||
ExecStart = lib.concatStringsSep " " ([
|
||||
"${getBin pykms}/bin/server"
|
||||
"--logfile STDOUT"
|
||||
"--loglevel ${cfg.logLevel}"
|
||||
"--logfile=STDOUT"
|
||||
"--loglevel=${cfg.logLevel}"
|
||||
"--sqlite=${libDir}/clients.db"
|
||||
] ++ cfg.extraArgs ++ [
|
||||
cfg.listenAddress
|
||||
(toString cfg.port)
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ in
|
|||
script = (importLib {
|
||||
# See comments at importLib definition.
|
||||
zpoolCmd = "${cfgZfs.package}/sbin/zpool";
|
||||
zfsCmd = "${cfgZfs.package}/sbin/zfs";
|
||||
awkCmd = "${pkgs.gawk}/bin/awk";
|
||||
inherit cfgZfs;
|
||||
}) + ''
|
||||
poolImported "${pool}" && exit
|
||||
|
|
@ -528,7 +528,7 @@ in
|
|||
${optionalString (if isBool cfgZfs.requestEncryptionCredentials
|
||||
then cfgZfs.requestEncryptionCredentials
|
||||
else cfgZfs.requestEncryptionCredentials != []) ''
|
||||
${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do
|
||||
${cfgZfs.package}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do
|
||||
(${optionalString (!isBool cfgZfs.requestEncryptionCredentials) ''
|
||||
if ! echo '${concatStringsSep "\n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then
|
||||
continue
|
||||
|
|
@ -538,10 +538,10 @@ in
|
|||
none )
|
||||
;;
|
||||
prompt )
|
||||
${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${packages.zfsUser}/sbin/zfs load-key "$ds"
|
||||
${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds"
|
||||
;;
|
||||
* )
|
||||
${packages.zfsUser}/sbin/zfs load-key "$ds"
|
||||
${cfgZfs.package}/sbin/zfs load-key "$ds"
|
||||
;;
|
||||
esac) < /dev/null # To protect while read ds kl in case anything reads stdin
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper,
|
||||
atk, ffmpeg, gdk-pixbuf, glibc, gtk3, libav_0_8, libXtst }:
|
||||
atk, ffmpeg, gdk-pixbuf, gtk3, libXtst }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signumone-ks";
|
||||
|
|
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
atk glibc gdk-pixbuf stdenv.cc.cc ffmpeg
|
||||
libav_0_8 gtk3 libXtst
|
||||
atk gdk-pixbuf ffmpeg
|
||||
gtk3 libXtst
|
||||
];
|
||||
|
||||
libPath = lib.makeLibraryPath buildInputs;
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "visidata";
|
||||
version = "2.1.1";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saulpw";
|
||||
repo = "visidata";
|
||||
rev = "v${version}";
|
||||
sha256 = "018z06bfcw0l4k2zdwbgxna9fss4wdqj64ckw5qjis14sb3zkr28";
|
||||
sha256 = "14169q74vpighxnmpxf3nwi19vrv7p76ybb1zp7h8q2harysxkgl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ let
|
|||
"8.12.0".sha256 = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz";
|
||||
"8.12.1".sha256 = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q";
|
||||
"8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n";
|
||||
"8.13+beta1".sha256 = "1v4a6dpj41flspa4ihcr7m5ahqz10kbn62fmrldmv7gzq6jsyfyq";
|
||||
"8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd";
|
||||
};
|
||||
releaseRev = v: "V${v}";
|
||||
fetched = import ../../../../build-support/coq/meta-fetch/default.nix
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-batch";
|
||||
version = "14.0.0";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1d3b2c9ebd57c8874e11d29e7dd05a1f078d2156fc9683e2f2ad41024e448bf6";
|
||||
sha256 = "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.5.10";
|
||||
version = "1.6.0";
|
||||
pname = "bids-validator";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ae421596b6b69670bd5a4ed3e586c6147e04448704b14b0705fd2bfe03d16b41";
|
||||
sha256 = "6858eab83068d34a9d41155c931ca8db9faef2272710d9730c2135915c19be82";
|
||||
};
|
||||
|
||||
# needs packages which are not available in nixpkgs
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "v${version}";
|
||||
sha256 = "1983p8pkbdj6yaclkdng7fn0pmlbz1yc75a4a847ppw47075ryph";
|
||||
sha256 = "1bjrg0ig40rjk5x65x7ac9xsl332r0ypqgrqjdivb5dvplifnw36";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cftime";
|
||||
version = "1.3.1";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "77fd86e69b234d41fa8634d627e9e9ee0501c2a8a95268c2b524d38e0a33f090";
|
||||
sha256 = "7c55540bc164746c3c4f86a07c9c7b9ed4dfb0b0d988348ec63cec065c58766d";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "cmd2";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687";
|
||||
sha256 = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62";
|
||||
};
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cvxpy";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "330eb76e8369c360b68d9231c6eb350848e373b5952134f9bfebaed1a4c4211f";
|
||||
sha256 = "444068d4eda9ffcd43578895174489d4cef36b28ba7ae8a96ab9ef9571d2b4ff";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "datasette";
|
||||
version = "0.54";
|
||||
version = "0.54.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = "datasette";
|
||||
rev = version;
|
||||
sha256 = "sha256-7cfoKteBOnwFsViBegAYhb/NLUSwMSyFVbwDF9ngD8w=";
|
||||
sha256 = "sha256-Ixh56X9dI/FIJPXHXXGnFiYj3qeBmvW5L1FF7/0ofUQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
|
|
|
|||
28
pkgs/development/python-modules/keystone-engine/default.nix
Normal file
28
pkgs/development/python-modules/keystone-engine/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, keystone }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "keystone-engine";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace setup.py --replace \
|
||||
"libkeystone" "${keystone}/lib/libkeystone"
|
||||
'';
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "keystone" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight multi-platform, multi-architecture assembler framework";
|
||||
homepage = "https://www.keystone-engine.org";
|
||||
maintainers = with maintainers; [ dump_stack ];
|
||||
license = licenses.gpl2Only;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2021.01.28-03.03.16";
|
||||
version = "2021.02.02-14.02.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar";
|
||||
sha256 = "sha256-7Mj0yZD8WKpeekEkLZfQhHaPDRzcKO9arOCo0pwUflY=";
|
||||
sha256 = "sha256-NwaUIaGkSB+oVd/OArp+bs01ZDAFy5JJ4ic5sMDYg8s=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -1,30 +1,42 @@
|
|||
{ lib, stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib }:
|
||||
{ lib, stdenv, fetchurl
|
||||
, pkg-config, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib
|
||||
, dedicatedServer ? false }:
|
||||
|
||||
let
|
||||
versionMajor = "0.2.8";
|
||||
versionMinor = "3.5";
|
||||
versionMajor = "0.2.9";
|
||||
versionMinor = "1.0";
|
||||
version = "${versionMajor}.${versionMinor}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "armagetron";
|
||||
pname = if dedicatedServer then "armagetronad-dedicated" else "armagetronad";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2";
|
||||
sha256 = "1vyja7mzivs3pacxb7kznndsgqhq4p0f7x2zg55dckvzqwprdhqx";
|
||||
url = "https://launchpad.net/armagetronad/${versionMajor}/${version}/+download/armagetronad-${version}.tbz";
|
||||
sha256 = "sha256-WbbHwBzj+MylQ34z+XSmN1KVQaEapPUsGlwXSZ4m9qE";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lSDL_image";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [ "--disable-etc" ];
|
||||
buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL zlib ];
|
||||
configureFlags = [
|
||||
"--enable-memmanager"
|
||||
"--enable-automakedefaults"
|
||||
"--disable-useradd"
|
||||
"--disable-initscripts"
|
||||
"--disable-etc"
|
||||
"--disable-uninstall"
|
||||
"--disable-sysinstall"
|
||||
] ++ lib.optional dedicatedServer "--enable-dedicated";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libxml2 zlib ]
|
||||
++ lib.optionals (!dedicatedServer) [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://armagetronad.org";
|
||||
description = "An multiplayer networked arcade racing game in 3D similar to Tron";
|
||||
license = licenses.gpl2;
|
||||
description = "A multiplayer networked arcade racing game in 3D similar to Tron";
|
||||
maintainers = with maintainers; [ numinit ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
31
pkgs/servers/sql/postgresql/ext/plr.nix
Normal file
31
pkgs/servers/sql/postgresql/ext/plr.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, R, postgresql }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plr";
|
||||
version = "8.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postgres-plr";
|
||||
repo = "plr";
|
||||
rev = "REL${builtins.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "1wy4blg8jl30kzhrkvbncl4gmy6k71zipnq89ykwi1vmx89v3ab7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ R postgresql ];
|
||||
preBuild = ''
|
||||
export USE_PGXS=1
|
||||
'';
|
||||
installPhase = ''
|
||||
install -D plr.so -t $out/lib/
|
||||
install -D {plr--unpackaged--8.4.1.sql,plr--8.4.1.sql,plr.control} -t $out/share/postgresql/extension
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PL/R - R Procedural Language for PostgreSQL";
|
||||
homepage = "https://github.com/postgres-plr/plr";
|
||||
maintainers = with maintainers; [ qoelet ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.gpl2Only;
|
||||
};
|
||||
}
|
||||
|
|
@ -27,6 +27,8 @@ self: super: {
|
|||
|
||||
plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { };
|
||||
|
||||
plr = super.callPackage ./ext/plr.nix { };
|
||||
|
||||
plv8 = super.callPackage ./ext/plv8.nix {
|
||||
v8 = super.callPackage ../../../development/libraries/v8/plv8_6_x.nix {
|
||||
python = self.python2;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-"
|
||||
, Security
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uutils-coreutils";
|
||||
version = "0.0.3";
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
name = "uutils-coreutils-2019-05-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "coreutils";
|
||||
rev = "036dd812958ace22d973acf7b370f58072049dac";
|
||||
sha256 = "0d9w3iiphhsk7l5l34682wayp90rgq5a3d94l3qdvhcqkfmpg727";
|
||||
rev = version;
|
||||
sha256 = "QWiEHk8aciiwQeyNgrr0M0c1EeAgE3gSqw0ly/YTwTQ=";
|
||||
};
|
||||
|
||||
# too many impure/platform-dependent tests
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "186hwzdpy7j0gw7491qx02vy4di5md47hipf1xxi1qccvmcfghwh";
|
||||
cargoSha256 = "m2a7WNkF5TxjJlytjdoQ/JZIF9gp9qBkH+UU/NVRJzA=";
|
||||
|
||||
makeFlags =
|
||||
[ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
|
||||
|
|
@ -34,7 +35,7 @@ rustPlatform.buildRustPackage {
|
|||
CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites.
|
||||
'';
|
||||
homepage = "https://github.com/uutils/coreutils";
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
{ lib, runtimeShell, fetchFromGitHub, python3, writeText, writeScript
|
||||
, coreutils, sqlite }:
|
||||
|
||||
with python3.pkgs;
|
||||
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, writeText
|
||||
, writeShellScript
|
||||
, sqlite
|
||||
}:
|
||||
let
|
||||
pypkgs = python3.pkgs;
|
||||
|
||||
dbSql = writeText "create_pykms_db.sql" ''
|
||||
CREATE TABLE clients(
|
||||
clientMachineId TEXT,
|
||||
|
|
@ -17,35 +21,31 @@ let
|
|||
);
|
||||
'';
|
||||
|
||||
dbScript = writeScript "create_pykms_db.sh" (with lib; ''
|
||||
#!${runtimeShell}
|
||||
|
||||
dbScript = writeShellScript "create_pykms_db.sh" ''
|
||||
set -eEuo pipefail
|
||||
|
||||
db=$1
|
||||
db=''${1:-/var/lib/pykms/clients.db}
|
||||
|
||||
if [ ! -e $db ] ; then
|
||||
${getBin sqlite}/bin/sqlite3 $db < ${dbSql}
|
||||
${lib.getBin sqlite}/bin/sqlite3 $db < ${dbSql}
|
||||
fi
|
||||
'');
|
||||
'';
|
||||
|
||||
in buildPythonApplication rec {
|
||||
in
|
||||
pypkgs.buildPythonApplication rec {
|
||||
pname = "pykms";
|
||||
version = "20190611";
|
||||
version = "unstable-2021-01-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SystemRage";
|
||||
repo = "py-kms";
|
||||
rev = "dead208b1593655377fe8bc0d74cc4bead617103";
|
||||
sha256 = "065qpkfqrahsam1rb43vnasmzrangan5z1pr3p6s0sqjz5l2jydp";
|
||||
owner = "SystemRage";
|
||||
repo = "py-kms";
|
||||
rev = "a3b0c85b5b90f63b33dfa5ae6085fcd52c6da2ff";
|
||||
sha256 = "sha256-u0R0uJMQxHnJUDenxglhQkZza3/1DcyXCILcZVceygA=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/py-kms";
|
||||
|
||||
propagatedBuildInputs = [ systemd pytz tzlocal ];
|
||||
|
||||
# Fix https://github.com/SystemRage/py-kms/issues/64 :
|
||||
patches = [ ./log-to-current-directory-by-default.patch ];
|
||||
propagatedBuildInputs = with pypkgs; [ systemd pytz tzlocal ];
|
||||
|
||||
postPatch = ''
|
||||
siteDir=$out/${python3.sitePackages}
|
||||
|
|
@ -66,25 +66,24 @@ in buildPythonApplication rec {
|
|||
|
||||
mv * $siteDir
|
||||
for b in Client Server ; do
|
||||
makeWrapper ${python.interpreter} $out/bin/''${b,,} \
|
||||
--argv0 ''${b,,} \
|
||||
--add-flags $siteDir/pykms_$b.py \
|
||||
--prefix PYTHONPATH : "$(toPythonPath ${systemd})"
|
||||
makeWrapper ${python3.interpreter} $out/bin/''${b,,} \
|
||||
--argv0 pykms-''${b,,} \
|
||||
--add-flags $siteDir/pykms_$b.py
|
||||
done
|
||||
|
||||
install -Dm755 ${dbScript} $out/libexec/create_pykms_db.sh
|
||||
|
||||
install -Dm644 ../README.md -t $out/share/doc/pykms
|
||||
|
||||
${python.interpreter} -m compileall $siteDir
|
||||
${python3.interpreter} -m compileall $siteDir
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Windows KMS (Key Management Service) server written in Python";
|
||||
homepage = "https://github.com/SystemRage/py-kms";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/SystemRage/py-kms";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
# By default, create log files in current directory, instead of the script directory.
|
||||
--- ../original/py-kms/pykms_Client.py
|
||||
+++ py-kms/pykms_Client.py
|
||||
@@ -48,5 +48,5 @@
|
||||
'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]},
|
||||
'lfile' : {'help' : 'Use this option to set an output log file. The default is \"pykms_logclient.log\" or type \"STDOUT\" to view log info on stdout.',
|
||||
- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logclient.log", 'des' : "logfile"},
|
||||
+ 'def' : "pykms_logclient.log", 'des' : "logfile"},
|
||||
'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"},
|
||||
}
|
||||
--- ../original/py-kms/pykms_Server.py
|
||||
+++ py-kms/pykms_Server.py
|
||||
@@ -85,5 +85,5 @@
|
||||
'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]},
|
||||
'lfile' : {'help' : 'Use this option to set or not an output log file. The default is \"pykms_logserver.log\" or type \"STDOUT\" to view log info on stdout.',
|
||||
- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logserver.log", 'des' : "logfile"},
|
||||
+ 'def' : "pykms_logserver.log", 'des' : "logfile"},
|
||||
'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"},
|
||||
}
|
||||
'');
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crunch";
|
||||
version = "3.6";
|
||||
|
||||
|
|
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Wordlist generator";
|
||||
homepage = "https://sourceforge.net/projects/crunch-wordlist/";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ gpl2Only ];
|
||||
maintainers = with maintainers; [ lethalman lnl7 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26331,6 +26331,8 @@ in
|
|||
|
||||
armagetronad = callPackage ../games/armagetronad { };
|
||||
|
||||
armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; };
|
||||
|
||||
arena = callPackage ../games/arena {};
|
||||
|
||||
arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { };
|
||||
|
|
|
|||
|
|
@ -3479,6 +3479,8 @@ in {
|
|||
|
||||
keyrings-alt = callPackage ../development/python-modules/keyrings-alt { };
|
||||
|
||||
keystone-engine = callPackage ../development/python-modules/keystone-engine { };
|
||||
|
||||
keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; };
|
||||
|
||||
kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src);
|
||||
|
|
|
|||
Loading…
Reference in a new issue