From 28530bb50fddb9315936072988fb05667675c2eb Mon Sep 17 00:00:00 2001
From: Silvio Ankermann <silvio@booq.org>
Date: Mon, 20 Jun 2022 21:13:16 +0200
Subject: [PATCH 1/4] WIP: Add flake

---
 .envrc     |  6 ++++++
 .gitignore |  1 +
 flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++
 flake.nix  | 25 +++++++++++++++++++++++++
 4 files changed, 75 insertions(+)
 create mode 100644 .envrc
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..4254af5
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,6 @@
+#TODO: Find way to inherit this part from direnv template
+if ! has nix_direnv_version || ! nix_direnv_version 2.0.0; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.0.0/direnvrc" "sha256-gMHKKyEOq/T0XmHKgz+pN+fUQC/1EKPAuOtYM95lLnU="
+fi
+use flake
+layout python3
diff --git a/.gitignore b/.gitignore
index 3487a9f..a6de37e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ __pycache__
 build/*
 *.egg-info/*
 */_version.py
+.direnv/*
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..b0e3dc9
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,43 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1652133925,
+        "narHash": "sha256-kfATGChLe9/fQVZkXN9G71JAVMlhePv1qDbaRKklkQs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "51d859cdab1ef58755bd342d45352fc607f5e59b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..336e31d
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,25 @@
+{
+  description = "Flake to setup python virtualenv with direnv";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system: 
+    let
+      pkgs = nixpkgs.legacyPackages.${system};
+    in rec {
+      packages = {
+        pythonEnv = pkgs.python3.withPackages(
+          ps: with ps; [
+            virtualenv
+          ]
+        );
+      };
+
+      defaultPackage = packages.pythonEnv;
+      devShell = packages.pythonEnv.env;
+    });
+}

From 54e1a1b8ca5e0008bc478e1318f84faed7285493 Mon Sep 17 00:00:00 2001
From: Silvio Ankermann <silvio@booq.org>
Date: Mon, 20 Jun 2022 21:54:36 +0200
Subject: [PATCH 2/4] src = self

---
 .gitignore |  1 +
 flake.nix  | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a6de37e..2f8b526 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ build/*
 *.egg-info/*
 */_version.py
 .direnv/*
+dist/*
diff --git a/flake.nix b/flake.nix
index 336e31d..12f3391 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,15 +11,22 @@
     let
       pkgs = nixpkgs.legacyPackages.${system};
     in rec {
-      packages = {
+      packages = rec {
         pythonEnv = pkgs.python3.withPackages(
           ps: with ps; [
             virtualenv
           ]
         );
+        annexremote = pkgs.python3Packages.buildPythonPackage rec {
+          pname = "annexremote";
+          version = self.rev;
+          # format = "setuptools";
+          src = self;
+        };
+        default = annexremote;
       };
 
-      defaultPackage = packages.pythonEnv;
+      defaultPackage = packages.default;
       devShell = packages.pythonEnv.env;
     });
 }

From baebff5829d9319bfc1a26240feb4588876104bf Mon Sep 17 00:00:00 2001
From: Silvio Ankermann <silvio@booq.org>
Date: Mon, 20 Jun 2022 21:57:28 +0200
Subject: [PATCH 3/4] format = pyproject

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 12f3391..a106b5e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,7 @@
         annexremote = pkgs.python3Packages.buildPythonPackage rec {
           pname = "annexremote";
           version = self.rev;
-          # format = "setuptools";
+          format = "pyproject";
           src = self;
         };
         default = annexremote;

From e18968e6286eb61acc10470d51e1fd706d79edc1 Mon Sep 17 00:00:00 2001
From: Silvio Ankermann <silvio@booq.org>
Date: Mon, 20 Jun 2022 21:57:56 +0200
Subject: [PATCH 4/4] Add result to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2f8b526..4060d34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ build/*
 */_version.py
 .direnv/*
 dist/*
+result