dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-03-29 00:15:48 +00:00 committed by GitHub
commit d495e7527f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 756 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -8327,6 +8327,12 @@
githubId = 4958190;
name = "Rushmore Mushambi";
};
russell = {
email = "russell.sim@gmail.com";
github = "russell";
githubId = 2660;
name = "Russell Sim";
};
ruuda = {
email = "dev+nix@veniogames.com";
github = "ruuda";

4
nixos/modules/misc/ids.nix
View File

@ -71,7 +71,7 @@ in
#utmp = 29; # unused
# ddclient = 30; # converted to DynamicUser = true
davfs2 = 31;
#disnix = 33; # module removed
disnix = 33;
osgi = 34;
tor = 35;
cups = 36;
@ -387,7 +387,7 @@ in
utmp = 29;
# ddclient = 30; # converted to DynamicUser = true
davfs2 = 31;
#disnix = 33; # module removed
disnix = 33;
osgi = 34;
tor = 35;
#cups = 36; # unused

2
nixos/modules/module-list.nix
View File

@ -461,6 +461,8 @@
./services/misc/devmon.nix
./services/misc/dictd.nix
./services/misc/dwm-status.nix
./services/misc/dysnomia.nix
./services/misc/disnix.nix
./services/misc/docker-registry.nix
./services/misc/domoticz.nix
./services/misc/errbot.nix

4
nixos/modules/services/audio/mpd.nix
View File

@ -213,7 +213,9 @@ in {
description = "Music Player Daemon Socket";
wantedBy = [ "sockets.target" ];
listenStreams = [
"${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}"
(if pkgs.lib.hasPrefix "/" cfg.network.listenAddress
then cfg.network.listenAddress
else "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}")
];
socketConfig = {
Backlog = 5;

6
nixos/modules/services/logging/graylog.nix
View File

@ -39,7 +39,6 @@ in
type = types.package;
default = pkgs.graylog;
defaultText = "pkgs.graylog";
example = literalExample "pkgs.graylog";
description = "Graylog package to use.";
};
@ -138,14 +137,13 @@ in
"d '${cfg.messageJournalDir}' - ${cfg.user} - - -"
];
systemd.services.graylog = with pkgs; {
systemd.services.graylog = {
description = "Graylog Server";
wantedBy = [ "multi-user.target" ];
environment = {
JAVA_HOME = jre;
GRAYLOG_CONF = "${confFile}";
};
path = [ pkgs.jre_headless pkgs.which pkgs.procps ];
path = [ pkgs.which pkgs.procps ];
preStart = ''
rm -rf /var/lib/graylog/plugins || true
mkdir -p /var/lib/graylog/plugins -m 755

98
nixos/modules/services/misc/disnix.nix Normal file
View File

@ -0,0 +1,98 @@
# Disnix server
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.disnix;
in
{
###### interface
options = {
services.disnix = {
enable = mkEnableOption "Disnix";
enableMultiUser = mkOption {
type = types.bool;
default = true;
description = "Whether to support multi-user mode by enabling the Disnix D-Bus service";
};
useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat";
package = mkOption {
type = types.path;
description = "The Disnix package";
default = pkgs.disnix;
defaultText = "pkgs.disnix";
};
enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH";
profiles = mkOption {
type = types.listOf types.string;
default = [ "default" ];
example = [ "default" ];
description = "Names of the Disnix profiles to expose in the system's PATH";
};
};
};
###### implementation
config = mkIf cfg.enable {
dysnomia.enable = true;
environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles);
services.dbus.enable = true;
services.dbus.packages = [ pkgs.disnix ];
services.tomcat.enable = cfg.useWebServiceInterface;
services.tomcat.extraGroups = [ "disnix" ];
services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
services.tomcat.sharedLibs = optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;
users.groups.disnix.gid = config.ids.gids.disnix;
systemd.services = {
disnix = mkIf cfg.enableMultiUser {
description = "Disnix server";
wants = [ "dysnomia.target" ];
wantedBy = [ "multi-user.target" ];
after = [ "dbus.service" ]
++ optional config.services.httpd.enable "httpd.service"
++ optional config.services.mysql.enable "mysql.service"
++ optional config.services.postgresql.enable "postgresql.service"
++ optional config.services.tomcat.enable "tomcat.service"
++ optional config.services.svnserve.enable "svnserve.service"
++ optional config.services.mongodb.enable "mongodb.service"
++ optional config.services.influxdb.enable "influxdb.service";
restartIfChanged = false;
path = [ config.nix.package cfg.package config.dysnomia.package "/run/current-system/sw" ];
environment = {
HOME = "/root";
}
// (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {})
// (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {});
serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service";
};
};
};
}

259
nixos/modules/services/misc/dysnomia.nix Normal file
View File

@ -0,0 +1,259 @@
{pkgs, lib, config, ...}:
with lib;
let
cfg = config.dysnomia;
printProperties = properties:
concatMapStrings (propertyName:
let
property = properties.${propertyName};
in
if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties.${propertyName})})\n"
else "${propertyName}=\"${toString property}\"\n"
) (builtins.attrNames properties);
properties = pkgs.stdenv.mkDerivation {
name = "dysnomia-properties";
buildCommand = ''
cat > $out << "EOF"
${printProperties cfg.properties}
EOF
'';
};
containersDir = pkgs.stdenv.mkDerivation {
name = "dysnomia-containers";
buildCommand = ''
mkdir -p $out
cd $out
${concatMapStrings (containerName:
let
containerProperties = cfg.containers.${containerName};
in
''
cat > ${containerName} <<EOF
${printProperties containerProperties}
type=${containerName}
EOF
''
) (builtins.attrNames cfg.containers)}
'';
};
linkMutableComponents = {containerName}:
''
mkdir ${containerName}
${concatMapStrings (componentName:
let
component = cfg.components.${containerName}.${componentName};
in
"ln -s ${component} ${containerName}/${componentName}\n"
) (builtins.attrNames (cfg.components.${containerName} or {}))}
'';
componentsDir = pkgs.stdenv.mkDerivation {
name = "dysnomia-components";
buildCommand = ''
mkdir -p $out
cd $out
${concatMapStrings (containerName:
linkMutableComponents { inherit containerName; }
) (builtins.attrNames cfg.components)}
'';
};
dysnomiaFlags = {
enableApacheWebApplication = config.services.httpd.enable;
enableAxis2WebService = config.services.tomcat.axis2.enable;
enableDockerContainer = config.virtualisation.docker.enable;
enableEjabberdDump = config.services.ejabberd.enable;
enableMySQLDatabase = config.services.mysql.enable;
enablePostgreSQLDatabase = config.services.postgresql.enable;
enableTomcatWebApplication = config.services.tomcat.enable;
enableMongoDatabase = config.services.mongodb.enable;
enableSubversionRepository = config.services.svnserve.enable;
enableInfluxDatabase = config.services.influxdb.enable;
};
in
{
options = {
dysnomia = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable Dysnomia";
};
enableAuthentication = mkOption {
type = types.bool;
default = false;
description = "Whether to publish privacy-sensitive authentication credentials";
};
package = mkOption {
type = types.path;
description = "The Dysnomia package";
};
properties = mkOption {
description = "An attribute set in which each attribute represents a machine property. Optionally, these values can be shell substitutions.";
default = {};
};
containers = mkOption {
description = "An attribute set in which each key represents a container and each value an attribute set providing its configuration properties";
default = {};
};
components = mkOption {
description = "An atttribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state";
default = {};
};
extraContainerProperties = mkOption {
description = "An attribute set providing additional container settings in addition to the default properties";
default = {};
};
extraContainerPaths = mkOption {
description = "A list of paths containing additional container configurations that are added to the search folders";
default = [];
};
extraModulePaths = mkOption {
description = "A list of paths containing additional modules that are added to the search folders";
default = [];
};
enableLegacyModules = mkOption {
type = types.bool;
default = true;
description = "Whether to enable Dysnomia legacy process and wrapper modules";
};
};
};
config = mkIf cfg.enable {
environment.etc = {
"dysnomia/containers" = {
source = containersDir;
};
"dysnomia/components" = {
source = componentsDir;
};
"dysnomia/properties" = {
source = properties;
};
};
environment.variables = {
DYSNOMIA_STATEDIR = "/var/state/dysnomia-nixos";
DYSNOMIA_CONTAINERS_PATH = "${lib.concatMapStrings (containerPath: "${containerPath}:") cfg.extraContainerPaths}/etc/dysnomia/containers";
DYSNOMIA_MODULES_PATH = "${lib.concatMapStrings (modulePath: "${modulePath}:") cfg.extraModulePaths}/etc/dysnomia/modules";
};
environment.systemPackages = [ cfg.package ];
dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) {
enableLegacy = builtins.trace ''
WARNING: Dysnomia has been configured to use the legacy 'process' and 'wrapper'
modules for compatibility reasons! If you rely on these modules, consider
migrating to better alternatives.
More information: https://raw.githubusercontent.com/svanderburg/dysnomia/f65a9a84827bcc4024d6b16527098b33b02e4054/README-legacy.md
If you have migrated already or don't rely on these Dysnomia modules, you can
disable legacy mode with the following NixOS configuration option:
dysnomia.enableLegacyModules = false;
In a future version of Dysnomia (and NixOS) the legacy option will go away!
'' true;
});
dysnomia.properties = {
hostname = config.networking.hostName;
inherit (config.nixpkgs.localSystem) system;
supportedTypes = [
"echo"
"fileset"
"process"
"wrapper"
# These are not base modules, but they are still enabled because they work with technology that are always enabled in NixOS
"systemd-unit"
"sysvinit-script"
"nixos-configuration"
]
++ optional (dysnomiaFlags.enableApacheWebApplication) "apache-webapplication"
++ optional (dysnomiaFlags.enableAxis2WebService) "axis2-webservice"
++ optional (dysnomiaFlags.enableDockerContainer) "docker-container"
++ optional (dysnomiaFlags.enableEjabberdDump) "ejabberd-dump"
++ optional (dysnomiaFlags.enableInfluxDatabase) "influx-database"
++ optional (dysnomiaFlags.enableMySQLDatabase) "mysql-database"
++ optional (dysnomiaFlags.enablePostgreSQLDatabase) "postgresql-database"
++ optional (dysnomiaFlags.enableTomcatWebApplication) "tomcat-webapplication"
++ optional (dysnomiaFlags.enableMongoDatabase) "mongo-database"
++ optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository";
};
dysnomia.containers = lib.recursiveUpdate ({
process = {};
wrapper = {};
}
// lib.optionalAttrs (config.services.httpd.enable) { apache-webapplication = {
documentRoot = config.services.httpd.virtualHosts.localhost.documentRoot;
}; }
// lib.optionalAttrs (config.services.tomcat.axis2.enable) { axis2-webservice = {}; }
// lib.optionalAttrs (config.services.ejabberd.enable) { ejabberd-dump = {
ejabberdUser = config.services.ejabberd.user;
}; }
// lib.optionalAttrs (config.services.mysql.enable) { mysql-database = {
mysqlPort = config.services.mysql.port;
mysqlSocket = "/run/mysqld/mysqld.sock";
} // lib.optionalAttrs cfg.enableAuthentication {
mysqlUsername = "root";
};
}
// lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = {
} // lib.optionalAttrs (cfg.enableAuthentication) {
postgresqlUsername = "postgres";
};
}
// lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = {
tomcatPort = 8080;
}; }
// lib.optionalAttrs (config.services.mongodb.enable) { mongo-database = {}; }
// lib.optionalAttrs (config.services.influxdb.enable) {
influx-database = {
influxdbUsername = config.services.influxdb.user;
influxdbDataDir = "${config.services.influxdb.dataDir}/data";
influxdbMetaDir = "${config.services.influxdb.dataDir}/meta";
};
}
// lib.optionalAttrs (config.services.svnserve.enable) { subversion-repository = {
svnBaseDir = config.services.svnserve.svnBaseDir;
}; }) cfg.extraContainerProperties;
boot.extraSystemdUnitPaths = [ "/etc/systemd-mutable/system" ];
system.activationScripts.dysnomia = ''
mkdir -p /etc/systemd-mutable/system
if [ ! -f /etc/systemd-mutable/system/dysnomia.target ]
then
( echo "[Unit]"
echo "Description=Services that are activated and deactivated by Dysnomia"
echo "After=final.target"
) > /etc/systemd-mutable/system/dysnomia.target
fi
'';
};
}

