Merge pull request #110799 from helsinki-systems/dysnomia_drop

nixos/disnix nixos/dysnomia: drop modules

authored by

Sandro and committed by
GitHub
b237f724 cbad557f

+7 -537
+2 -2
nixos/modules/misc/ids.nix
··· 71 71 #utmp = 29; # unused 72 72 # ddclient = 30; # converted to DynamicUser = true 73 73 davfs2 = 31; 74 - #disnix = 33; # unused 74 + #disnix = 33; # module removed 75 75 osgi = 34; 76 76 tor = 35; 77 77 cups = 36; ··· 387 387 utmp = 29; 388 388 # ddclient = 30; # converted to DynamicUser = true 389 389 davfs2 = 31; 390 - disnix = 33; 390 + #disnix = 33; # module removed 391 391 osgi = 34; 392 392 tor = 35; 393 393 #cups = 36; # unused
-2
nixos/modules/module-list.nix
··· 450 450 ./services/misc/devmon.nix 451 451 ./services/misc/dictd.nix 452 452 ./services/misc/dwm-status.nix 453 - ./services/misc/dysnomia.nix 454 - ./services/misc/disnix.nix 455 453 ./services/misc/docker-registry.nix 456 454 ./services/misc/domoticz.nix 457 455 ./services/misc/errbot.nix
-98
nixos/modules/services/misc/disnix.nix
··· 1 - # Disnix server 2 - { config, lib, pkgs, ... }: 3 - 4 - with lib; 5 - 6 - let 7 - 8 - cfg = config.services.disnix; 9 - 10 - in 11 - 12 - { 13 - 14 - ###### interface 15 - 16 - options = { 17 - 18 - services.disnix = { 19 - 20 - enable = mkEnableOption "Disnix"; 21 - 22 - enableMultiUser = mkOption { 23 - type = types.bool; 24 - default = true; 25 - description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; 26 - }; 27 - 28 - useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat"; 29 - 30 - package = mkOption { 31 - type = types.path; 32 - description = "The Disnix package"; 33 - default = pkgs.disnix; 34 - defaultText = "pkgs.disnix"; 35 - }; 36 - 37 - enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH"; 38 - 39 - profiles = mkOption { 40 - type = types.listOf types.string; 41 - default = [ "default" ]; 42 - example = [ "default" ]; 43 - description = "Names of the Disnix profiles to expose in the system's PATH"; 44 - }; 45 - }; 46 - 47 - }; 48 - 49 - ###### implementation 50 - 51 - config = mkIf cfg.enable { 52 - dysnomia.enable = true; 53 - 54 - environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; 55 - environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles); 56 - 57 - services.dbus.enable = true; 58 - services.dbus.packages = [ pkgs.disnix ]; 59 - 60 - services.tomcat.enable = cfg.useWebServiceInterface; 61 - services.tomcat.extraGroups = [ "disnix" ]; 62 - services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} "; 63 - services.tomcat.sharedLibs = optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar" 64 - ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar"; 65 - services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService; 66 - 67 - users.groups.disnix.gid = config.ids.gids.disnix; 68 - 69 - systemd.services = { 70 - disnix = mkIf cfg.enableMultiUser { 71 - description = "Disnix server"; 72 - wants = [ "dysnomia.target" ]; 73 - wantedBy = [ "multi-user.target" ]; 74 - after = [ "dbus.service" ] 75 - ++ optional config.services.httpd.enable "httpd.service" 76 - ++ optional config.services.mysql.enable "mysql.service" 77 - ++ optional config.services.postgresql.enable "postgresql.service" 78 - ++ optional config.services.tomcat.enable "tomcat.service" 79 - ++ optional config.services.svnserve.enable "svnserve.service" 80 - ++ optional config.services.mongodb.enable "mongodb.service" 81 - ++ optional config.services.influxdb.enable "influxdb.service"; 82 - 83 - restartIfChanged = false; 84 - 85 - path = [ config.nix.package cfg.package config.dysnomia.package "/run/current-system/sw" ]; 86 - 87 - environment = { 88 - HOME = "/root"; 89 - } 90 - // (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {}) 91 - // (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {}); 92 - 93 - serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service"; 94 - }; 95 - 96 - }; 97 - }; 98 - }
-257
nixos/modules/services/misc/dysnomia.nix
··· 1 - {pkgs, lib, config, ...}: 2 - 3 - with lib; 4 - 5 - let 6 - cfg = config.dysnomia; 7 - 8 - printProperties = properties: 9 - concatMapStrings (propertyName: 10 - let 11 - property = properties.${propertyName}; 12 - in 13 - if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties.${propertyName})})\n" 14 - else "${propertyName}=\"${toString property}\"\n" 15 - ) (builtins.attrNames properties); 16 - 17 - properties = pkgs.stdenv.mkDerivation { 18 - name = "dysnomia-properties"; 19 - buildCommand = '' 20 - cat > $out << "EOF" 21 - ${printProperties cfg.properties} 22 - EOF 23 - ''; 24 - }; 25 - 26 - containersDir = pkgs.stdenv.mkDerivation { 27 - name = "dysnomia-containers"; 28 - buildCommand = '' 29 - mkdir -p $out 30 - cd $out 31 - 32 - ${concatMapStrings (containerName: 33 - let 34 - containerProperties = cfg.containers.${containerName}; 35 - in 36 - '' 37 - cat > ${containerName} <<EOF 38 - ${printProperties containerProperties} 39 - type=${containerName} 40 - EOF 41 - '' 42 - ) (builtins.attrNames cfg.containers)} 43 - ''; 44 - }; 45 - 46 - linkMutableComponents = {containerName}: 47 - '' 48 - mkdir ${containerName} 49 - 50 - ${concatMapStrings (componentName: 51 - let 52 - component = cfg.components.${containerName}.${componentName}; 53 - in 54 - "ln -s ${component} ${containerName}/${componentName}\n" 55 - ) (builtins.attrNames (cfg.components.${containerName} or {}))} 56 - ''; 57 - 58 - componentsDir = pkgs.stdenv.mkDerivation { 59 - name = "dysnomia-components"; 60 - buildCommand = '' 61 - mkdir -p $out 62 - cd $out 63 - 64 - ${concatMapStrings (containerName: 65 - linkMutableComponents { inherit containerName; } 66 - ) (builtins.attrNames cfg.components)} 67 - ''; 68 - }; 69 - 70 - dysnomiaFlags = { 71 - enableApacheWebApplication = config.services.httpd.enable; 72 - enableAxis2WebService = config.services.tomcat.axis2.enable; 73 - enableDockerContainer = config.virtualisation.docker.enable; 74 - enableEjabberdDump = config.services.ejabberd.enable; 75 - enableMySQLDatabase = config.services.mysql.enable; 76 - enablePostgreSQLDatabase = config.services.postgresql.enable; 77 - enableTomcatWebApplication = config.services.tomcat.enable; 78 - enableMongoDatabase = config.services.mongodb.enable; 79 - enableSubversionRepository = config.services.svnserve.enable; 80 - enableInfluxDatabase = config.services.influxdb.enable; 81 - }; 82 - in 83 - { 84 - options = { 85 - dysnomia = { 86 - 87 - enable = mkOption { 88 - type = types.bool; 89 - default = false; 90 - description = "Whether to enable Dysnomia"; 91 - }; 92 - 93 - enableAuthentication = mkOption { 94 - type = types.bool; 95 - default = false; 96 - description = "Whether to publish privacy-sensitive authentication credentials"; 97 - }; 98 - 99 - package = mkOption { 100 - type = types.path; 101 - description = "The Dysnomia package"; 102 - }; 103 - 104 - properties = mkOption { 105 - description = "An attribute set in which each attribute represents a machine property. Optionally, these values can be shell substitutions."; 106 - default = {}; 107 - }; 108 - 109 - containers = mkOption { 110 - description = "An attribute set in which each key represents a container and each value an attribute set providing its configuration properties"; 111 - default = {}; 112 - }; 113 - 114 - components = mkOption { 115 - 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"; 116 - default = {}; 117 - }; 118 - 119 - extraContainerProperties = mkOption { 120 - description = "An attribute set providing additional container settings in addition to the default properties"; 121 - default = {}; 122 - }; 123 - 124 - extraContainerPaths = mkOption { 125 - description = "A list of paths containing additional container configurations that are added to the search folders"; 126 - default = []; 127 - }; 128 - 129 - extraModulePaths = mkOption { 130 - description = "A list of paths containing additional modules that are added to the search folders"; 131 - default = []; 132 - }; 133 - 134 - enableLegacyModules = mkOption { 135 - type = types.bool; 136 - default = true; 137 - description = "Whether to enable Dysnomia legacy process and wrapper modules"; 138 - }; 139 - }; 140 - }; 141 - 142 - config = mkIf cfg.enable { 143 - 144 - environment.etc = { 145 - "dysnomia/containers" = { 146 - source = containersDir; 147 - }; 148 - "dysnomia/components" = { 149 - source = componentsDir; 150 - }; 151 - "dysnomia/properties" = { 152 - source = properties; 153 - }; 154 - }; 155 - 156 - environment.variables = { 157 - DYSNOMIA_STATEDIR = "/var/state/dysnomia-nixos"; 158 - DYSNOMIA_CONTAINERS_PATH = "${lib.concatMapStrings (containerPath: "${containerPath}:") cfg.extraContainerPaths}/etc/dysnomia/containers"; 159 - DYSNOMIA_MODULES_PATH = "${lib.concatMapStrings (modulePath: "${modulePath}:") cfg.extraModulePaths}/etc/dysnomia/modules"; 160 - }; 161 - 162 - environment.systemPackages = [ cfg.package ]; 163 - 164 - dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) { 165 - enableLegacy = builtins.trace '' 166 - WARNING: Dysnomia has been configured to use the legacy 'process' and 'wrapper' 167 - modules for compatibility reasons! If you rely on these modules, consider 168 - migrating to better alternatives. 169 - 170 - More information: https://raw.githubusercontent.com/svanderburg/dysnomia/f65a9a84827bcc4024d6b16527098b33b02e4054/README-legacy.md 171 - 172 - If you have migrated already or don't rely on these Dysnomia modules, you can 173 - disable legacy mode with the following NixOS configuration option: 174 - 175 - dysnomia.enableLegacyModules = false; 176 - 177 - In a future version of Dysnomia (and NixOS) the legacy option will go away! 178 - '' true; 179 - }); 180 - 181 - dysnomia.properties = { 182 - hostname = config.networking.hostName; 183 - inherit (config.nixpkgs.localSystem) system; 184 - 185 - supportedTypes = [ 186 - "echo" 187 - "fileset" 188 - "process" 189 - "wrapper" 190 - 191 - # These are not base modules, but they are still enabled because they work with technology that are always enabled in NixOS 192 - "systemd-unit" 193 - "sysvinit-script" 194 - "nixos-configuration" 195 - ] 196 - ++ optional (dysnomiaFlags.enableApacheWebApplication) "apache-webapplication" 197 - ++ optional (dysnomiaFlags.enableAxis2WebService) "axis2-webservice" 198 - ++ optional (dysnomiaFlags.enableDockerContainer) "docker-container" 199 - ++ optional (dysnomiaFlags.enableEjabberdDump) "ejabberd-dump" 200 - ++ optional (dysnomiaFlags.enableInfluxDatabase) "influx-database" 201 - ++ optional (dysnomiaFlags.enableMySQLDatabase) "mysql-database" 202 - ++ optional (dysnomiaFlags.enablePostgreSQLDatabase) "postgresql-database" 203 - ++ optional (dysnomiaFlags.enableTomcatWebApplication) "tomcat-webapplication" 204 - ++ optional (dysnomiaFlags.enableMongoDatabase) "mongo-database" 205 - ++ optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository"; 206 - }; 207 - 208 - dysnomia.containers = lib.recursiveUpdate ({ 209 - process = {}; 210 - wrapper = {}; 211 - } 212 - // lib.optionalAttrs (config.services.httpd.enable) { apache-webapplication = { 213 - documentRoot = config.services.httpd.virtualHosts.localhost.documentRoot; 214 - }; } 215 - // lib.optionalAttrs (config.services.tomcat.axis2.enable) { axis2-webservice = {}; } 216 - // lib.optionalAttrs (config.services.ejabberd.enable) { ejabberd-dump = { 217 - ejabberdUser = config.services.ejabberd.user; 218 - }; } 219 - // lib.optionalAttrs (config.services.mysql.enable) { mysql-database = { 220 - mysqlPort = config.services.mysql.port; 221 - mysqlSocket = "/run/mysqld/mysqld.sock"; 222 - } // lib.optionalAttrs cfg.enableAuthentication { 223 - mysqlUsername = "root"; 224 - }; 225 - } 226 - // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = { 227 - } // lib.optionalAttrs (cfg.enableAuthentication) { 228 - postgresqlUsername = "postgres"; 229 - }; 230 - } 231 - // lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = { 232 - tomcatPort = 8080; 233 - }; } 234 - // lib.optionalAttrs (config.services.mongodb.enable) { mongo-database = {}; } 235 - // lib.optionalAttrs (config.services.influxdb.enable) { 236 - influx-database = { 237 - influxdbUsername = config.services.influxdb.user; 238 - influxdbDataDir = "${config.services.influxdb.dataDir}/data"; 239 - influxdbMetaDir = "${config.services.influxdb.dataDir}/meta"; 240 - }; 241 - } 242 - // lib.optionalAttrs (config.services.svnserve.enable) { subversion-repository = { 243 - svnBaseDir = config.services.svnserve.svnBaseDir; 244 - }; }) cfg.extraContainerProperties; 245 - 246 - system.activationScripts.dysnomia = '' 247 - mkdir -p /etc/systemd-mutable/system 248 - if [ ! -f /etc/systemd-mutable/system/dysnomia.target ] 249 - then 250 - ( echo "[Unit]" 251 - echo "Description=Services that are activated and deactivated by Dysnomia" 252 - echo "After=final.target" 253 - ) > /etc/systemd-mutable/system/dysnomia.target 254 - fi 255 - ''; 256 - }; 257 - }
-28
pkgs/tools/package-management/disnix/DisnixWebService/default.nix
··· 1 - {lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: 2 - 3 - stdenv.mkDerivation { 4 - name = "DisnixWebService-0.10"; 5 - src = fetchurl { 6 - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; 7 - sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; 8 - }; 9 - buildInputs = [ apacheAnt jdk ]; 10 - PREFIX = "\${env.out}"; 11 - AXIS2_LIB = "${axis2}/lib"; 12 - AXIS2_WEBAPP = "${axis2}/webapps/axis2"; 13 - DBUS_JAVA_LIB = "${dbus_java}/share/java"; 14 - prePatch = '' 15 - sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ 16 - -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ 17 - scripts/disnix-soap-client 18 - ''; 19 - buildPhase = "ant"; 20 - installPhase = "ant install"; 21 - 22 - meta = { 23 - description = "A SOAP interface and client for Disnix"; 24 - license = lib.licenses.mit; 25 - maintainers = [ lib.maintainers.sander ]; 26 - platforms = lib.platforms.linux; 27 - }; 28 - }
-20
pkgs/tools/package-management/disnix/default.nix
··· 1 - { lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: 2 - 3 - stdenv.mkDerivation { 4 - name = "disnix-0.10"; 5 - 6 - src = fetchurl { 7 - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; 8 - sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; 9 - }; 10 - 11 - nativeBuildInputs = [ pkg-config ]; 12 - buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; 13 - 14 - meta = { 15 - description = "A Nix-based distributed service deployment tool"; 16 - license = lib.licenses.lgpl21Plus; 17 - maintainers = with lib.maintainers; [ sander tomberek ]; 18 - platforms = lib.platforms.unix; 19 - }; 20 - }
-20
pkgs/tools/package-management/disnix/disnixos/default.nix
··· 1 - { lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: 2 - 3 - stdenv.mkDerivation { 4 - name = "disnixos-0.9"; 5 - 6 - src = fetchurl { 7 - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; 8 - sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; 9 - }; 10 - 11 - nativeBuildInputs = [ pkg-config ]; 12 - buildInputs = [ socat dysnomia disnix getopt ]; 13 - 14 - meta = { 15 - description = "Provides complementary NixOS infrastructure deployment to Disnix"; 16 - license = lib.licenses.lgpl21Plus; 17 - maintainers = [ lib.maintainers.sander ]; 18 - platforms = lib.platforms.linux; 19 - }; 20 - }
-27
pkgs/tools/package-management/disnix/dydisnix/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: 2 - 3 - stdenv.mkDerivation rec { 4 - version="2020-07-04"; 5 - name = "dydisnix-${version}"; 6 - 7 - src = fetchFromGitHub { 8 - owner = "svanderburg"; 9 - repo = "dydisnix"; 10 - rev = "e99091f1c2329d562097e35faedee80622d387f0"; 11 - sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; 12 - }; 13 - 14 - nativeBuildInputs = [ pkg-config autoconf automake libtool ]; 15 - buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; 16 - preConfigure = '' 17 - ./bootstrap 18 - ''; 19 - 20 - meta = { 21 - description = "A toolset enabling self-adaptive redeployment on top of Disnix"; 22 - longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; 23 - license = lib.licenses.lgpl21Plus; 24 - maintainers = [ lib.maintainers.tomberek ]; 25 - platforms = lib.platforms.unix; 26 - }; 27 - }
-71
pkgs/tools/package-management/disnix/dysnomia/default.nix
··· 1 - { lib, stdenv, fetchurl, netcat 2 - , systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null 3 - , enableApacheWebApplication ? false 4 - , enableAxis2WebService ? false 5 - , enableEjabberdDump ? false 6 - , enableMySQLDatabase ? false 7 - , enablePostgreSQLDatabase ? false 8 - , enableSubversionRepository ? false 9 - , enableTomcatWebApplication ? false 10 - , enableMongoDatabase ? false 11 - , enableInfluxDatabase ? false 12 - , enableSupervisordProgram ? false 13 - , enableDockerContainer ? true 14 - , enableLegacy ? false 15 - , catalinaBaseDir ? "/var/tomcat" 16 - , jobTemplate ? "systemd" 17 - , getopt 18 - }: 19 - 20 - assert enableMySQLDatabase -> mysql != null; 21 - assert enablePostgreSQLDatabase -> postgresql != null; 22 - assert enableSubversionRepository -> subversion != null; 23 - assert enableEjabberdDump -> ejabberd != null; 24 - assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); 25 - assert enableInfluxDatabase -> influxdb != null; 26 - assert enableSupervisordProgram -> supervisor != null; 27 - assert enableDockerContainer -> docker != null; 28 - 29 - stdenv.mkDerivation { 30 - name = "dysnomia-0.10"; 31 - src = fetchurl { 32 - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; 33 - sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; 34 - }; 35 - 36 - preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; 37 - 38 - configureFlags = [ 39 - (if enableApacheWebApplication then "--with-apache" else "--without-apache") 40 - (if enableAxis2WebService then "--with-axis2" else "--without-axis2") 41 - (if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd") 42 - (if enableMySQLDatabase then "--with-mysql" else "--without-mysql") 43 - (if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql") 44 - (if enableSubversionRepository then "--with-subversion" else "--without-subversion") 45 - (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") 46 - (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") 47 - (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") 48 - (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") 49 - (if enableDockerContainer then "--with-docker" else "--without-docker") 50 - "--with-job-template=${jobTemplate}" 51 - ] ++ lib.optional enableLegacy "--enable-legacy"; 52 - 53 - buildInputs = [ getopt netcat ] 54 - ++ lib.optional stdenv.isLinux systemd 55 - ++ lib.optional enableEjabberdDump ejabberd 56 - ++ lib.optional enableMySQLDatabase mysql.out 57 - ++ lib.optional enablePostgreSQLDatabase postgresql 58 - ++ lib.optional enableSubversionRepository subversion 59 - ++ lib.optional enableMongoDatabase mongodb 60 - ++ lib.optional enableMongoDatabase mongodb-tools 61 - ++ lib.optional enableInfluxDatabase influxdb 62 - ++ lib.optional enableSupervisordProgram supervisor 63 - ++ lib.optional enableDockerContainer docker; 64 - 65 - meta = { 66 - description = "Automated deployment of mutable components and services for Disnix"; 67 - license = lib.licenses.mit; 68 - maintainers = [ lib.maintainers.sander ]; 69 - platforms = lib.platforms.unix; 70 - }; 71 - }
+5
pkgs/top-level/aliases.nix
··· 123 123 dbus_glib = dbus-glib; # added 2018-02-25 124 124 dbus_libs = dbus; # added 2018-04-25 125 125 diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 126 + disnix = throw "disnix has been removed."; # added 2021-01-27 127 + disnixos = throw "disnixos has been removed."; # added 2021-01-27 128 + DisnixWebService = throw "DisnixWebService has been removed."; # added 2021-01-27 126 129 dbus_tools = dbus.out; # added 2018-04-25 127 130 deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 128 131 deadpixi-sam = deadpixi-sam-unstable; ··· 139 142 docker_compose = docker-compose; # 2018-11-10 140 143 draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 141 144 dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 145 + dydisnix = throw "dydisnix has been removed."; # added 2021-01-27 146 + dysnomia = throw "dysnomia has been removed."; # added 2021-01-27 142 147 dwarf_fortress = dwarf-fortress; # added 2016-01-23 143 148 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 144 149 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
-12
pkgs/top-level/all-packages.nix
··· 28885 28885 28886 28886 solfege = python3Packages.callPackage ../misc/solfege { }; 28887 28887 28888 - disnix = callPackage ../tools/package-management/disnix { }; 28889 - 28890 - dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { 28891 - inherit (pythonPackages) supervisor; 28892 - }); 28893 - 28894 - dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; 28895 - 28896 - disnixos = callPackage ../tools/package-management/disnix/disnixos { }; 28897 - 28898 - DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; 28899 - 28900 28888 lkproof = callPackage ../tools/typesetting/tex/lkproof { }; 28901 28889 28902 28890 lice = callPackage ../tools/misc/lice {};