Merge pull request #43857 from volth/unused
[bot] treewide: remove unreferenced code
This commit is contained in:
Frederik Rietdijk
GitHub
commit
1a6af9f88e
@ -1,8 +1,6 @@
|
||||
let
|
||||
pkgs = import ./.. { };
|
||||
lib = pkgs.lib;
|
||||
sources = lib.sourceFilesBySuffices ./. [".xml"];
|
||||
sources-langs = ./languages-frameworks;
|
||||
in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "nixpkgs-manual";
|
||||
|
||||
@ -19,8 +19,6 @@ let
|
||||
libStr = lib.strings;
|
||||
libAttr = lib.attrsets;
|
||||
|
||||
flipMapAttrs = flip libAttr.mapAttrs;
|
||||
|
||||
inherit (lib) isFunction;
|
||||
in
|
||||
|
||||
|
||||
@ -64,7 +64,6 @@ rec {
|
||||
*/
|
||||
foldl = op: nul: list:
|
||||
let
|
||||
len = length list;
|
||||
foldl' = n:
|
||||
if n == -1
|
||||
then nul
|
||||
|
||||
@ -670,7 +670,6 @@ rec {
|
||||
{ config, options, ... }:
|
||||
let
|
||||
fromOpt = getAttrFromPath from options;
|
||||
toOpt = getAttrFromPath to options;
|
||||
toOf = attrByPath to
|
||||
(abort "Renaming error: option `${showOption to}' does not exist.");
|
||||
in
|
||||
|
||||
@ -380,10 +380,6 @@ runTests {
|
||||
|
||||
resRem7 = res6.replace (a: removeAttrs a ["a"]);
|
||||
|
||||
resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; };
|
||||
x2 = x.merge { a = 20; }; # now we have 27
|
||||
in (x2.replace) { a = 10; }; # and override the value by 10
|
||||
|
||||
# fixed tests (delayed args): (when using them add some comments, please)
|
||||
resFixed1 =
|
||||
let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; });
|
||||
|
||||
@ -309,7 +309,6 @@ rec {
|
||||
}
|
||||
else
|
||||
def;
|
||||
listOnly = listOf elemType;
|
||||
attrOnly = attrsOf elemType;
|
||||
in mkOptionType rec {
|
||||
name = "loaOf";
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
|
||||
with lib;
|
||||
|
||||
let fcBool = x: if x then "<bool>true</bool>" else "<bool>false</bool>";
|
||||
|
||||
cfg = config.fonts.fontconfig.ultimate;
|
||||
let cfg = config.fonts.fontconfig.ultimate;
|
||||
|
||||
latestVersion = pkgs.fontconfig.configVersion;
|
||||
|
||||
|
||||
@ -6,8 +6,6 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.installer;
|
||||
|
||||
makeProg = args: pkgs.substituteAll (args // {
|
||||
dir = "bin";
|
||||
isExecutable = true;
|
||||
|
||||
@ -31,7 +31,6 @@ let
|
||||
let
|
||||
relocateNixOS = path:
|
||||
"<nixpkgs/nixos" + removePrefix nixosPath (toString path) + ">";
|
||||
relocateOthers = null;
|
||||
in
|
||||
{ nixos = map relocateNixOS partitionedModuleFiles.nixos;
|
||||
others = []; # TODO: copy the modules to the install-device repository.
|
||||
|
||||
@ -4,7 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.nylas-mail;
|
||||
defaultUser = "nylas-mail";
|
||||
in {
|
||||
###### interface
|
||||
options = {
|
||||
|
||||
@ -4,12 +4,6 @@
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.environment;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
config = {
|
||||
|
||||
@ -7,7 +7,6 @@ with lib;
|
||||
let
|
||||
|
||||
cfg = config.programs.ssh;
|
||||
cfgd = config.services.openssh;
|
||||
|
||||
askPassword = cfg.askPassword;
|
||||
|
||||
|
||||
@ -6,8 +6,6 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
cfge = config.environment;
|
||||
|
||||
cfg = config.programs.xonsh;
|
||||
|
||||
in
|
||||
|
||||
@ -209,7 +209,6 @@ in
|
||||
servicesLists = mapAttrsToList certToServices cfg.certs;
|
||||
certToServices = cert: data:
|
||||
let
|
||||
domain = if data.domain != null then data.domain else cert;
|
||||
cpath = lpath + optionalString (data.activationDelay != null) ".staging";
|
||||
lpath = "${cfg.directory}/${cert}";
|
||||
rights = if data.allowKeysForGroup then "750" else "700";
|
||||
|
||||
@ -97,17 +97,6 @@ let
|
||||
${dir_cfg.extraConfig}
|
||||
'';
|
||||
|
||||
# TODO: by default use this config
|
||||
bconsole_conf = pkgs.writeText "bconsole.conf"
|
||||
''
|
||||
Director {
|
||||
Name = ${dir_cfg.name};
|
||||
Address = "localhost";
|
||||
DirPort = ${toString dir_cfg.port};
|
||||
Password = "${dir_cfg.password}";
|
||||
}
|
||||
'';
|
||||
|
||||
directorOptions = {name, config, ...}:
|
||||
{
|
||||
options = {
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
let
|
||||
cfg = config.services.crashplansb;
|
||||
crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; };
|
||||
varDir = "/var/lib/crashplan";
|
||||
in
|
||||
|
||||
with lib;
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
let
|
||||
cfg = config.services.crashplan;
|
||||
crashplan = pkgs.crashplan;
|
||||
varDir = "/var/lib/crashplan";
|
||||
in
|
||||
|
||||
with lib;
|
||||
|
||||
@ -127,7 +127,6 @@ with lib;
|
||||
mapAttrs' (name: backup:
|
||||
let
|
||||
extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions;
|
||||
connectTo = elemAt (splitString ":" backup.repository) 1;
|
||||
resticCmd = "${pkgs.restic}/bin/restic${extraOptions}";
|
||||
in nameValuePair "restic-backups-${name}" ({
|
||||
environment = {
|
||||
|
||||
@ -5,13 +5,6 @@ with types;
|
||||
|
||||
let
|
||||
|
||||
# Converts a plan like
|
||||
# { "1d" = "1h"; "1w" = "1d"; }
|
||||
# into
|
||||
# "1d=>1h,1w=>1d"
|
||||
attrToPlan = attrs: concatStringsSep "," (builtins.attrValues (
|
||||
mapAttrs (n: v: "${n}=>${v}") attrs));
|
||||
|
||||
planDescription = ''
|
||||
The znapzend backup plan to use for the source.
|
||||
</para>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
{ config, lib, pkgs, ...}:
|
||||
let
|
||||
cfg = config.services.hadoop;
|
||||
hadoopConf = import ./conf.nix { hadoop = cfg; pkgs = pkgs; };
|
||||
in
|
||||
|
||||
with lib;
|
||||
{
|
||||
imports = [ ./yarn.nix ./hdfs.nix ];
|
||||
|
||||
@ -36,9 +36,6 @@ let
|
||||
})}
|
||||
'';
|
||||
|
||||
skipAttrs = attrs: map (filterAttrs (k: v: k != "enable"))
|
||||
(filter (v: !(hasAttr "enable" v) || v.enable) attrs);
|
||||
|
||||
infraContainer = pkgs.dockerTools.buildImage {
|
||||
name = "pause";
|
||||
tag = "latest";
|
||||
|
||||
@ -9,8 +9,6 @@ let
|
||||
baseDir = "/run/dovecot2";
|
||||
stateDir = "/var/lib/dovecot";
|
||||
|
||||
canCreateMailUserGroup = cfg.mailUser != null && cfg.mailGroup != null;
|
||||
|
||||
dovecotConf = concatStrings [
|
||||
''
|
||||
base_dir = ${baseDir}
|
||||
|
||||
@ -7,16 +7,6 @@ let
|
||||
|
||||
cfg = config.services.disnix;
|
||||
|
||||
dysnomia = pkgs.dysnomia.override (origArgs: {
|
||||
enableApacheWebApplication = config.services.httpd.enable;
|
||||
enableAxis2WebService = config.services.tomcat.axis2.enable;
|
||||
enableEjabberdDump = config.services.ejabberd.enable;
|
||||
enableMySQLDatabase = config.services.mysql.enable;
|
||||
enablePostgreSQLDatabase = config.services.postgresql.enable;
|
||||
enableSubversionRepository = config.services.svnserve.enable;
|
||||
enableTomcatWebApplication = config.services.tomcat.enable;
|
||||
enableMongoDatabase = config.services.mongodb.enable;
|
||||
});
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
@ -5,43 +5,6 @@ with lib;
|
||||
let
|
||||
cfg = config.services.dockerRegistry;
|
||||
|
||||
blobCache = if cfg.enableRedisCache
|
||||
then "redis"
|
||||
else "inmemory";
|
||||
|
||||
registryConfig = {
|
||||
version = "0.1";
|
||||
log.fields.service = "registry";
|
||||
storage = {
|
||||
cache.blobdescriptor = blobCache;
|
||||
filesystem.rootdirectory = cfg.storagePath;
|
||||
delete.enabled = cfg.enableDelete;
|
||||
};
|
||||
http = {
|
||||
addr = ":${builtins.toString cfg.port}";
|
||||
headers.X-Content-Type-Options = ["nosniff"];
|
||||
};
|
||||
health.storagedriver = {
|
||||
enabled = true;
|
||||
interval = "10s";
|
||||
threshold = 3;
|
||||
};
|
||||
};
|
||||
|
||||
registryConfig.redis = mkIf cfg.enableRedisCache {
|
||||
addr = "${cfg.redisUrl}";
|
||||
password = "${cfg.redisPassword}";
|
||||
db = 0;
|
||||
dialtimeout = "10ms";
|
||||
readtimeout = "10ms";
|
||||
writetimeout = "10ms";
|
||||
pool = {
|
||||
maxidle = 16;
|
||||
maxactive = 64;
|
||||
idletimeout = "300s";
|
||||
};
|
||||
};
|
||||
|
||||
configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));
|
||||
|
||||
in {
|
||||
|
||||
@ -62,9 +62,6 @@ let
|
||||
cd $out
|
||||
|
||||
${concatMapStrings (containerName:
|
||||
let
|
||||
components = cfg.components."${containerName}";
|
||||
in
|
||||
linkMutableComponents { inherit containerName; }
|
||||
) (builtins.attrNames cfg.components)}
|
||||
'';
|
||||
|
||||
@ -4,7 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.emby;
|
||||
emby = pkgs.emby;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
||||
@ -4,7 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.exhibitor;
|
||||
exhibitor = cfg.package;
|
||||
exhibitorConfig = ''
|
||||
zookeeper-install-directory=${cfg.baseDir}/zookeeper
|
||||
zookeeper-data-directory=${cfg.zkDataDir}
|
||||
|
||||
@ -4,7 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
uid = config.ids.uids.mediatomb;
|
||||
gid = config.ids.gids.mediatomb;
|
||||
cfg = config.services.mediatomb;
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.nzbget;
|
||||
nzbget = pkgs.nzbget; in {
|
||||
in {
|
||||
options = {
|
||||
services.nzbget = {
|
||||
enable = mkEnableOption "NZBGet";
|
||||
|
||||
@ -4,7 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.plex;
|
||||
plex = pkgs.plex;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
||||
@ -7,16 +7,6 @@ let
|
||||
|
||||
taskd = "${pkgs.taskserver}/bin/taskd";
|
||||
|
||||
mkVal = val:
|
||||
if val == true then "true"
|
||||
else if val == false then "false"
|
||||
else if isList val then concatStringsSep ", " val
|
||||
else toString val;
|
||||
|
||||
mkConfLine = key: val: let
|
||||
result = "${key} = ${mkVal val}";
|
||||
in optionalString (val != null && val != []) result;
|
||||
|
||||
mkManualPkiOption = desc: mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.gdomap;
|
||||
in
|
||||
{
|
||||
#
|
||||
# interface
|
||||
|
||||
@ -103,7 +103,7 @@ let
|
||||
|
||||
${flip concatMapStrings
|
||||
(collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)
|
||||
(proto: let portStr = toString proto.port; in ''
|
||||
(proto: ''
|
||||
[${proto.name}]
|
||||
enabled = ${boolToString proto.enable}
|
||||
address = ${proto.address}
|
||||
@ -122,7 +122,7 @@ let
|
||||
# DO NOT EDIT -- this file has been generated automatically.
|
||||
${flip concatMapStrings
|
||||
(collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
|
||||
(tun: let portStr = toString tun.port; in ''
|
||||
(tun: ''
|
||||
[${tun.name}]
|
||||
type = client
|
||||
destination = ${tun.destination}
|
||||
|
||||
@ -6,8 +6,6 @@ let
|
||||
|
||||
cfg = config.services.morty;
|
||||
|
||||
configFile = cfg.configFile;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
@ -26,7 +26,6 @@ let
|
||||
};
|
||||
|
||||
# Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
|
||||
notNull = a: ! isNull a;
|
||||
mkZncConf = confOpts: ''
|
||||
Version = 1.6.3
|
||||
${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules}
|
||||
|
||||
@ -4,7 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
nssModulesPath = config.system.nssModules.path;
|
||||
cfg = config.services.saslauthd;
|
||||
|
||||
in
|
||||
|
||||
@ -13,12 +13,6 @@ let
|
||||
settingsDir = "${homeDir}/.config/transmission-daemon";
|
||||
settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings);
|
||||
|
||||
# Strings must be quoted, ints and bools must not (for settings.json).
|
||||
toOption = x:
|
||||
if isBool x then boolToString x
|
||||
else if isInt x then toString x
|
||||
else toString ''"${x}"'';
|
||||
|
||||
# for users in group "transmission" to have access to torrents
|
||||
fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings;
|
||||
|
||||
|
||||
@ -6,7 +6,6 @@ let
|
||||
cfg = config.services.frab;
|
||||
|
||||
package = pkgs.frab;
|
||||
ruby = package.ruby;
|
||||
|
||||
databaseConfig = builtins.toJSON { production = cfg.database; };
|
||||
|
||||
|
||||
@ -98,11 +98,6 @@ let
|
||||
allSubservices = mainSubservices ++ concatMap subservicesFor mainCfg.virtualHosts;
|
||||
|
||||
|
||||
# !!! should be in lib
|
||||
writeTextInDir = name: text:
|
||||
pkgs.runCommand name {inherit text;} "mkdir -p $out; echo -n \"$text\" > $out/$name";
|
||||
|
||||
|
||||
enableSSL = any (vhost: vhost.enableSSL) allHosts;
|
||||
|
||||
|
||||
|
||||
@ -4,17 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
httpd = serverInfo.serverConfig.package;
|
||||
|
||||
version24 = !versionOlder httpd.version "2.4";
|
||||
|
||||
allGranted = if version24 then ''
|
||||
Require all granted
|
||||
'' else ''
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
'';
|
||||
|
||||
owncloudConfig = pkgs.writeText "config.php"
|
||||
''
|
||||
<?php
|
||||
|
||||
@ -12,8 +12,6 @@ let
|
||||
apacheHttpd = httpd;
|
||||
};
|
||||
|
||||
pythonLib = p: "${p}/";
|
||||
|
||||
httpd = serverInfo.serverConfig.package;
|
||||
|
||||
versionPre24 = versionOlder httpd.version "2.4";
|
||||
|
||||
@ -27,10 +27,6 @@ let
|
||||
else if hasPython3 then uwsgi.python3
|
||||
else null;
|
||||
|
||||
pythonPackages = pkgs.pythonPackages.override {
|
||||
inherit python;
|
||||
};
|
||||
|
||||
pythonEnv = python.withPackages (c.pythonPackages or (self: []));
|
||||
|
||||
uwsgiCfg = {
|
||||
|
||||
@ -10,7 +10,6 @@ let
|
||||
let
|
||||
pkgName = drv: (builtins.parseDrvName drv.name).name;
|
||||
ysNames = map pkgName ys;
|
||||
res = (filter (x: !(builtins.elem (pkgName x) ysNames)) xs);
|
||||
in
|
||||
filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
|
||||
|
||||
|
||||
@ -11,7 +11,6 @@ let
|
||||
|
||||
udev = config.systemd.package;
|
||||
|
||||
kernelPackages = config.boot.kernelPackages;
|
||||
modulesTree = config.system.modulesTree;
|
||||
firmware = config.hardware.firmware;
|
||||
|
||||
|
||||
@ -4,9 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
activateConfiguration = config.system.activationScripts.script;
|
||||
|
||||
bootStage2 = pkgs.substituteAll {
|
||||
src = ./stage-2-init.sh;
|
||||
shellDebug = "${pkgs.bashInteractive}/bin/bash";
|
||||
|
||||
@ -6,9 +6,6 @@ with import ./systemd-lib.nix { inherit config lib pkgs; };
|
||||
|
||||
let
|
||||
cfg = config.systemd.nspawn;
|
||||
assertions = [
|
||||
# boot = true -> processtwo != true
|
||||
];
|
||||
|
||||
checkExec = checkUnitConfig "Exec" [
|
||||
(assertOnlyFields [
|
||||
|
||||
@ -188,8 +188,6 @@ let
|
||||
"timers.target"
|
||||
];
|
||||
|
||||
boolToString = value: if value then "yes" else "no";
|
||||
|
||||
makeJobScript = name: text:
|
||||
let mkScriptName = s: (replaceChars [ "\\" ] [ "-" ] (shellEscape s) );
|
||||
x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; };
|
||||
|
||||
@ -7,7 +7,6 @@ let
|
||||
encDevs = filter (dev: dev.encrypted.enable) fileSystems;
|
||||
keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs;
|
||||
keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs;
|
||||
isIn = needle: haystack: filter (p: p == needle) haystack != [];
|
||||
anyEncrypted =
|
||||
fold (j: v: v || j.encrypted.enable) false encDevs;
|
||||
|
||||
|
||||
@ -9,7 +9,6 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
cfgSpl = config.boot.spl;
|
||||
cfgZfs = config.boot.zfs;
|
||||
cfgSnapshots = config.services.zfs.autoSnapshot;
|
||||
cfgSnapFlags = cfgSnapshots.flags;
|
||||
|
||||
@ -7,7 +7,6 @@ let
|
||||
|
||||
cfg = config.networking;
|
||||
interfaces = attrValues cfg.interfaces;
|
||||
hasVirtuals = any (i: i.virtual) interfaces;
|
||||
|
||||
slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
|
||||
++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
|
||||
|
||||
@ -6,10 +6,6 @@
|
||||
with lib;
|
||||
with import ../../lib/qemu-flags.nix { inherit pkgs; };
|
||||
|
||||
let
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
# This option is a dummy that if used in conjunction with
|
||||
|
||||
@ -51,9 +51,6 @@ in {
|
||||
# Where the communication sockets live
|
||||
runDir = "/var/run/openvswitch";
|
||||
|
||||
# Where the config database live (can't be in nix-store)
|
||||
stateDir = "/var/db/openvswitch";
|
||||
|
||||
# The path to the an initialized version of the database
|
||||
db = pkgs.stdenv.mkDerivation {
|
||||
name = "vswitch.db";
|
||||
|
||||
@ -2,7 +2,6 @@ let
|
||||
carolKey = "2d2a338b46f8e4a8c462f0c385b481292a05f678e19a2b82755258cf0f0af7e2";
|
||||
carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k";
|
||||
carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52";
|
||||
carolIp4 = "192.168.0.9";
|
||||
|
||||
basicConfig =
|
||||
{ config, pkgs, ... }:
|
||||
@ -44,9 +43,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
||||
bob =
|
||||
{ config, lib, nodes, ... }:
|
||||
|
||||
let carolIp4 = lib.mkForce nodes.carol.config.networking.interfaces.eth1; in
|
||||
|
||||
{ imports = [ basicConfig ];
|
||||
{ imports = [ basicConfig ];
|
||||
|
||||
networking.interfaces.eth1.ipv4.addresses = [
|
||||
{ address = "192.168.0.2"; prefixLength = 24; }
|
||||
@ -67,10 +64,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
||||
# but knows neither Alice or Bob.
|
||||
carol =
|
||||
{ config, lib, nodes, ... }:
|
||||
let
|
||||
carolIp4 = (lib.mkForce nodes.carol.config.networking.interfaces.eth1);
|
||||
in
|
||||
{ imports = [ basicConfig ];
|
||||
{ imports = [ basicConfig ];
|
||||
|
||||
environment.etc."cjdns.keys".text = ''
|
||||
CJDNS_PRIVATE_KEY=${carolKey}
|
||||
|
||||
@ -45,7 +45,6 @@ in {
|
||||
};
|
||||
|
||||
testScript = {nodes, ...}: let
|
||||
originalSystem = nodes.client.config.system.build.toplevel;
|
||||
c1System = nodes.client_c1.config.system.build.toplevel;
|
||||
c2System = nodes.client_c2.config.system.build.toplevel;
|
||||
in ''
|
||||
|
||||
@ -58,9 +58,6 @@ let
|
||||
'';
|
||||
|
||||
|
||||
channelContents = [ pkgs.rlwrap ];
|
||||
|
||||
|
||||
# The test script boots a NixOS VM, installs NixOS on an empty hard
|
||||
# disk, and then reboot from the hard disk. It's parameterized with
|
||||
# a test script fragment `createPartitions', which must create
|
||||
|
||||
@ -12,8 +12,6 @@ let
|
||||
# and picking a the first 4:
|
||||
oathSnakeOilPassword1 = "143349";
|
||||
oathSnakeOilPassword2 = "801753";
|
||||
oathSnakeOilPassword3 = "019933";
|
||||
oathSnakeOilPassword4 = "403895";
|
||||
|
||||
alicePassword = "foobar";
|
||||
# Generated via: mkpasswd -m sha-512 and passing in "foobar"
|
||||
|
||||
@ -26,7 +26,7 @@ let
|
||||
};
|
||||
|
||||
mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
|
||||
inherit name version;
|
||||
inherit name version meta;
|
||||
|
||||
src = {
|
||||
i686-linux = fetchurl {
|
||||
@ -56,7 +56,7 @@ let
|
||||
});
|
||||
in
|
||||
buildFHSUserEnv {
|
||||
inherit name;
|
||||
inherit name meta;
|
||||
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
mist
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
|
||||
|
||||
let
|
||||
withSpotify = config.clementine.spotify or false;
|
||||
withIpod = config.clementine.ipod or false;
|
||||
withMTP = config.clementine.mtp or true;
|
||||
withCD = config.clementine.cd or true;
|
||||
@ -12,8 +11,6 @@ let
|
||||
|
||||
version = "1.3.1";
|
||||
|
||||
exeName = "clementine";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz;
|
||||
sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq";
|
||||
|
||||
@ -23,12 +23,6 @@ self:
|
||||
|
||||
super = imported;
|
||||
|
||||
markBroken = pkg: pkg.override {
|
||||
elpaBuild = args: self.elpaBuild (args // {
|
||||
meta = (args.meta or {}) // { broken = true; };
|
||||
});
|
||||
};
|
||||
|
||||
overrides = {
|
||||
};
|
||||
|
||||
|
||||
@ -56,7 +56,6 @@ let
|
||||
gtdialog_zip = "gtdialog_1.3.zip";
|
||||
cdk_tgz = "cdk-5.0-20150928.tgz";
|
||||
termkey_tgz = "libtermkey-0.17.tar.gz";
|
||||
bombay_zip = "bombay.zip";
|
||||
|
||||
scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip;
|
||||
tre_url = "https://github.com/laurikari/tre/archive/" + tre_zip;
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
let
|
||||
|
||||
version = "0.96.1";
|
||||
sitePackages = pythonPackages.python.sitePackages;
|
||||
inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted;
|
||||
|
||||
in buildPythonApplication {
|
||||
|
||||
@ -3,8 +3,7 @@
|
||||
|
||||
assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
|
||||
|
||||
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "llpp-${version}";
|
||||
version = "2018-03-02";
|
||||
|
||||
|
||||
@ -1,12 +1,5 @@
|
||||
{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
|
||||
|
||||
let
|
||||
lib_suffix =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
"64"
|
||||
else
|
||||
"";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tqsl-${version}";
|
||||
version = "2.3.1";
|
||||
|
||||
@ -43,10 +43,6 @@ let
|
||||
# source tree.
|
||||
extraAttrs = buildFun base;
|
||||
|
||||
gentooPatch = name: sha256: fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}";
|
||||
inherit sha256;
|
||||
};
|
||||
githubPatch = commit: sha256: fetchpatch {
|
||||
url = "https://github.com/chromium/chromium/commit/${commit}.patch";
|
||||
inherit sha256;
|
||||
|
||||
@ -47,12 +47,6 @@
|
||||
, debug ? false
|
||||
}:
|
||||
|
||||
let
|
||||
arch =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
"x86_64"
|
||||
else throw "Flash Player is not supported on this platform";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flashplayer-standalone-${version}";
|
||||
version = "30.0.0.134";
|
||||
|
||||
@ -36,7 +36,6 @@
|
||||
|
||||
let
|
||||
arch32 = "i686-linux";
|
||||
arch64 = "x86_64-linux";
|
||||
|
||||
arch = if stdenv.system == arch32
|
||||
then "i386"
|
||||
|
||||
@ -60,10 +60,6 @@ let
|
||||
${(wrapBinary libs) attrs.toolName}
|
||||
'';
|
||||
});
|
||||
fhs = target: buildFHSUserEnv {
|
||||
inherit (pkg) name;
|
||||
runScript = target;
|
||||
};
|
||||
in buildFHSUserEnv {
|
||||
name = "${attrs.toolName}-${attrs.version}";
|
||||
runScript = "${pkg.outPath}/bin/${attrs.toolName}";
|
||||
|
||||
@ -6,10 +6,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
wrapBinary = libPaths: binaryName: ''
|
||||
wrapProgram "$out/bin/${binaryName}" \
|
||||
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}"
|
||||
'';
|
||||
mkBitscope = callPackage (import ./common.nix) { };
|
||||
in {
|
||||
chart = let
|
||||
|
||||
@ -24,12 +24,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
platform =
|
||||
if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then
|
||||
"Linux"
|
||||
else
|
||||
throw "Mathematica requires i686-linux or x86_64 linux";
|
||||
|
||||
l10n =
|
||||
with stdenv.lib;
|
||||
with callPackage ./l10ns.nix {};
|
||||
|
||||
@ -2,15 +2,7 @@
|
||||
, wxGTK, perl, python2, zlib, libGLU_combined, libX11
|
||||
, automake, autoconf
|
||||
}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="golly";
|
||||
version="2.8";
|
||||
name="${baseName}-${version}";
|
||||
hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "golly-${version}";
|
||||
version = "2.8.99.2.20161122";
|
||||
|
||||
@ -22,11 +22,6 @@ with stdenv.lib;
|
||||
# and try applying all the ones we don't have yet.
|
||||
|
||||
let
|
||||
xsaPatch = { name , sha256 }: (fetchpatch {
|
||||
url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
|
||||
inherit sha256;
|
||||
});
|
||||
|
||||
xsa = import ./xsa-patches.nix { inherit fetchpatch; };
|
||||
|
||||
qemuMemfdBuildFix = fetchpatch {
|
||||
|
||||
@ -22,11 +22,6 @@ with stdenv.lib;
|
||||
# and try applying all the ones we don't have yet.
|
||||
|
||||
let
|
||||
xsaPatch = { name , sha256 }: (fetchpatch {
|
||||
url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
|
||||
inherit sha256;
|
||||
});
|
||||
|
||||
xsa = import ./xsa-patches.nix { inherit fetchpatch; };
|
||||
|
||||
xenlockprofpatch = (fetchpatch {
|
||||
|
||||
@ -1,13 +1,6 @@
|
||||
# Generated by carnix 0.6.5: carnix -o way-cooler.nix Cargo.lock
|
||||
{ lib, buildPlatform, buildRustCrate, fetchgit }:
|
||||
let kernel = buildPlatform.parsed.kernel.name;
|
||||
abi = buildPlatform.parsed.abi.name;
|
||||
include = includedFiles: src: builtins.filterSource (path: type:
|
||||
lib.lists.any (f:
|
||||
let p = toString (src + ("/" + f)); in
|
||||
(path == p) || (type == "directory" && lib.strings.hasPrefix path p)
|
||||
) includedFiles
|
||||
) src;
|
||||
updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
|
||||
mapFeatures = features: map (fun: fun { features = features; });
|
||||
mkFeatures = feat: lib.lists.foldl (features: featureName:
|
||||
|
||||
@ -1,13 +1,6 @@
|
||||
# Generated by carnix 0.6.5: carnix -o wc-bg.nix Cargo.lock
|
||||
{ lib, buildPlatform, buildRustCrate, fetchgit }:
|
||||
let kernel = buildPlatform.parsed.kernel.name;
|
||||
abi = buildPlatform.parsed.abi.name;
|
||||
include = includedFiles: src: builtins.filterSource (path: type:
|
||||
lib.lists.any (f:
|
||||
let p = toString (src + ("/" + f)); in
|
||||
(path == p) || (type == "directory" && lib.strings.hasPrefix path p)
|
||||
) includedFiles
|
||||
) src;
|
||||
updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
|
||||
mapFeatures = features: map (fun: fun { features = features; });
|
||||
mkFeatures = feat: lib.lists.foldl (features: featureName:
|
||||
|
||||
@ -1,13 +1,6 @@
|
||||
# Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock
|
||||
{ lib, buildPlatform, buildRustCrate, fetchgit }:
|
||||
let kernel = buildPlatform.parsed.kernel.name;
|
||||
abi = buildPlatform.parsed.abi.name;
|
||||
include = includedFiles: src: builtins.filterSource (path: type:
|
||||
lib.lists.any (f:
|
||||
let p = toString (src + ("/" + f)); in
|
||||
(path == p) || (type == "directory" && lib.strings.hasPrefix path p)
|
||||
) includedFiles
|
||||
) src;
|
||||
updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
|
||||
mapFeatures = features: map (fun: fun { features = features; });
|
||||
mkFeatures = feat: lib.lists.foldl (features: featureName:
|
||||
|
||||
@ -1,13 +1,6 @@
|
||||
# Generated by carnix 0.6.5: carnix -o wc-lock.nix Cargo.lock
|
||||
{ lib, buildPlatform, buildRustCrate, fetchgit }:
|
||||
let kernel = buildPlatform.parsed.kernel.name;
|
||||
abi = buildPlatform.parsed.abi.name;
|
||||
include = includedFiles: src: builtins.filterSource (path: type:
|
||||
lib.lists.any (f:
|
||||
let p = toString (src + ("/" + f)); in
|
||||
(path == p) || (type == "directory" && lib.strings.hasPrefix path p)
|
||||
) includedFiles
|
||||
) src;
|
||||
updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
|
||||
mapFeatures = features: map (fun: fun { features = features; });
|
||||
mkFeatures = feat: lib.lists.foldl (features: featureName:
|
||||
|
||||
@ -14,9 +14,6 @@
|
||||
|
||||
assert modifyPublicMain -> mainClassFile != null;
|
||||
|
||||
let
|
||||
wrapperCS = ./Wrapper.cs.in;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name src;
|
||||
|
||||
|
||||
@ -2,8 +2,6 @@
|
||||
let
|
||||
awk = "${gawk}/bin/awk";
|
||||
dockerCredentialsFile = import ./credentials.nix;
|
||||
stripScheme =
|
||||
builtins.replaceStrings [ "https://" "http://" ] [ "" "" ];
|
||||
in
|
||||
{ fetcher
|
||||
, name
|
||||
|
||||
@ -187,20 +187,12 @@ let makeDeps = dependencies:
|
||||
crateType, metadata, crateBin, finalBins,
|
||||
extraRustcOpts, verbose, colors }:
|
||||
|
||||
let depsDir = lib.concatStringsSep " " dependencies;
|
||||
completeDepsDir = lib.concatStringsSep " " completeDeps;
|
||||
completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
|
||||
deps = makeDeps dependencies;
|
||||
optLevel = if release then 3 else 0;
|
||||
let deps = makeDeps dependencies;
|
||||
rustcOpts =
|
||||
lib.lists.foldl' (opts: opt: opts + " " + opt)
|
||||
(if release then "-C opt-level=3" else "-C debuginfo=2")
|
||||
(["-C codegen-units=1"] ++ extraRustcOpts);
|
||||
rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
|
||||
version_ = lib.splitString "-" crateVersion;
|
||||
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
|
||||
version = lib.splitString "." (lib.head version_);
|
||||
authors = lib.concatStringsSep ":" crateAuthors;
|
||||
in ''
|
||||
runHook preBuild
|
||||
norm=""
|
||||
@ -348,7 +340,6 @@ crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, cr
|
||||
preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:
|
||||
|
||||
let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_);
|
||||
release_ = release;
|
||||
dependencies_ = dependencies;
|
||||
buildDependencies_ = buildDependencies;
|
||||
processedAttrs = [
|
||||
|
||||
@ -2,12 +2,6 @@
|
||||
{ lib, buildPlatform, buildRustCrate, fetchgit }:
|
||||
let kernel = buildPlatform.parsed.kernel.name;
|
||||
abi = buildPlatform.parsed.abi.name;
|
||||
include = includedFiles: src: builtins.filterSource (path: type:
|
||||
lib.lists.any (f:
|
||||
let p = toString (src + ("/" + f)); in
|
||||
(path == p) || (type == "directory" && lib.strings.hasPrefix path p)
|
||||
) includedFiles
|
||||
) src;
|
||||
updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
|
||||
mapFeatures = features: map (fun: fun { features = features; });
|
||||
mkFeatures = feat: lib.lists.foldl (features: featureName:
|
||||
|
||||
@ -20,8 +20,6 @@ in
|
||||
assert cargoVendorDir == null -> cargoSha256 != "unset";
|
||||
|
||||
let
|
||||
lib = stdenv.lib;
|
||||
|
||||
cargoDeps = if cargoVendorDir == null
|
||||
then fetchcargo {
|
||||
inherit name src srcs sourceRoot cargoUpdateHook;
|
||||
|
||||
@ -21,11 +21,6 @@ let
|
||||
|
||||
in {
|
||||
runInWindowsVM = drv: let
|
||||
newDrv = drv.override {
|
||||
stdenv = drv.stdenv.override {
|
||||
shell = "/bin/sh";
|
||||
};
|
||||
};
|
||||
in pkgs.lib.overrideDerivation drv (attrs: let
|
||||
bootstrap = bootstrapper attrs.windowsImage;
|
||||
in {
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
let
|
||||
libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/";
|
||||
overrides = import ./overrides.nix;
|
||||
lib = stdenv.lib;
|
||||
baseName = (builtins.parseDrvName name).name;
|
||||
override = if builtins.hasAttr baseName overrides
|
||||
then
|
||||
|
||||
@ -54,9 +54,6 @@ with builtins;
|
||||
|
||||
let version = "4.8.5";
|
||||
|
||||
# Whether building a cross-compiler for GNU/Hurd.
|
||||
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [ ]
|
||||
|
||||
@ -54,9 +54,6 @@ with builtins;
|
||||
|
||||
let version = "4.9.4";
|
||||
|
||||
# Whether building a cross-compiler for GNU/Hurd.
|
||||
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches =
|
||||
|
||||
@ -53,9 +53,6 @@ with builtins;
|
||||
let version = "5.5.0";
|
||||
sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
|
||||
|
||||
# Whether building a cross-compiler for GNU/Hurd.
|
||||
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches =
|
||||
|
||||
@ -52,9 +52,6 @@ with builtins;
|
||||
|
||||
let version = "6.4.0";
|
||||
|
||||
# Whether building a cross-compiler for GNU/Hurd.
|
||||
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches =
|
||||
|
||||
@ -41,9 +41,6 @@ with builtins;
|
||||
|
||||
let version = "7.3.0";
|
||||
|
||||
# Whether building a cross-compiler for GNU/Hurd.
|
||||
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches =
|
||||
|
||||
@ -41,9 +41,6 @@ with builtins;
|
||||
|
||||
let version = "8.1.0";
|
||||
|
||||
# Whether building a cross-compiler for GNU/Hurd.
|
||||
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches =
|
||||
|
||||
@ -42,9 +42,6 @@ with builtins;
|
||||
|
||||
let version = "7-20170409";
|
||||
|
||||
# Whether building a cross-compiler for GNU/Hurd.
|
||||
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches =
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
|
||||
let
|
||||
useX11 = stdenv.isi686 || stdenv.isx86_64;
|
||||
useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
|
||||
inherit (stdenv.lib) optionals optionalString;
|
||||
in
|
||||
|
||||
|
||||
@ -36,10 +36,6 @@ let
|
||||
if !isGhcjs
|
||||
then "haddock"
|
||||
else "haddock-ghcjs";
|
||||
ghcName =
|
||||
if !isGhcjs
|
||||
then "ghc"
|
||||
else "ghcjs";
|
||||
ghcDocLibDir =
|
||||
if !isGhcjs
|
||||
then ghc.doc + ''/share/doc/ghc*/html/libraries''
|
||||
|
||||
@ -33,7 +33,6 @@ let
|
||||
majorVersion = "2.7";
|
||||
minorVersion = "15";
|
||||
minorVersionSuffix = "";
|
||||
pythonVersion = majorVersion;
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "python${majorVersion}";
|
||||
sitePackages = "lib/${libPrefix}/site-packages";
|
||||
@ -161,10 +160,6 @@ let
|
||||
# don't rely on detecting glibc-isms.
|
||||
++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no";
|
||||
|
||||
postConfigure = if hostPlatform.isCygwin then ''
|
||||
sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),'
|
||||
'' else null;
|
||||
|
||||
buildInputs =
|
||||
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
|
||||
[ bzip2 openssl zlib ]
|
||||
|
||||
@ -29,7 +29,6 @@ let
|
||||
majorVersion = "3.4";
|
||||
minorVersion = "8";
|
||||
minorVersionSuffix = "";
|
||||
pythonVersion = majorVersion;
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "python${majorVersion}";
|
||||
sitePackages = "lib/${libPrefix}/site-packages";
|
||||
|
||||
@ -29,7 +29,6 @@ let
|
||||
majorVersion = "3.5";
|
||||
minorVersion = "5";
|
||||
minorVersionSuffix = "";
|
||||
pythonVersion = majorVersion;
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "python${majorVersion}";
|
||||
sitePackages = "lib/${libPrefix}/site-packages";
|
||||
|
||||
@ -29,7 +29,6 @@ let
|
||||
majorVersion = "3.6";
|
||||
minorVersion = "6";
|
||||
minorVersionSuffix = "";
|
||||
pythonVersion = majorVersion;
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "python${majorVersion}";
|
||||
sitePackages = "lib/${libPrefix}/site-packages";
|
||||
|
||||
@ -29,7 +29,6 @@ let
|
||||
majorVersion = "3.7";
|
||||
minorVersion = "0";
|
||||
minorVersionSuffix = "";
|
||||
pythonVersion = majorVersion;
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "python${majorVersion}";
|
||||
sitePackages = "lib/${libPrefix}/site-packages";
|
||||
|
||||
@ -32,8 +32,6 @@ let
|
||||
generic = { version, sha256 }: let
|
||||
ver = version;
|
||||
tag = ver.gitTag;
|
||||
isRuby20 = ver.majMin == "2.0";
|
||||
isRuby21 = ver.majMin == "2.1";
|
||||
isRuby25 = ver.majMin == "2.5";
|
||||
baseruby = self.override { useRailsExpress = false; };
|
||||
self = lib.makeOverridable (
|
||||
|
||||
@ -13,7 +13,6 @@ let
|
||||
+ optionalString (val != null && cond != false) "=${val}";
|
||||
mkEnable = mkFlag "enable-" "disable-";
|
||||
mkWith = mkFlag "with-" "without-";
|
||||
mkOther = mkFlag "" "" true;
|
||||
|
||||
shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}:
|
||||
let
|
||||
addDeps = newdeps: x: {deps = x.deps ++ newdeps;};
|
||||
addNativeLibs = libs: x: { propagatedBuildInputs = libs; };
|
||||
skipBuildPhase = x: {
|
||||
overrides = y: ((x.overrides y) // { buildPhase = "true"; });
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user