9
nixos/modules/services/networking/kresd.nix
View File

@ -10,12 +10,12 @@ let
mkListen = kind: addr: let
al_v4 = builtins.match "([0-9.]+):([0-9]+)" addr;
al_v6 = builtins.match "\\[(.+)]:([0-9]+)" addr;
al_portOnly = builtins.match "()([0-9]+)" addr;
al_portOnly = builtins.match "([0-9]+)" addr;
al = findFirst (a: a != null)
(throw "services.kresd.*: incorrect address specification '${addr}'")
[ al_v4 al_v6 al_portOnly ];
port = last al;
addrSpec = if al_portOnly == null then "'${head al}'" else "{'::', '127.0.0.1'}";
addrSpec = if al_portOnly == null then "'${head al}'" else "{'::', '0.0.0.0'}";
in # freebind is set for compatibility with earlier kresd services;
# it could be configurable, for example.
''
@ -137,10 +137,5 @@ in {
};
# We don't mind running stop phase from wrong version. It seems less racy.
systemd.services."kresd@".stopIfChanged = false;
# Try cleaning up the previously default location of cache file.
# Note that /var/cache/* should always be safe to remove.
# TODO: remove later, probably between 20.09 and 21.05
systemd.tmpfiles.rules = [ "R /var/cache/kresd" ];
};
}

