aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile26
-rw-r--r--config/README.md1
l---------config/nixRoot1
-rw-r--r--config/overlays.nix1
-rwxr-xr-xscripts/make-env12
-rwxr-xr-xscripts/make-nur4
-rw-r--r--scripts/nix_env7
7 files changed, 5 insertions, 47 deletions
diff --git a/Makefile b/Makefile
index fafbe00..d5b8e5a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
1subrecipes = setup 1subrecipes = setup nix-info
2subrecipes += nixops ssh-eldiron ssh-backup-2 ssh-monitoring-1 2subrecipes += nixops ssh-eldiron ssh-backup-2 ssh-monitoring-1
3subrecipes += info debug dry-run build upload deploy deploy-reboot reboot 3subrecipes += info debug dry-run build upload deploy deploy-reboot reboot
4subrecipes += list-generations delete-generations cleanup 4subrecipes += list-generations delete-generations cleanup
@@ -7,28 +7,6 @@ ${subrecipes}:
7 @$(MAKE) --no-print-directory -C nixops/ $@ 7 @$(MAKE) --no-print-directory -C nixops/ $@
8.PHONY: ${subrecipes} 8.PHONY: ${subrecipes}
9 9
10# This will automatically upgrade to latest version at each build
11nixpkgs ?= https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz
12NIX_PATH = nixpkgs=${nixpkgs}:nixpkgsNext=${nixpkgs}:nixpkgsPrevious=${nixpkgs}
13
14nix-path:
15 @echo "export NIX_PATH=$(NIX_PATH)"
16
17env:
18 ./scripts/make-env
19
20env-dry-run:
21 ./scripts/make-env --dry-run
22
23nix-info:
24 @version=$$(nix eval --option tarball-ttl 1 --raw nixpkgs.lib.version) && \
25 mainversion=$$(echo $$version | cut -d"." -f -2) && \
26 echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \
27 nix-instantiate --find-file nixpkgs
28
29nix-info-nixops:
30 @$(MAKE) --no-print-directory -C nixops/ nix-info
31
32nur: 10nur:
33 ./scripts/make-nur 11 ./scripts/make-nur
34 curl -o /dev/null -XPOST "https://nur-update.herokuapp.com/update?repo=immae" 12 curl -o /dev/null -XPOST "https://nur-update.herokuapp.com/update?repo=immae"
@@ -36,4 +14,4 @@ nur:
36shellcheck: 14shellcheck:
37 shellcheck scripts/* nixops/scripts/* modules/private/gitolite/gitolite_ldap_groups.sh modules/private/ssh/ldap_authorized_keys.sh modules/private/pub/restrict 15 shellcheck scripts/* nixops/scripts/* modules/private/gitolite/gitolite_ldap_groups.sh modules/private/ssh/ldap_authorized_keys.sh modules/private/pub/restrict
38 16
39.PHONY: env env-dry-run nix-info nur shellcheck 17.PHONY: nur shellcheck
diff --git a/config/README.md b/config/README.md
deleted file mode 100644
index 542f31e..0000000
--- a/config/README.md
+++ /dev/null
@@ -1 +0,0 @@
1Link this directory to ~/.config/nixpkgs
diff --git a/config/nixRoot b/config/nixRoot
deleted file mode 120000
index a96aa0e..0000000
--- a/config/nixRoot
+++ /dev/null
@@ -1 +0,0 @@
1.. \ No newline at end of file
diff --git a/config/overlays.nix b/config/overlays.nix
deleted file mode 100644
index 1040d59..0000000
--- a/config/overlays.nix
+++ /dev/null
@@ -1 +0,0 @@
1builtins.attrValues (import ./nixRoot/overlays)
diff --git a/scripts/make-env b/scripts/make-env
deleted file mode 100755
index 25aa869..0000000
--- a/scripts/make-env
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/bash
2
3DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
4
5eval "$(make --no-print-directory -C $(dirname $DIR) nix-path)"
6nix-env -r -i -A myEnvironments.immae-eu -f "<nixpkgs>" "$@"
7result=$?
8
9cat >> $(dirname $DIR)/versions_log <<EOF
10Ran $(date) with args "$@" and returned "$result"
11$(make --no-print-directory -C $(dirname $DIR) nix-info | sed -e "s/^/ /")
12EOF
diff --git a/scripts/make-nur b/scripts/make-nur
index 1fe5f7a..127f8bd 100755
--- a/scripts/make-nur
+++ b/scripts/make-nur
@@ -1,4 +1,4 @@
1#!/bin/bash 1#!/usr/bin/env bash
2 2
3set -e 3set -e
4 4
@@ -16,6 +16,8 @@ nur_root="252dd7d899b7a0deea1537cc5d2d48b825afffb0"
16first_commit="5145061e9b679ea1e5d2709d22d0ee53467fed15" 16first_commit="5145061e9b679ea1e5d2709d22d0ee53467fed15"
17git rebase --onto=$nur_root $first_commit master 17git rebase --onto=$nur_root $first_commit master
18 18
19# The list below musn't get shrinked, it is used by filter-branch on
20# every commit
19clean_folder=' 21clean_folder='
20 rm -rf config lib/private modules/private pkgs/private nixops 22 rm -rf config lib/private modules/private pkgs/private nixops
21 for broken in pkgs/crypto/cardano/default.nix; do 23 for broken in pkgs/crypto/cardano/default.nix; do
diff --git a/scripts/nix_env b/scripts/nix_env
deleted file mode 100644
index 7fb6646..0000000
--- a/scripts/nix_env
+++ /dev/null
@@ -1,7 +0,0 @@
1#!/bin/bash
2
3# This will automatically upgrade to latest version at each build
4nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
5nixpkgsPrevious="$nixpkgs"
6nixpkgsNext="$nixpkgs"
7export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious"