From 6de0fb7775eb749523ecd31a25ea1dec4ebc1604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 26 Jul 2023 11:31:33 +0200 Subject: [PATCH] clan-template: drop unused dependencies --- templates/new-clan/default.nix | 16 ---------------- templates/new-clan/flake.nix | 8 ++------ templates/new-clan/shell.nix | 2 -- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 templates/new-clan/default.nix delete mode 100644 templates/new-clan/shell.nix diff --git a/templates/new-clan/default.nix b/templates/new-clan/default.nix deleted file mode 100644 index 4691d6463..000000000 --- a/templates/new-clan/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file provides backward compatibility to nix < 2.4 clients -let - flake = - import - ( - let - lock = builtins.fromJSON (builtins.readFile ./flake.lock); - in - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; - } - ) - { src = ./.; }; -in -flake.defaultNix diff --git a/templates/new-clan/flake.nix b/templates/new-clan/flake.nix index c710aae4c..fed790bf3 100644 --- a/templates/new-clan/flake.nix +++ b/templates/new-clan/flake.nix @@ -1,13 +1,9 @@ { - description = ""; + description = ""; inputs = { + clan-core.url = "git+https://git.clan.lol/clan/clan-core"; flake-parts.url = "github:hercules-ci/flake-parts"; - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; - nixpkgs.url = "nixpkgs/nixos-unstable"; }; outputs = inputs @ { flake-parts, ... }: diff --git a/templates/new-clan/shell.nix b/templates/new-clan/shell.nix deleted file mode 100644 index 804c2a417..000000000 --- a/templates/new-clan/shell.nix +++ /dev/null @@ -1,2 +0,0 @@ -(import ./default.nix).devShells.${builtins.currentSystem}.default - or (throw "dev-shell not defined. Cannot find flake attribute devShell.${builtins.currentSystem}.default")