4
pkgs/applications/audio/qmidinet/default.nix
View File

@ -1,12 +1,12 @@
{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsaLib, libjack2 }:
mkDerivation rec {
version = "0.6.3";
version = "0.9.1";
pname = "qmidinet";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
sha256 = "04jbvnf6yp9l0bhl1ym6zqkmaz8c2az3flq7qgflaxzj3isns1p1";
sha256 = "sha256-cDgF5hbjy5DzGn4Rlmb76XzRa2wURVwPu2rQRKENxQU=";
};
hardeningDisable = [ "format" ];

4
pkgs/applications/audio/qsynth/default.nix
View File

@ -4,11 +4,11 @@
mkDerivation rec {
pname = "qsynth";
version = "0.6.3";
version = "0.9.1";
src = fetchurl {
url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv";
sha256 = "sha256-VNcI5QOVacHBcI6psEvhm7+cOTpwr2pMVXmk7nMXNiY=";
};
nativeBuildInputs = [ autoconf pkg-config ];

1
pkgs/applications/misc/calibre/default.nix
View File

@ -86,6 +86,7 @@ mkDerivation rec {
with python3Packages; [
apsw
beautifulsoup4
cchardet
css-parser
cssselect
dateutil

2
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
# Unpack & enter
mkdir -p "$TBB_IN_STORE"
tar xf "${src}" -C "$TBB_IN_STORE" --strip-components=2
tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2
pushd "$TBB_IN_STORE"
# Set ELF interpreter

10
pkgs/applications/networking/remote/waypipe/default.nix
View File

@ -1,26 +1,20 @@
{ lib, stdenv, fetchFromGitLab
, meson, ninja, pkg-config, scdoc
, openssh
, mesa, lz4, zstd, ffmpeg, libva
}:
stdenv.mkDerivation rec {
pname = "waypipe-unstable";
version = "0.7.2";
version = "0.8.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mstoeckl";
repo = "waypipe";
rev = "v${version}";
sha256 = "sha256-LtfrSEwZikOXp/fdyJ/+EylRx19zdsHMkrl1eEf1/aY=";
sha256 = "1qa47ljfvb1vv3h647xwn1j5j8gfmcmdfaz4j8ygnkvj36y87vnz";
};
postPatch = ''
substituteInPlace src/waypipe.c \
--replace "/usr/bin/ssh" "${openssh}/bin/ssh"
'';
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
buildInputs = [

4
pkgs/applications/science/astronomy/stellarium/default.nix
View File

@ -6,13 +6,13 @@
mkDerivation rec {
pname = "stellarium";
version = "0.20.4";
version = "0.21.0";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
sha256 = "sha256-EhlcaMxlDyX2RneBrpbmLScc9vd77Tf7RPblbQqAqZ0=";
sha256 = "sha256-LOBWfKLtoFemiWBUVayIBG0DORvjI6h9kgaPH9hGmKY=";
};
nativeBuildInputs = [ cmake perl wrapQtAppsHook ];

4
pkgs/applications/science/math/calc/default.nix
View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "calc";
version = "2.12.9.0";
version = "2.12.9.1";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
sha256 = "sha256-334WUhPG30U72hwzpHAZRNdmr/uBleOvEhu3rW9d5dM=";
sha256 = "sha256-B3ko+RNT+LYSJG1P5cujgRMc1OJhDPqm1ONrMh+7fI4=";
};
postPatch = ''

10
pkgs/applications/version-management/git-and-tools/git-bug/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "git-bug";
version = "0.7.1"; # the `rev` below pins the version of the source to get
rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c";
version = "0.7.2"; # the `rev` below pins the version of the source to get
rev = "cc4a93c8ce931b1390c61035b888ad17110b7bd6";
src = fetchFromGitHub {
inherit rev;
owner = "MichaelMure";
repo = "git-bug";
sha256 = "01ab3mlwh5g1vr3x85fppflg18gb8ip9mjfsp2b5rfigd9lxyyns";
sha256 = "0r6wh0y1fj3d3fbbrzq5n9k6z94xvwqww3xfbslkgyrin5bmziiq";
};
vendorSha256 = "0c8b47lj4wl3s21lm0vx4z7hznylm8c4fb8b8gxm278kn3zys607";
vendorSha256 = "15hhsrwwjc4krfc2d0r15lys3vr9rb9xk62pan4jr9ycbv0dny90";
doCheck = false;
@ -32,7 +32,7 @@ buildGoModule rec {
meta = with lib; {
description = "Distributed bug tracker embedded in Git";
homepage = "https://github.com/MichaelMure/git-bug";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ royneary ];
};
}

4
pkgs/applications/video/jellyfin-mpv-shim/default.nix
View File

@ -20,11 +20,11 @@
buildPythonApplication rec {
pname = "jellyfin-mpv-shim";
version = "1.10.2";
version = "1.10.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ivNkVpC+uQfbcAyQZ0xIG1k1MLIgpkiqTMVnkoYlJyY=";
sha256 = "sha256-Tl7P8SJ/ZuwIi8RxDWkhfd7LUd63xv5Ehg1UqaYHb1g=";
};
propagatedBuildInputs = [

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

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

24
pkgs/data/fonts/vista-fonts-chs/default.nix
View File

@ -1,15 +1,23 @@
{ lib, fetchzip, buildPackages }:
{ lib, stdenvNoCC, fetchurl, cabextract }:
# Modified from vista-fonts
stdenvNoCC.mkDerivation {
pname = "vista-fonts-chs";
version = "1";
fetchzip {
name = "vista-fonts-chs-1";
src = fetchurl {
url = "http://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
# Alternative mirror:
# http://www.eeo.cn/download/font/VistaFont_CHS.EXE
sha256 = "1qwm30b8aq9piyqv07hv8b5bac9ms40rsdf8pwix5dyk8020i8xi";
};
url = "http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
nativeBuildInputs = [ cabextract ];
postFetch = ''
${buildPackages.cabextract}/bin/cabextract --lowercase --filter '*.TTF' $downloadedFile
unpackPhase = ''
cabextract --lowercase --filter '*.TTF' $src
'';
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
@ -20,8 +28,6 @@ fetchzip {
--subst-var-by fontname "Microsoft YaHei"
'';
sha256 = "1zwrgck84k80gpg7493jdnxnv9ajxk5c7qndinnmqydnrw239zbw";
meta = {
description = "TrueType fonts from Microsoft Windows Vista For Simplified Chinese (Microsoft YaHei)";
homepage = "https://www.microsoft.com/typography/fonts/family.aspx?FID=350";

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

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "dlib";
version = "19.21";
version = "19.22";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
sha256 = "00jwklnl21l3hlvb0bjc6rl3hgi88vxb41dsn4m0kh436c9v0rl3";
sha256 = "sha256-cEbw01w4KgSG3JTvTE/qruo7i4/L++m02HW+0VNmSSQ=";
};
postPatch = ''

2
pkgs/development/ocaml-modules/cpuid/default.nix
View File

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "cpuid";
version = "0.1.2";
useDune2 = true;
minimumOCamlVersion = "4.03";
src = fetchurl {

2
pkgs/development/ocaml-modules/wtf8/default.nix
View File

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "wtf8";
version = "1.0.2";
useDune2 = true;
minimumOCamlVersion = "4.02";
src = fetchurl {

24
pkgs/development/python-modules/labmath/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "labmath";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-/fZ61tJ6PVZsubr3OXlbg/VxyyKimz36uPV+r33kgD0=";
};
postPatch = ''
substituteInPlace setup.py --replace "labmath/DESCRIPTION.rst" "PKG-INFO"
'';
pythonImportsCheck = [ "labmath" ];
meta = with lib; {
homepage = "https://pypi.org/project/labmath";
description = "Module for basic math in the general vicinity of computational number theory";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
};
}

4
pkgs/development/tools/analysis/codeql/default.nix
View File

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.4.6";
version = "2.5.0";
dontConfigure = true;
dontBuild = true;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-lJ/N9oduWGZAc70wl7ATBd1mnaUkeTXAW/RfqbAthsI=";
sha256 = "sha256-teZ/9+oAEqGmy2S8Q89YDe8lqvAjzV6RWJ5AnfgQ6Mc=";
};
nativeBuildInputs = [

2
pkgs/development/tools/continuous-integration/fly/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, lib, writeText }:
{ buildGoModule, fetchFromGitHub, stdenv, lib }:
buildGoModule rec {
pname = "fly";

24
pkgs/development/tools/vendir/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "vendir";
version = "0.17.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-vendir";
rev = "v${version}";
sha256 = "14yd14z4666alwsn2jhcvg2kijvw4qjr4h3gikchiir38w520fs9";
};
vendorSha256 = null;
subPackages = [ "cmd/vendir" ];
meta = with lib; {
description = "CLI tool to vendor portions of git repos, github releases, helm charts, docker image contents, etc. declaratively";
homepage = "https://carvel.dev/vendir/";
license = licenses.asl20;
maintainers = with maintainers; [ russell ];
};
}

72
pkgs/misc/vim-plugins/generated.nix
View File

@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-03-24";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "b1f95dc4fb15efb1d5238845c99548f2906e2ba3";
sha256 = "0sx2k1wqv0cl3a489cqz1mf0bvr8xsjbqax8pgw1d0c4kdz17py6";
rev = "655f0070cd2ce575f81092d1faac739fd116b515";
sha256 = "1g85cy5nmc1h2bkwm46qzsx6m19cm8mk9knyb88zanf23bj4w9xc";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-03-25";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "e52b59c999bb713ea6ee4d7e88c40f9c8ca76567";
sha256 = "0pccr6rqgk1m291pa8505y246p00fkvdzkgb9hz63qnab29h08l0";
rev = "a1d8f109efba85a98253b743a367e00a042df8cb";
sha256 = "1lyyqkfcmsgqdmd7r0qs0b46c125q6jix833jcc954pgzwlfrk0a";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -509,12 +509,12 @@ let
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
version = "2021-03-19";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
rev = "ed79b7745d31c2981feb9922e8a4ec2f7be5f376";
sha256 = "0ncxa7xjgkdjha7jyqfd3s7lmm459lg9achmid0qjwx0r0cavzdb";
rev = "f996547651b775155bbc14f8031a4b674320a9ee";
sha256 = "09h9ybb9lir9lq62496dh3d57i8x01a0iy2kfg273rp1fn7l8j03";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@ -1967,12 +1967,12 @@ let
iosvkem = buildVimPluginFrom2Nix {
pname = "iosvkem";
version = "2020-06-18";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "neutaaaaan";
repo = "iosvkem";
rev = "df359d91510be0c078905568d9033c891a3a2f4b";
sha256 = "0xqh5hr4m6hm2vfms1iqarzhgkmrgx6f5ywyh6qhwkbrdj8q3lyq";
rev = "ba116cae99eaa116f781f4bfef0a20a80bc19e98";
sha256 = "1as5xfcc6bgm2sp23qzxjpasbnx9jsdgzc97hhmybhq4115kfmxv";
};
meta.homepage = "https://github.com/neutaaaaan/iosvkem/";
};
@ -2340,12 +2340,12 @@ let
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
version = "2021-03-25";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
rev = "62c22d0f05c79a1bc890b15c1a1a5a0215936e2f";
sha256 = "1j3f4i48bi54ck14sv8vnknz68v21jggf1gw8p7vq77h08il7gbi";
rev = "a3037fbf0b101daa0ab2564ee3948d52e470ce03";
sha256 = "1r8aryyl8zajj1vpvkwf4lqikgjxpagdiahcvgbclfdmc3dn82c7";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@ -2976,12 +2976,12 @@ let
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
version = "2021-03-25";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
rev = "18b21cd97d8675d0a37ea7a0de1b767c51418f19";
sha256 = "18gzdax70hcjs7ckfq6c4b0kplh9q5fsay9hwz5kyqym28ndrvx3";
rev = "3aaeb3d070538a7208363cc775258d52a6da5b3f";
sha256 = "1gsg1m27rdcbg2qszxwnvjigwxgy5n9rdc6nl9r902rg5kzhb054";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@ -3180,12 +3180,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-03-24";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "f9785053a4ef4aaa2d0aac958bc09a1a289d2fbf";
sha256 = "182ys6zrwjw1jqs6rjqz3lbv51jw0ija5jmrpj4rs7psin7mcx0j";
rev = "6bfb478a002081d59bafd2cc4fe6ef4ea1761c3b";
sha256 = "1vbqfbxybwrqc4nhi6v6qm5wc2a9zxh7mdh84897njkiykmwn09j";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -4381,6 +4381,18 @@ let
meta.homepage = "https://github.com/jacoborus/tender.vim/";
};
termwrapper-nvim = buildVimPluginFrom2Nix {
pname = "termwrapper-nvim";
version = "2020-12-23";
src = fetchFromGitHub {
owner = "oberblastmeister";
repo = "termwrapper.nvim";
rev = "beb5d2d8a4b6c8fee10cfe5e0dfda158bb0cb33a";
sha256 = "05vr38w4qx42hy9injnji7qjkzm7pkysbkr8mlzalwb0i2giy51a";
};
meta.homepage = "https://github.com/oberblastmeister/termwrapper.nvim/";
};
tern_for_vim = buildVimPluginFrom2Nix {
pname = "tern_for_vim";
version = "2019-01-23";
@ -5152,12 +5164,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-03-24";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "fc5060933e9f35a107d1646c90d4e1216301ab48";
sha256 = "0g36p0wqrvm6v4ga64z84jri5c8n5hq6y7f5yig7kszk01wvc6hh";
rev = "a3b20219708ff9e08d9afd9689e6c34ca780d3f2";
sha256 = "0s03xsfblfk778g0yr6ykg509kx21i3rmnjff335nwq8nb1ldxkz";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -8577,12 +8589,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-03-25";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "428906647a22fdb30409554935eacdd9932726cb";
sha256 = "1kyg2j06b6677pfaj2aqw9ivdlrg02hhpy2jyr11xrqy83k461hi";
rev = "41667e58248595aa50109f856f47cb38ab93225a";
sha256 = "1zwsflvxljmx7mndpq5ph19n5kk5cild4grg7dvan9jd2qlf6cvi";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -8625,12 +8637,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
version = "2021-03-08";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
rev = "954754c830d2ca7da3157cdea029c8d50021d0bc";
sha256 = "1cw79hzkisii0g2n457wbzha65wbpp00x3yrb8rb3d5299bz0z72";
rev = "b37d9b3331b8345a7c6cb821eda89e08eb7d7fa1";
sha256 = "12m54rj9xjcbyfa61z9qim8mbwqcmjfqkmdsp23jlm41nw17627y";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};

2
pkgs/misc/vim-plugins/overrides.nix
View File

@ -731,7 +731,7 @@ self: super: {
libiconv
];
cargoSha256 = "u1ryOhwDgRBQ32MBPkWHI6eU6yZqNAZfyKvckr6nvCY=";
cargoSha256 = "1f8ns3a5am9jb52niy3ass9hpzymjml62f3d7vyl1fvk3rriq4jw";
};
in
''

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -442,6 +442,7 @@ nvim-treesitter/nvim-treesitter
nvim-treesitter/nvim-treesitter-refactor
nvim-treesitter/nvim-treesitter-textobjects
nvim-treesitter/playground
oberblastmeister/termwrapper.nvim
ocaml/vim-ocaml
octol/vim-cpp-enhanced-highlight
ojroques/vim-oscyank@main

4
pkgs/servers/radarr/update.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl nix-prefetch jq
#!nix-shell -i bash -p curl gnused nix-prefetch jq
set -e
@ -17,7 +17,7 @@ updateHash()
hash=$(nix-prefetch-url --type sha256 $url)
sriHash="$(nix to-sri --type sha256 $hash)"
sed -i "s/$hashKey = \"[a-zA-Z0-9\/+-=]*\";/$hashKey = \"$sriHash\";/g" "$dirname/default.nix"
sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"
}
updateVersion()

