diff options
| -rw-r--r-- | makefu/1systems/iso.nix | 50 | ||||
| -rw-r--r-- | makefu/5pkgs/f3/default.nix | 26 | ||||
| -rw-r--r-- | makefu/5pkgs/libcoap/default.nix | 27 | ||||
| -rw-r--r-- | makefu/5pkgs/mergerfs/default.nix | 26 | ||||
| -rw-r--r-- | makefu/5pkgs/ps3netsrv/default.nix | 29 |
5 files changed, 77 insertions, 81 deletions
diff --git a/makefu/1systems/iso.nix b/makefu/1systems/iso.nix new file mode 100644 index 000000000..ee1046f79 --- /dev/null +++ b/makefu/1systems/iso.nix @@ -0,0 +1,50 @@ +{ config, pkgs, lib, ... }: + +with import <stockholm/lib>; +{ + imports = [ + ../. + <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix> + <nixpkgs/nixos/modules/installer/cd-dvd/channel.nix> + ../2configs/tools/core.nix + ]; + # TODO: NIX_PATH and nix.nixPath are being set by default.nix right now + # cd ~/stockholm ; nix-build -A config.system.build.isoImage -I nixos-config=makefu/1systems/iso.nix -I secrets=/home/makefu/secrets/iso /var/src/nixpkgs/nixos + krebs.build.host = config.krebs.hosts.iso; + krebs.hidden-ssh.enable = true; + environment.systemPackages = with pkgs; [ + aria2 + ddrescue + ]; + environment.extraInit = '' + EDITOR=vim + ''; + # iso-specific + boot.kernelParams = [ "copytoram" ]; + services.openssh = { + enable = true; + hostKeys = [ + { bits = 8192; type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; } + ]; + }; + # enable ssh in the iso boot process + systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ]; + # hack `tee` behavior + nixpkgs.config.packageOverrides = super: { + irc-announce = super.callPackage <stockholm/krebs/5pkgs/irc-announce> { + pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [ + pkgs.coreutils + (pkgs.writeDashBin "tee" '' + if test "$1" = /dev/stderr; then + while read -r line; do + echo "$line" + echo "$line" >&2 + done + else + ${super.coreutils}/bin/tee "$@" + fi + '') + ];}; + }; + }; +} diff --git a/makefu/5pkgs/f3/default.nix b/makefu/5pkgs/f3/default.nix deleted file mode 100644 index e7f20b1e6..000000000 --- a/makefu/5pkgs/f3/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "f3-${version}"; - version = "6.0"; - - enableParallelBuilding = true; - - src = fetchFromGitHub { - owner = "AltraMayor"; - repo = "f3"; - rev = "v${version}"; - sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - patchPhase = "sed -i 's/-oroot -groot//' Makefile"; - - meta = { - description = "Fight Flash Fraud"; - homepage = http://oss.digirati.com.br/f3/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; - }; -} diff --git a/makefu/5pkgs/libcoap/default.nix b/makefu/5pkgs/libcoap/default.nix new file mode 100644 index 000000000..7e8d03edd --- /dev/null +++ b/makefu/5pkgs/libcoap/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig, +gettext, asciidoc, doxygen, libxml2, libxslt, docbook_xsl, ... }: +stdenv.mkDerivation rec { + name = "libcoap-${version}"; + version = "4.1.2"; + + src = fetchFromGitHub { + owner = "obgm"; + repo = "libcoap"; + rev = "v${version}"; + sha256 = "0f0qq15480ja1s03vn8lzw4b3mzdgy46hng4aigi6i6qbzf29kf5"; + }; + + patchPhase = '' + sed -i 's/$(A2X)/& --no-xmllint/' examples/Makefile.am + ''; + buildInputs = [ gettext asciidoc doxygen libxml2.bin libxslt docbook_xsl]; + nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ]; + + meta = { + description = ""; + homepage = http://coap.technology; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/makefu/5pkgs/mergerfs/default.nix b/makefu/5pkgs/mergerfs/default.nix deleted file mode 100644 index cfb7b0ae7..000000000 --- a/makefu/5pkgs/mergerfs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchgit, fuse, pkgconfig, which, attr, pandoc, git }: - -stdenv.mkDerivation rec { - name = "mergerfs-${version}"; - version = "2.16.1"; - - # not using fetchFromGitHub because of changelog being built with git log - src = fetchgit { - url = "https://github.com/trapexit/mergerfs"; - rev = "refs/tags/${version}"; - sha256 = "12fqgk54fnnibqiq82p4g2k6qnw3iy6dd64csmlf73yi67za5iwf"; - deepClone = true; - }; - - buildInputs = [ fuse pkgconfig which attr pandoc git ]; - - makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; - - - meta = { - homepage = https://github.com/trapexit/mergerfs; - description = "a FUSE based union filesystem"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.makefu ]; - }; -} diff --git a/makefu/5pkgs/ps3netsrv/default.nix b/makefu/5pkgs/ps3netsrv/default.nix deleted file mode 100644 index f62ee0c9a..000000000 --- a/makefu/5pkgs/ps3netsrv/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchgit, clang, makeWrapper, gnugrep }: - -stdenv.mkDerivation rec { - name = "ps3netsrv-${version}"; - version = "1.1.0"; - - enableParallelBuilding = true; - - src = fetchgit { - url = "https://github.com/dirkvdb/ps3netsrv--"; - fetchSubmodules = true; - rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; # latest @ 2016-05-24 - sha256 = "09hvmfzqy2jckpsml0z1gkcnar8sigmgs1q66k718fph2d3g54sa"; - }; - - nativeBuildInputs = [ gnugrep ]; - buildPhase = "make CXX=g++"; - installPhase = '' - mkdir -p $out/bin - cp ps3netsrv++ $out/bin - ''; - meta = { - description = "C++ implementation of the ps3netsrv server"; - homepage = https://github.com/dirkvdb/ps3netsrv--; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; - }; -} |