Merge (#38) from tomasriveral/release/vv2.1.1

[Automatic] Release PR v2.1.1

.github/workflows/release.yml

@@ -17,10 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install GitHub CLI
-        run: sudo apt-get update && sudo apt-get install -y gh
-
-
       - name: Configure git
         run: |
           git config user.name "github-actions[bot]"
@@ -30,7 +26,7 @@ jobs:
 
       - name: Create release branch
         run: |
-          git checkout -B release/v${{ inputs.version }}
+          git checkout -B release/${{ inputs.version }}
 
       - name: Set version in flake.nix
         run: |
@@ -46,14 +42,14 @@ jobs:
 
       - name: Push branch
         run: |
-          git push origin release/v${{ inputs.version }}
+          git push origin release/${{ inputs.version }}
 
       - name: Create Pull Request
         run: |
           gh pr create \
             --base main \
             --head release/v${{ inputs.version }} \
-            --title "[Automatic] Release v${{ inputs.version }}" \
-            --body "Automated release PR.\nAfter the test's succesfull run, create manually a release with a new tag matching `${{ inputs.version }}`"
+            --title "[Automatic] Release PR ${{ inputs.version }}" \
+            --body "Automated release PR.\nAfter the test's succesfull run, create manually a release with a new tag matching ${{ inputs.version }}"
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -57,6 +57,26 @@ You must also have a [supported editor (and their associated plugin if needed)](
 
 ## How to install
 
+### Nix flakes
+
+Add this to your inputs in flake.nix:
+
+```nix
+notewrapper = {
+  url = "github:tomasriveral/notewrapper";
+};
+```
+If your flake already inputs nixpkgs and/or flake-utils, you can follow it:
+```nix
+notewrapper = {
+  url = "github:tomasriveral/notewrapper;
+  inputs.nixpkgs.follow = "nixpkgs";
+  inputs.flake-utils.follow = "flake-utils";
+};
+```
+
+### Building from source
+
 1. Install all required dependencies listed above.
 2. Ensure you have a supported editor installed.
 3. Clone the repository:
@@ -89,7 +109,7 @@ make
 
 ---
 
-## Packaging
+### Packaging
 
 There is currently no official package available for NoteWrapper.
 

flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1779508470,
-        "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
+        "lastModified": 1779560665,
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "29916453413845e54a65b8a1cf996842300cd299",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {
@@ -34,10 +34,27 @@
         "type": "github"
       }
     },
+    "notewrapper": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1779788695,
+        "narHash": "sha256-JdTeS6rxDEa+A+rQjbFJajBhlwauBApIP3UwvrPbaf4=",
+        "owner": "tomasriveral",
+        "repo": "NoteWrapper",
+        "rev": "d537357802940e924d77ebd0fc1a658f884138ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomasriveral",
+        "repo": "NoteWrapper",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "notewrapper": "notewrapper"
       }
     },
     "systems": {

flake.nix

@@ -4,23 +4,22 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    notewrapper = {
+      url = "github:tomasriveral/NoteWrapper";
+      flake = false;
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, notewrapper }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
       in {
         packages.default = pkgs.stdenv.mkDerivation (finalAttrs: {
           pname = "notewrapper";
-          version = "2.0";
+          version = "v2.1.1";
 
-          src = pkgs.fetchFromGitHub {
-            owner = "tomasriveral";
-            repo = "NoteWrapper";
-            tag = "v${finalAttrs.version}";
-            hash = "sha256-JoI38n5RZ/s0n+Vr9Bri2oiFeyj7Xrt1AmglmcuMpmQ=";
-          };
+          src = notewrapper;
 
           nativeBuildInputs = with pkgs; [
             pkg-config
@@ -37,12 +36,8 @@
             gnused
           ];
 
-          makeFlags = [
-            "VERSION=2.0"
-          ];
-
           buildPhase = ''
-            make
+            make VERSION=${finalAttrs.version}
           '';
 
           installPhase = ''