6
pkgs/tools/misc/goreleaser/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.160.0";
version = "0.161.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XrZlDYHGexBGxEhpFVjovUYE9Cpu/QaYp11JmBnqT8o=";
sha256 = "sha256-hCb9w8jyHJ7wGszseyweJDAVjnuxErXdwIRUGfXLRfI=";
};
vendorSha256 = "sha256-mzT9PLthx08Hil0DBxtw6/ouZrZZSfyElWro1iyJsTY=";
vendorSha256 = "sha256-rQF9B5syexMzHji7zXSj7YVIJnOwMR0hzTrRzKCMGYw=";
buildFlagsArray = [
"-ldflags="

4
pkgs/tools/misc/graylog/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, jre_headless, nixosTests }:
{ lib, stdenv, fetchurl, makeWrapper, openjdk11_headless, nixosTests }:
stdenv.mkDerivation rec {
pname = "graylog";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
nativeBuildInputs = [ makeWrapper ];
makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ];
makeWrapperArgs = [ "--set-default" "JAVA_HOME" "${openjdk11_headless}" ];
passthru.tests = { inherit (nixosTests) graylog; };

4
pkgs/tools/misc/svtplay-dl/default.nix
View File

@ -8,13 +8,13 @@ let
in stdenv.mkDerivation rec {
pname = "svtplay-dl";
version = "3.0";
version = "3.3";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
sha256 = "1k7829sgvs2ihnf8d3zrqk99ifm9867wcn6f8zg628h8aqsif4fc";
sha256 = "00pz5vv39qjsw67fdlj6942371lyvv368lc82z17nnh723ck54yy";
};
pythonPaths = [ pycrypto pyyaml requests ];

