Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
35bc9f03a9
|
@ -1,58 +1,33 @@
|
||||||
pkgs: oldpkgs:
|
|
||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
let
|
|
||||||
# This callPackage will try to detect obsolete overrides.
|
|
||||||
callPackage = path: args: let
|
|
||||||
override = pkgs.callPackage path args;
|
|
||||||
upstream = optionalAttrs (override ? "name")
|
|
||||||
(oldpkgs.${(parseDrvName override.name).name} or {});
|
|
||||||
in if upstream ? "name" &&
|
|
||||||
override ? "name" &&
|
|
||||||
compareVersions upstream.name override.name != -1
|
|
||||||
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
|
|
||||||
else override;
|
|
||||||
in {}
|
|
||||||
// import ./writers.nix pkgs oldpkgs
|
|
||||||
// mapAttrs (_: flip callPackage {})
|
|
||||||
(filterAttrs (_: dir: pathExists (dir + "/default.nix"))
|
|
||||||
(subdirsOf ./.))
|
|
||||||
// {
|
|
||||||
empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";
|
|
||||||
|
|
||||||
haskellPackages = oldpkgs.haskellPackages.override {
|
self: super:
|
||||||
overrides = self: super:
|
|
||||||
mapAttrs (name: path: self.callPackage path {})
|
# Import files and subdirectories like they are overlays.
|
||||||
(mapAttrs'
|
foldl' mergeAttrs {}
|
||||||
(name: type:
|
(map
|
||||||
if hasSuffix ".nix" name
|
(name: import (./. + "/${name}") self super)
|
||||||
then {
|
(filter
|
||||||
name = removeSuffix ".nix" name;
|
(name: name != "default.nix" && !hasPrefix "." name)
|
||||||
value = ./haskell-overrides + "/${name}";
|
(attrNames (readDir ./.))))
|
||||||
}
|
|
||||||
else null)
|
//
|
||||||
(builtins.readDir ./haskell-overrides));
|
|
||||||
|
{
|
||||||
|
ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {};
|
||||||
|
|
||||||
|
buildbot-full = self.callPackage ./simple/buildbot {
|
||||||
|
plugins = with self.buildbot-plugins; [ www console-view waterfall-view ];
|
||||||
};
|
};
|
||||||
|
buildbot-worker = self.callPackage ./simple/buildbot/worker.nix {};
|
||||||
ReaktorPlugins = callPackage ./Reaktor/plugins.nix {};
|
|
||||||
|
|
||||||
buildbot = callPackage ./buildbot {};
|
|
||||||
buildbot-full = callPackage ./buildbot {
|
|
||||||
plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ];
|
|
||||||
};
|
|
||||||
buildbot-worker = callPackage ./buildbot/worker.nix {};
|
|
||||||
|
|
||||||
# https://github.com/proot-me/PRoot/issues/106
|
# https://github.com/proot-me/PRoot/issues/106
|
||||||
proot = pkgs.writeDashBin "proot" ''
|
proot = self.writeDashBin "proot" ''
|
||||||
export PROOT_NO_SECCOMP=1
|
export PROOT_NO_SECCOMP=1
|
||||||
exec ${oldpkgs.proot}/bin/proot "$@"
|
exec ${super.proot}/bin/proot "$@"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
|
# XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
|
||||||
symlinkJoin = { name, paths, ... }@args: let
|
symlinkJoin = { name, paths, ... }@args: let
|
||||||
x = oldpkgs.symlinkJoin args;
|
x = super.symlinkJoin args;
|
||||||
in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths;
|
in if typeOf x != "lambda" then x else super.symlinkJoin name paths;
|
||||||
|
|
||||||
test = {
|
|
||||||
infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
15
krebs/5pkgs/haskell/default.nix
Normal file
15
krebs/5pkgs/haskell/default.nix
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
|
self: super:
|
||||||
|
{
|
||||||
|
haskellPackages = super.haskellPackages.override {
|
||||||
|
overrides = self: super:
|
||||||
|
listToAttrs
|
||||||
|
(map
|
||||||
|
(name: nameValuePair (removeSuffix ".nix" name)
|
||||||
|
(self.callPackage (./. + "/${name}") {}))
|
||||||
|
(filter
|
||||||
|
(name: name != "default.nix" && !hasPrefix "." name)
|
||||||
|
(attrNames (readDir ./.))));
|
||||||
|
};
|
||||||
|
}
|
24
krebs/5pkgs/simple/default.nix
Normal file
24
krebs/5pkgs/simple/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
|
self: super:
|
||||||
|
|
||||||
|
let
|
||||||
|
# This callPackage will try to detect obsolete overrides.
|
||||||
|
callPackage = path: args: let
|
||||||
|
override = self.callPackage path args;
|
||||||
|
upstream = optionalAttrs (override ? "name")
|
||||||
|
(super.${(parseDrvName override.name).name} or {});
|
||||||
|
in if upstream ? "name" &&
|
||||||
|
override ? "name" &&
|
||||||
|
compareVersions upstream.name override.name != -1
|
||||||
|
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
|
||||||
|
else override;
|
||||||
|
in
|
||||||
|
|
||||||
|
listToAttrs
|
||||||
|
(map
|
||||||
|
(name: nameValuePair (removeSuffix ".nix" name)
|
||||||
|
(callPackage (./. + "/${name}") {}))
|
||||||
|
(filter
|
||||||
|
(name: name != "default.nix" && !hasPrefix "." name)
|
||||||
|
(attrNames (readDir ./.))))
|
2
krebs/5pkgs/simple/empty.nix
Normal file
2
krebs/5pkgs/simple/empty.nix
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
{ pkgs }:
|
||||||
|
pkgs.runCommand "empty-1.0.0" {} "mkdir $out"
|
9
krebs/5pkgs/test/default.nix
Normal file
9
krebs/5pkgs/test/default.nix
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
|
self: super:
|
||||||
|
|
||||||
|
{
|
||||||
|
test = {
|
||||||
|
infest-cac-centos7 = self.callPackage ./infest-cac-centos7 {};
|
||||||
|
};
|
||||||
|
}
|
|
@ -16,7 +16,7 @@ with import <stockholm/lib>;
|
||||||
# /dev/pts is empty except for 1 file
|
# /dev/pts is empty except for 1 file
|
||||||
# my life sucks
|
# my life sucks
|
||||||
nixpkgs.config.packageOverrides = super: {
|
nixpkgs.config.packageOverrides = super: {
|
||||||
irc-announce = super.callPackage <stockholm/krebs/5pkgs/irc-announce> {
|
irc-announce = super.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {
|
||||||
pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
|
pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
|
||||||
pkgs.coreutils
|
pkgs.coreutils
|
||||||
(pkgs.writeDashBin "tee" ''
|
(pkgs.writeDashBin "tee" ''
|
||||||
|
|
|
@ -31,7 +31,7 @@ with import <stockholm/lib>;
|
||||||
systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
|
systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
|
||||||
# hack `tee` behavior
|
# hack `tee` behavior
|
||||||
nixpkgs.config.packageOverrides = super: {
|
nixpkgs.config.packageOverrides = super: {
|
||||||
irc-announce = super.callPackage <stockholm/krebs/5pkgs/irc-announce> {
|
irc-announce = super.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {
|
||||||
pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
|
pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
|
||||||
pkgs.coreutils
|
pkgs.coreutils
|
||||||
(pkgs.writeDashBin "tee" ''
|
(pkgs.writeDashBin "tee" ''
|
||||||
|
|
|
@ -25,7 +25,7 @@ with import <stockholm/lib>;
|
||||||
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
|
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
|
||||||
inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client;
|
inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client;
|
||||||
nodemcu-uploader = callPackage ./nodemcu-uploader {};
|
nodemcu-uploader = callPackage ./nodemcu-uploader {};
|
||||||
pwqgen-ger = callPackage ../../krebs/5pkgs/passwdqc-utils {
|
pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> {
|
||||||
wordset-file = pkgs.fetchurl {
|
wordset-file = pkgs.fetchurl {
|
||||||
url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ;
|
url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ;
|
||||||
sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
|
sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user