diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-20 01:58:14 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-25 00:04:58 +0200 |
commit | b1566203381206632b4f00b7120c4484089ca924 (patch) | |
tree | e362f605eb49ff8be87bd9f44fafd02f18d051ae | |
parent | 5ea02e5164d6be1eba8e7b2341105205ead98a87 (diff) | |
download | NUR-b1566203381206632b4f00b7120c4484089ca924.tar.gz NUR-b1566203381206632b4f00b7120c4484089ca924.tar.zst NUR-b1566203381206632b4f00b7120c4484089ca924.zip |
Remove useless scripts after migration to home-manager
-rw-r--r-- | Makefile | 26 | ||||
-rwxr-xr-x | scripts/make-env | 12 | ||||
-rwxr-xr-x | scripts/make-nur | 4 | ||||
-rw-r--r-- | scripts/nix_env | 7 |
4 files changed, 5 insertions, 44 deletions
@@ -1,4 +1,4 @@ | |||
1 | subrecipes = setup | 1 | subrecipes = setup nix-info |
2 | subrecipes += nixops ssh-eldiron ssh-backup-2 ssh-monitoring-1 | 2 | subrecipes += nixops ssh-eldiron ssh-backup-2 ssh-monitoring-1 |
3 | subrecipes += info debug dry-run build upload deploy deploy-reboot reboot | 3 | subrecipes += info debug dry-run build upload deploy deploy-reboot reboot |
4 | subrecipes += list-generations delete-generations cleanup | 4 | subrecipes += 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 | ||
11 | nixpkgs ?= https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz | ||
12 | NIX_PATH = nixpkgs=${nixpkgs}:nixpkgsNext=${nixpkgs}:nixpkgsPrevious=${nixpkgs} | ||
13 | |||
14 | nix-path: | ||
15 | @echo "export NIX_PATH=$(NIX_PATH)" | ||
16 | |||
17 | env: | ||
18 | ./scripts/make-env | ||
19 | |||
20 | env-dry-run: | ||
21 | ./scripts/make-env --dry-run | ||
22 | |||
23 | nix-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 | |||
29 | nix-info-nixops: | ||
30 | @$(MAKE) --no-print-directory -C nixops/ nix-info | ||
31 | |||
32 | nur: | 10 | nur: |
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: | |||
36 | shellcheck: | 14 | shellcheck: |
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/scripts/make-env b/scripts/make-env deleted file mode 100755 index 25aa869a..00000000 --- a/scripts/make-env +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #!/bin/bash | ||
2 | |||
3 | DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" | ||
4 | |||
5 | eval "$(make --no-print-directory -C $(dirname $DIR) nix-path)" | ||
6 | nix-env -r -i -A myEnvironments.immae-eu -f "<nixpkgs>" "$@" | ||
7 | result=$? | ||
8 | |||
9 | cat >> $(dirname $DIR)/versions_log <<EOF | ||
10 | Ran $(date) with args "$@" and returned "$result" | ||
11 | $(make --no-print-directory -C $(dirname $DIR) nix-info | sed -e "s/^/ /") | ||
12 | EOF | ||
diff --git a/scripts/make-nur b/scripts/make-nur index 1fe5f7a0..127f8bd6 100755 --- a/scripts/make-nur +++ b/scripts/make-nur | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/bin/bash | 1 | #!/usr/bin/env bash |
2 | 2 | ||
3 | set -e | 3 | set -e |
4 | 4 | ||
@@ -16,6 +16,8 @@ nur_root="252dd7d899b7a0deea1537cc5d2d48b825afffb0" | |||
16 | first_commit="5145061e9b679ea1e5d2709d22d0ee53467fed15" | 16 | first_commit="5145061e9b679ea1e5d2709d22d0ee53467fed15" |
17 | git rebase --onto=$nur_root $first_commit master | 17 | git 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 | ||
19 | clean_folder=' | 21 | clean_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 7fb6646d..00000000 --- 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 | ||
4 | nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz" | ||
5 | nixpkgsPrevious="$nixpkgs" | ||
6 | nixpkgsNext="$nixpkgs" | ||
7 | export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious" | ||