65
pkgs/tools/misc/urjtag/default.nix
View File

@ -1,38 +1,57 @@
{ lib, stdenv, autoconf, automake, pkg-config, gettext, libtool, bison
, flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline
, python3
, svfSupport ? true
{ lib
, stdenv
, fetchurl
, autoconf
, automake
, autoreconfHook
, gettext
, libftdi1
, libtool
, libusb-compat-0_1
, makeWrapper
, pkg-config
, readline
, which
, bsdlSupport ? true
, staplSupport ? true
, jedecSupport ? true
, staplSupport ? true
, svfSupport ? true
}:
stdenv.mkDerivation rec {
version = "2019.12";
pname = "urjtag";
version = "2021.03";
src = fetchurl {
url = "https://downloads.sourceforge.net/project/urjtag/urjtag/${version}/urjtag-${version}.tar.xz";
sha256 = "1k2vmvvarik0q3llbfbk8ad35mcns7w1ln9gla1mn7z9c6x6x90r";
url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.xz";
hash = "sha256-sKLqokVROvCW3E13AQmDIzXGlMbBKqXpL++uhoVBbxw=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gettext autoconf automake libtool bison flex which
subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ];
configureFlags = [
(lib.enableFeature svfSupport "svf")
(lib.enableFeature bsdlSupport "bsdl")
(lib.enableFeature staplSupport "stapl")
(lib.enableFeature jedecSupport "jedec-exp")
nativeBuildInputs = [
autoreconfHook
pkg-config
which
gettext
];
buildInputs = [
libftdi1
libtool
libusb-compat-0_1
readline
];
meta = {
description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
configureFlags = [
(lib.enableFeature bsdlSupport "bsdl")
(lib.enableFeature jedecSupport "jedec-exp")
(lib.enableFeature staplSupport "stapl")
(lib.enableFeature svfSupport "svf")
];
meta = with lib; {
homepage = "http://urjtag.org/";
license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
maintainers = with lib.maintainers; [ lowfatcomputing ];
description = "Universal JTAG library, server and tools";
license = with licenses; [ gpl2Plus lgpl21Plus ];
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
}

28
pkgs/tools/package-management/disnix/DisnixWebService/default.nix Normal file
View File

@ -0,0 +1,28 @@
{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
stdenv.mkDerivation {
name = "DisnixWebService-0.10";
src = fetchurl {
url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz";
sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114";
};
buildInputs = [ apacheAnt jdk ];
PREFIX = "\${env.out}";
AXIS2_LIB = "${axis2}/lib";
AXIS2_WEBAPP = "${axis2}/webapps/axis2";
DBUS_JAVA_LIB = "${dbus_java}/share/java";
prePatch = ''
sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
-e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
scripts/disnix-soap-client
'';
buildPhase = "ant";
installPhase = "ant install";
meta = {
description = "A SOAP interface and client for Disnix";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sander ];
platforms = lib.platforms.linux;
};
}

20
pkgs/tools/package-management/disnix/default.nix Normal file
View File

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

20
pkgs/tools/package-management/disnix/disnixos/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }:
stdenv.mkDerivation {
name = "disnixos-0.9";
src = fetchurl {
url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz";
sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ socat dysnomia disnix getopt ];
meta = {
description = "Provides complementary NixOS infrastructure deployment to Disnix";
license = lib.licenses.lgpl21Plus;
maintainers = [ lib.maintainers.sander ];
platforms = lib.platforms.linux;
};
}

27
pkgs/tools/package-management/disnix/dydisnix/default.nix Normal file
View File

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

71
pkgs/tools/package-management/disnix/dysnomia/default.nix Normal file
View File

@ -0,0 +1,71 @@
{ lib, stdenv, fetchurl, netcat
, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null
, enableApacheWebApplication ? false
, enableAxis2WebService ? false
, enableEjabberdDump ? false
, enableMySQLDatabase ? false
, enablePostgreSQLDatabase ? false
, enableSubversionRepository ? false
, enableTomcatWebApplication ? false
, enableMongoDatabase ? false
, enableInfluxDatabase ? false
, enableSupervisordProgram ? false
, enableDockerContainer ? true
, enableLegacy ? false
, catalinaBaseDir ? "/var/tomcat"
, jobTemplate ? "systemd"
, getopt
}:
assert enableMySQLDatabase -> mysql != null;
assert enablePostgreSQLDatabase -> postgresql != null;
assert enableSubversionRepository -> subversion != null;
assert enableEjabberdDump -> ejabberd != null;
assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
assert enableInfluxDatabase -> influxdb != null;
assert enableSupervisordProgram -> supervisor != null;
assert enableDockerContainer -> docker != null;
stdenv.mkDerivation {
name = "dysnomia-0.10";
src = fetchurl {
url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz";
sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna";
};
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
configureFlags = [
(if enableApacheWebApplication then "--with-apache" else "--without-apache")
(if enableAxis2WebService then "--with-axis2" else "--without-axis2")
(if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd")
(if enableMySQLDatabase then "--with-mysql" else "--without-mysql")
(if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql")
(if enableSubversionRepository then "--with-subversion" else "--without-subversion")
(if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat")
(if enableMongoDatabase then "--with-mongodb" else "--without-mongodb")
(if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb")
(if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord")
(if enableDockerContainer then "--with-docker" else "--without-docker")
"--with-job-template=${jobTemplate}"
] ++ lib.optional enableLegacy "--enable-legacy";
buildInputs = [ getopt netcat ]
++ lib.optional stdenv.isLinux systemd
++ lib.optional enableEjabberdDump ejabberd
++ lib.optional enableMySQLDatabase mysql.out
++ lib.optional enablePostgreSQLDatabase postgresql
++ lib.optional enableSubversionRepository subversion
++ lib.optional enableMongoDatabase mongodb
++ lib.optional enableMongoDatabase mongodb-tools
++ lib.optional enableInfluxDatabase influxdb
++ lib.optional enableSupervisordProgram supervisor
++ lib.optional enableDockerContainer docker;
meta = {
description = "Automated deployment of mutable components and services for Disnix";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sander ];
platforms = lib.platforms.unix;
};
}

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

@ -142,11 +142,6 @@ common =
# socket path becomes too long otherwise
preInstallCheck = lib.optionalString stdenv.isDarwin ''
export TMPDIR=$NIX_BUILD_TOP
'' +
# tests/ca/substitute.sh is flakey for some reason, so we skip it
# for now. https://github.com/NixOS/nix/issues/4667
lib.optionalString is24 ''
echo "exit 99" > tests/ca/substitute.sh
'';
separateDebugInfo = stdenv.isLinux;
@ -219,13 +214,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre20210317_8a5203d";
suffix = "pre20210326_dd77f71";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2";
sha256 = "IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk=";
rev = "dd77f71afe6733e9790dd001125c423cb648b7ce";
sha256 = "rVHzrsCtdiWjyLuHnDplG2mx+7dw5VyzZ9ReXxuCvHY=";
};
inherit storeDir stateDir confDir boehmgc;

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

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "rpm";
version = "4.16.1.2";
version = "4.16.1.3";
src = fetchurl {
url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
sha256 = "1k6ank2aad7r503w12m6m494mxr6iccj52wqhwbc94pwxsf34mw3";
sha256 = "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai";
};
outputs = [ "out" "dev" "man" ];
@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://www.rpm.org/";
license = licenses.gpl2;
homepage = "https://www.rpm.org/";
license = with licenses; [ gpl2Plus lgpl21Plus ];
description = "The RPM Package Manager";
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.linux ++ platforms.darwin;

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

@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
version = "1.12.4";
version = "1.12.5";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
sha256 = "1cwmka6shyycp9gq5js1hnbamdhqzpmzraxdaniz1cdqhxcvdkcb";
sha256 = "06qc68q9px2g19iz23nbc4ay5dwqhgh99d1jj5l2dhb3mgknh19n";
};
vendorSha256 = "1qnxdrqpav6ky6gs9w63l0hbhakh23rrc9197br1nmbg0slb8vcj";
vendorSha256 = "1jir1lb60p86fmk5sh92ywchqva59c31g1badlq9pjgd7jip5vnl";
subPackages = [ "." ];

5
pkgs/top-level/aliases.nix
View File

@ -150,9 +150,6 @@ mapAliases ({
dbus_glib = dbus-glib; # added 2018-02-25
dbus_libs = dbus; # added 2018-04-25
diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
disnix = throw "disnix has been removed."; # added 2021-01-27
disnixos = throw "disnixos has been removed."; # added 2021-01-27
DisnixWebService = throw "DisnixWebService has been removed."; # added 2021-01-27
dbus_tools = dbus.out; # added 2018-04-25
deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
deadpixi-sam = deadpixi-sam-unstable;
@ -169,8 +166,6 @@ mapAliases ({
docker_compose = docker-compose; # 2018-11-10
draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14
dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03
dydisnix = throw "dydisnix has been removed."; # added 2021-01-27
dysnomia = throw "dysnomia has been removed."; # added 2021-01-27
dwarf_fortress = dwarf-fortress; # added 2016-01-23
dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07
elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17

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

@ -20587,6 +20587,8 @@ in
v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
vendir = callPackage ../development/tools/vendir { };
vndr = callPackage ../development/tools/vndr { };
windows = callPackages ../os-specific/windows {};
@ -26904,6 +26906,8 @@ in
ethabi = callPackage ../applications/blockchains/ethabi.nix { };
pycoin = with python3Packages; toPythonApplication pycoin;
stellar-core = callPackage ../applications/blockchains/stellar-core.nix { };
sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; };
@ -29653,6 +29657,18 @@ in
solfege = python3Packages.callPackage ../misc/solfege { };
disnix = callPackage ../tools/package-management/disnix { };
dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {
inherit (pythonPackages) supervisor;
});
dydisnix = callPackage ../tools/package-management/disnix/dydisnix { };
disnixos = callPackage ../tools/package-management/disnix/disnixos { };
DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
lkproof = callPackage ../tools/typesetting/tex/lkproof { };
lice = python3Packages.callPackage ../tools/misc/lice {};

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

@ -3716,6 +3716,8 @@ in {
labgrid = callPackage ../development/python-modules/labgrid { };
labmath = callPackage ../development/python-modules/labmath { };
lammps-cython = callPackage ../development/python-modules/lammps-cython { };
langcodes = callPackage ../development/python-modules/langcodes { };