summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <git@yannherklotz.com>2023-05-11 10:00:43 +0100
committerYann Herklotz <git@yannherklotz.com>2023-05-11 10:00:43 +0100
commit3e650e1ebdd9279f0d4100bcfdb9115edac0e40c (patch)
tree2bfca4ca780827162f02e3185469a924a1767cf6
parent90287bf4c616e5cbe9bbe4e0ecec23efb3bffa9d (diff)
downloadzk-visual-3e650e1ebdd9279f0d4100bcfdb9115edac0e40c.tar.gz
zk-visual-3e650e1ebdd9279f0d4100bcfdb9115edac0e40c.zip
Remove lock files and update README
-rw-r--r--.envrc1
-rw-r--r--README.md16
-rw-r--r--default.nix16
-rw-r--r--flake.lock58
-rw-r--r--flake.nix48
-rw-r--r--shell.nix16
6 files changed, 16 insertions, 139 deletions
diff --git a/.envrc b/.envrc
deleted file mode 100644
index 3550a30..0000000
--- a/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-use flake
diff --git a/README.md b/README.md
index fe5cfcd..55f79fc 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,17 @@
# Org zettelkasten
+
+## Installing
+
+The current repository needs at least GHC 9.2.7. The easiest way to install it
+is using `ghcup`:
+
+```shell
+ghcup install ghc cabal
+```
+
+Then, run the following to build the project:
+
+```shell
+cabal update
+cabal build
+```
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 3c0d3a2..0000000
--- a/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file exists for legacy Nix installs (nix-build & nix-env)
-# https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix
-# You generally do *not* have to modify this ever.
-(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 = ./.;
- }).defaultNix
diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index 4cbbb1e..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "nodes": {
- "flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1650374568,
- "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-utils": {
- "locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1665087388,
- "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
- "root": {
- "inputs": {
- "flake-compat": "flake-compat",
- "flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/flake.nix b/flake.nix
deleted file mode 100644
index 4c1d5a6..0000000
--- a/flake.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- description = "org-zk's description";
- inputs = {
- flake-utils.url = "github:numtide/flake-utils";
- flake-compat = {
- url = "github:edolstra/flake-compat";
- flake = false;
- };
- };
- outputs = inputs@{ self, nixpkgs, flake-utils, ... }:
- flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" ] (system:
- let
- overlays = [ ];
- pkgs =
- import nixpkgs { inherit system overlays; config.allowBroken = true; };
- project = returnShellEnv:
- pkgs.haskellPackages.developPackage {
- inherit returnShellEnv;
- name = "org-zk";
- root = ./.;
- withHoogle = false;
- overrides = self: super: with pkgs.haskell.lib; {
- # Use callCabal2nix to override Haskell dependencies here
- # cf. https://tek.brick.do/K3VXJd8mEKO7
- };
- modifier = drv:
- pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages;
- [
- # Specify your build/dev dependencies here.
- cabal-fmt
- cabal-install
- ghcid
- haskell-language-server
- ormolu
- pkgs.nixpkgs-fmt
- pkgs.zlib.dev
- pkgs.zlib
- ]);
- };
- in
- {
- # Used by `nix build` & `nix run` (prod exe)
- defaultPackage = project false;
-
- # Used by `nix develop` (dev shell)
- devShell = project true;
- });
-}
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index 667946c..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file exists for legacy Nix installs (nix-build & nix-env)
-# https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix
-# You generally do *not* have to modify this ever.
-(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 = ./.;
- }).shellNix