Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
7ed7a8d864
83 changed files with 140 additions and 102 deletions
|
|
@ -8326,6 +8326,17 @@
|
|||
githubId = 127548;
|
||||
name = "Judson Lester";
|
||||
};
|
||||
nzbr = {
|
||||
email = "nixos@nzbr.de";
|
||||
github = "nzbr";
|
||||
githubId = 7851175;
|
||||
name = "nzbr";
|
||||
matrix = "@nzbr:nzbr.de";
|
||||
keys = [{
|
||||
longkeyid = "rsa2048/0x6C78B50B97A42F8A";
|
||||
fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A";
|
||||
}];
|
||||
};
|
||||
nzhang-zh = {
|
||||
email = "n.zhang.hp.au@gmail.com";
|
||||
github = "nzhang-zh";
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ let
|
|||
serviceConfig.MemoryDenyWriteExecute = true;
|
||||
serviceConfig.NoNewPrivileges = true;
|
||||
serviceConfig.PrivateDevices = true;
|
||||
serviceConfig.ProtectClock = true;
|
||||
serviceConfig.ProtectClock = mkDefault true;
|
||||
serviceConfig.ProtectControlGroups = true;
|
||||
serviceConfig.ProtectHome = true;
|
||||
serviceConfig.ProtectHostname = true;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,10 @@ in
|
|||
${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
|
||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
|
||||
'';
|
||||
# The systemd collector needs AF_UNIX
|
||||
RestrictAddressFamilies = lib.optional (lib.any (x: x == "systemd") cfg.enabledCollectors) "AF_UNIX";
|
||||
# The timex collector needs to access clock APIs
|
||||
ProtectClock = lib.any (x: x == "timex") cfg.disabledCollectors;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -172,9 +172,15 @@ in
|
|||
ExecStart = "${(removeSuffix "\n" cmd)} start";
|
||||
ExecStop = "${(removeSuffix "\n" cmd)} stop";
|
||||
Restart = "on-failure";
|
||||
TimeoutSec = "5min";
|
||||
User = "unifi";
|
||||
UMask = "0077";
|
||||
WorkingDirectory = "${stateDir}";
|
||||
# the stop command exits while the main process is still running, and unifi
|
||||
# wants to manage its own child processes. this means we have to set KillSignal
|
||||
# to something the main process ignores, otherwise every stop will have unifi.service
|
||||
# fail with SIGTERM status.
|
||||
KillSignal = "SIGCONT";
|
||||
|
||||
# Hardening
|
||||
AmbientCapabilities = "";
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
|
|||
description = "The extensible, customizable GNU text editor";
|
||||
homepage = "https://www.gnu.org/software/emacs/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lovek323 peti jwiegley adisbladis ];
|
||||
maintainers = with maintainers; [ lovek323 jwiegley adisbladis ];
|
||||
platforms = platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -113,7 +113,6 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
homepage = "http://www.sane-project.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Scanner Access Now Easy";
|
||||
homepage = "http://www.sane-project.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.sane-project.org/";
|
||||
description = "Graphical scanning frontend for sane";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [peti];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
|
|||
IPSEC.
|
||||
'';
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.peti ];
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://nostatic.org/grip";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
maintainers = with lib.maintainers; [ marcweber peti ];
|
||||
maintainers = with lib.maintainers; [ marcweber ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,6 +74,5 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://ikiwiki.info/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
let isFullPackage = mediaSupport;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = if isFullPackage then "vifm-full" else "vifm";
|
||||
version = "0.11";
|
||||
version = "0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2";
|
||||
sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh";
|
||||
sha256 = "1h5j4y704nciyzg3aaav8sl3r5h9mpwq8f28cj65nnxk6a7n3a9k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = base.meta // {
|
||||
description = "A fast incremental file transfer utility";
|
||||
maintainers = with lib.maintainers; [ peti ehmry kampfschlaefer ];
|
||||
maintainers = with lib.maintainers; [ ehmry kampfschlaefer ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ stdenv.mkDerivation {
|
|||
description = "Convert MS Word documents to plain text or PostScript";
|
||||
license = lib.licenses.gpl2;
|
||||
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
homepage = "http://www.gnucash.org/";
|
||||
|
||||
maintainers = [ lib.maintainers.peti lib.maintainers.domenkozar ];
|
||||
maintainers = [ lib.maintainers.domenkozar ];
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Real-time 3D simulation of space";
|
||||
changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@ mkDerivation rec {
|
|||
homepage = "http://stellarium.org/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ peti ma27 ];
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor";
|
||||
homepage = "http://www.tkgate.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
hydraPlatforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,31 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, eprover, ocaml, camlp4, perl, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "leo2";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz";
|
||||
sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv";
|
||||
sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ eprover ocaml perl zlib ];
|
||||
buildInputs = [ eprover ocaml camlp4 perl zlib ];
|
||||
|
||||
sourceRoot = "leo2/src";
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "lib/";
|
||||
sha256 = "sha256:01ln7hi6nvvkqkhn9hciqizizz5qspvqffgksvgmzn9x7kdd9pnh";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = "patchShebangs configure";
|
||||
preConfigure = ''
|
||||
cd src
|
||||
patchShebangs configure
|
||||
substituteInPlace Makefile.pre \
|
||||
--replace '+camlp4' "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4"
|
||||
'';
|
||||
|
||||
buildFlags = [ "opt" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -119,6 +119,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
platforms = platforms.all;
|
||||
|
||||
maintainers = with maintainers; [ peti ] ++ teams.sage.members;
|
||||
maintainers = with maintainers; teams.sage.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,5 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -113,6 +113,5 @@ stdenv.mkDerivation ({
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -26,6 +26,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
homepage = "https://wxmaxima-developers.github.io/wxmaxima/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -367,6 +367,6 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ primeos peti wmertens globin ];
|
||||
maintainers = with lib.maintainers; [ primeos wmertens globin ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "14.3.2",
|
||||
"repo_hash": "1vsppz5akx5l54riacqbzkgdy47j9r71550mg2ay5ihy6iqxa2xr",
|
||||
"version": "14.3.3",
|
||||
"repo_hash": "1sh8lf6arqljzc0hmajl2r2j38ahk9hl6kikg9inw72xycrll7dk",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.3.2-ee",
|
||||
"rev": "v14.3.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.3.2",
|
||||
"GITALY_SERVER_VERSION": "14.3.3",
|
||||
"GITLAB_PAGES_VERSION": "1.44.0",
|
||||
"GITLAB_SHELL_VERSION": "13.21.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.3.2"
|
||||
"GITLAB_WORKHORSE_VERSION": "14.3.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,11 +80,6 @@ let
|
|||
# Fixup "resolved"-entries in yarn.lock to match our offline cache
|
||||
${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
|
||||
|
||||
# fixup_yarn_lock currently doesn't correctly fix the dagre-d3
|
||||
# url, so we have to do it manually
|
||||
${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \
|
||||
'"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock
|
||||
|
||||
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
|
||||
|
||||
patchShebangs node_modules/
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ let
|
|||
};
|
||||
};
|
||||
};
|
||||
version = "14.3.2";
|
||||
version = "14.3.3";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ buildGoModule {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-00Sgv1b3dwbN7ic//7NtrdiliunOnXRJ0GTQHYFjuqo=";
|
||||
sha256 = "sha256-WC361E+p3i02n2YCOwUzRxCWFt5UMEfJi6tHZPj1dgo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.3.2";
|
||||
version = "14.3.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -1650,4 +1650,4 @@ DEPENDENCIES
|
|||
yajl-ruby (~> 1.4.1)
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.24
|
||||
2.2.20
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Network A/V plugin for OBS Studio";
|
||||
homepage = "https://github.com/Palakis/obs-ndi";
|
||||
maintainers = with maintainers; [ peti jshcmpbll ];
|
||||
maintainers = with maintainers; [ jshcmpbll ];
|
||||
license = licenses.gpl2;
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ stdenv.mkDerivation ({
|
|||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with lib.maintainers; [ peti veprbl ];
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@ stdenv.mkDerivation ({
|
|||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with lib.maintainers; [ peti veprbl ];
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
|
|
|
|||
|
|
@ -344,8 +344,6 @@ stdenv.mkDerivation ({
|
|||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with lib.maintainers; [ peti ];
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
|
|||
declarativity of logic programming.
|
||||
'';
|
||||
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A ISO-compatible high-performance Prolog compiler";
|
||||
license = lib.licenses.artistic2;
|
||||
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
platforms = lib.platforms.linux;
|
||||
broken = !stdenv.is64bit; # the linux 32 bit build fails.
|
||||
};
|
||||
|
|
|
|||
|
|
@ -42,6 +42,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl2;
|
||||
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@ stdenv.mkDerivation {
|
|||
badPlatforms = optional (versionOlder version "1.59") "aarch64-linux"
|
||||
++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"
|
||||
++ optionals (versionOlder version "1.73") lib.platforms.riscv;
|
||||
maintainers = with maintainers; [ peti ];
|
||||
};
|
||||
|
||||
preConfigure = optionalString useMpi ''
|
||||
|
|
|
|||
|
|
@ -21,6 +21,5 @@ stdenv.mkDerivation rec {
|
|||
license = "as-is";
|
||||
|
||||
platforms = lib.platforms.unix; # Once had cygwin problems
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,14 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
# Fix for falling back to GeoIP when WiFi devices are not found
|
||||
# https://gitlab.freedesktop.org/geoclue/geoclue/-/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494
|
||||
# NOTE: this should be removed when the next version is released
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494.patch";
|
||||
sha256 = "hv7t2Hmpv2oDXiPWA7JpYD9q+cuuk+En/lJJickvFII=";
|
||||
})
|
||||
|
||||
# Make the Mozilla API key configurable
|
||||
# https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported)
|
||||
(fetchpatch {
|
||||
|
|
|
|||
|
|
@ -75,7 +75,6 @@ let self = stdenv.mkDerivation rec {
|
|||
|
||||
platforms = platforms.all;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ let self = stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.peti maintainers.vrthra ];
|
||||
maintainers = [ maintainers.vrthra ];
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
|
|
|||
|
|
@ -170,7 +170,6 @@ let
|
|||
description = "A cryptographic library that implements the SSL and TLS protocols";
|
||||
license = licenses.openssl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.peti ];
|
||||
} // extraMeta;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,5 @@ stdenv.mkDerivation rec {
|
|||
license = "as-is";
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ buildPythonPackage rec {
|
|||
description = "Bugzilla XMLRPC access module";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ pierron peti ];
|
||||
maintainers = with maintainers; [ pierron ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ buildPythonPackage rec {
|
|||
description = "Django library for Mailman UIs";
|
||||
homepage = "https://gitlab.com/mailman/django-mailman3";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ globin peti qyliss ];
|
||||
maintainers = with maintainers; [ globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "emoji";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carpedm20";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sxqw1y070cpg7102a6a1bha8s25vwdgfcjp9nzlrzgd2p6pav41";
|
||||
sha256 = "0x18l8jgbki9yqx994w97dagfaqrbxi3sy2l2101is1dfjr0kib6";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.9.0";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2454e8dd93093fe6f6ec8e6771f8a7dab19f1d02c629dbbe8972e84b5d9c01e0";
|
||||
sha256 = "3804e37865b4d63ac39eac3f8f184225db16bbc69f201b4d54abe6b68f170e60";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "iminuit";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8e22d81a53ce3316f0253bf0b7831bd72ac1122ca78896c2ee2e585178c5c9ae";
|
||||
sha256 = "4b09189f3094896cfc68596adc95b7f1d92772e1de1424e5dc4dd81def56e8b0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ buildPythonPackage rec {
|
|||
description = "Mailman archiver plugin for HyperKitty";
|
||||
homepage = "https://gitlab.com/mailman/mailman-hyperkitty";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ globin peti qyliss ];
|
||||
maintainers = with maintainers; [ globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ buildPythonPackage rec {
|
|||
description = "REST client for driving Mailman 3";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ peti globin qyliss ];
|
||||
maintainers = with maintainers; [ globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybullet";
|
||||
version = "3.1.9";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6fb4d48d5ba9c09cdd1ed732e8a1d48b41bca379e072268af3831774d8391300";
|
||||
sha256 = "df02fb0ab74a6e7c4e1d7a3e2ffd7e4760a30cdeccb9fa6dd19f334122ec00f2";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sopel";
|
||||
version = "7.1.4";
|
||||
version = "7.1.5";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d778ec2b92866eddf97d0809968bc5f9887cb5a000a518a4b67d8eb999cb775c";
|
||||
sha256 = "9511dce6d23abdaa47d39d8e222c6b49206bf92e19f4acaf4966b2d402bb6541";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "versioneer";
|
||||
version = "0.20";
|
||||
version = "0.21";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ljk2AOwnF7efWcmE942TX3bkbEyu+HWoe4tO1gLy/2U=";
|
||||
sha256 = "64f2dbcbbed15f9a6da2b85f643997db729cf496cafdb97670fb2fa73a7d8e20";
|
||||
};
|
||||
|
||||
# Couldn't get tests to work because, for instance, they used virtualenv and
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dockle";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goodwithtech";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-H+qJBwKh+jh5ECMPbPgGtXzF+mm73ut0+URqpNBc3SM=";
|
||||
sha256 = "sha256-0yeHxQW6zX8Mh9JBmp915czEZCmbIom/KYHWLc/O6NY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ=";
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/jacereda/fsatrace";
|
||||
description = "filesystem access tracer";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.peti ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
Stockfish is one of the strongest chess engines in the world. It is also
|
||||
much stronger than the best human chess grandmasters.
|
||||
'';
|
||||
maintainers = with maintainers; [ luispedro peti siraben ];
|
||||
maintainers = with maintainers; [ luispedro siraben ];
|
||||
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"];
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -49,6 +49,6 @@ in stdenv.mkDerivation rec {
|
|||
homepage = "http://splix.ap2c.org";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jfrankenau peti ];
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.14.9";
|
||||
version = "5.14.12";
|
||||
release = "1";
|
||||
suffix = "xanmod${release}-cacule";
|
||||
in
|
||||
|
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
|||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-CMCZjuK9ofRup05l7HNg87jHTg4jOGrkmtvoxuNGwXE=";
|
||||
sha256 = "sha256-JVTi319BLHM4CgF7KaN3C/92N4uwh59po1AcOinNpww=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Domain name server";
|
||||
license = licenses.mpl20;
|
||||
|
||||
maintainers = with maintainers; [ peti globin ];
|
||||
maintainers = with maintainers; [ globin ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
outputsToInstall = [ "out" "dnsutils" "host" ];
|
||||
|
|
|
|||
|
|
@ -89,6 +89,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://httpd.apache.org/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ lovek323 peti ];
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
broken = true; # patch 'compile-against-apache24.diff' no longer works
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://dovecot.org/";
|
||||
description = "Open source IMAP and POP3 email server written with security primarily in mind";
|
||||
license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ];
|
||||
maintainers = with maintainers; [ peti fpletz globin ajs124 ];
|
||||
maintainers = with maintainers; [ fpletz globin ajs124 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
passthru.tests = {
|
||||
|
|
|
|||
|
|
@ -54,6 +54,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://www.gnu.org/software/mailman/";
|
||||
description = "Free software for managing electronic mail discussion and newsletter lists";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ peti qyliss ];
|
||||
maintainers = with lib.maintainers; [ qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,6 @@ buildPythonPackage rec {
|
|||
description = "Archiver for GNU Mailman v3";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ peti globin qyliss ];
|
||||
maintainers = with lib.maintainers; [ globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://docs.mailman3.org/projects/postorius";
|
||||
description = "Web-based user interface for managing GNU Mailman";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ globin peti qyliss ];
|
||||
maintainers = with maintainers; [ globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Django project for Mailman 3 web interface";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ peti qyliss m1cr0man ];
|
||||
maintainers = with maintainers; [ qyliss m1cr0man ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,6 @@ perlPackages.buildPerlPackage rec {
|
|||
description = "Open-Source Spam Filter";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ peti qknight qyliss ];
|
||||
maintainers = with lib.maintainers; [ qknight qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -132,7 +132,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
platforms = platforms.all;
|
||||
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
platforms = platforms.all;
|
||||
|
||||
maintainers = with maintainers; [ peti dtzWill ];
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Programmable completion for the bash shell";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.peti maintainers.xfix ];
|
||||
maintainers = [ maintainers.xfix ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.c-amie.co.uk/software/analog/";
|
||||
license = lib.licenses.gpl2;
|
||||
description = "Powerful tool to generate web server statistics";
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,6 @@ pythonPackages.buildPythonApplication rec {
|
|||
description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
|
||||
homepage = "https://www.nongnu.org/duplicity";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A tool for programming graphics intended to replace Metapost";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.raskin maintainers.peti ];
|
||||
maintainers = [ maintainers.raskin ];
|
||||
broken = stdenv.isDarwin; # https://github.com/vectorgraphics/asymptote/issues/69
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ peti vrthra ];
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
22
pkgs/tools/misc/xstow/default.nix
Normal file
22
pkgs/tools/misc/xstow/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, lib, fetchurl, ncurses }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xstow";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.sourceforge.net/sourceforge/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "6f041f19a5d71667f6a9436d56f5a50646b6b8c055ef5ae0813dcecb35a3c6ef";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A replacement of GNU Stow written in C++";
|
||||
homepage = "http://xstow.sourceforge.net";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ nzbr ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://nbd.sourceforge.net";
|
||||
description = "Map arbitrary files as block devices over the network";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, flex, cmake, libpcap }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "packetdrill";
|
||||
version = "unstable-2020-08-22";
|
||||
|
|
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
|
|||
rev = "68a34fa73cf221e5f52d6fa4f203bcd93062be1b";
|
||||
sha256 = "0djkwb6l2959f44d98vwb092rghf0qmii8391vrpxqb99j6pv4h6";
|
||||
};
|
||||
patches = [
|
||||
# Upstream fix for -fno-common toolchains
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/google/packetdrill/commit/c08292838de81a71ee477d5bf9d95b1130a1292b.patch";
|
||||
sha256 = "1irbar1zkydmgqb12r3xd80dwj2jfxnxayxpb4nmbma8xm7knb10";
|
||||
stripLen = 3;
|
||||
})
|
||||
];
|
||||
|
||||
setSourceRoot = ''
|
||||
export sourceRoot=$(realpath */gtests/net/packetdrill)
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -43,6 +43,5 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
|||
frontend applications and libraries are available. Version 2 of GnuPG
|
||||
also provides support for S/MIME.
|
||||
'';
|
||||
maintainers = with maintainers; [ peti fpletz vrthra ];
|
||||
maintainers = with maintainers; [ fpletz vrthra ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Tools for monitoring the health of hard drives";
|
||||
homepage = "https://www.smartmontools.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peti Frostman ];
|
||||
maintainers = with maintainers; [ Frostman ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
mainProgram = "smartctl";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -52,6 +52,5 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [lib.maintainers.peti];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9552,6 +9552,7 @@ with pkgs;
|
|||
storeBackup = callPackage ../tools/backup/store-backup { };
|
||||
|
||||
stow = callPackage ../tools/misc/stow { };
|
||||
xstow = callPackage ../tools/misc/xstow { };
|
||||
|
||||
stun = callPackage ../tools/networking/stun { };
|
||||
|
||||
|
|
@ -31152,7 +31153,7 @@ with pkgs;
|
|||
mathlibtools = with python3Packages; toPythonApplication mathlibtools;
|
||||
|
||||
leo2 = callPackage ../applications/science/logic/leo2
|
||||
{ ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; };
|
||||
{ inherit (ocaml-ng.ocamlPackages_4_05) ocaml camlp4; };
|
||||
|
||||
leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue