feat: remove gomod2nix

Author: acaloiaro

.github/workflows/goreleaser.yml

@@ -12,28 +12,43 @@ jobs:
     permissions:
       contents: write
     steps:
+      - name: Install Act dependencies
+        if: ${{ env.ACT }}
+        run: |
+          apt-get update && apt-get install curl git sudo xz-utils -y
       - name: Checkout
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - name: install nix 
+        uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v14
+        with:
+          name: devenv
+        env:
+          USER: root
+      - name: Install devenv.sh
+        run: nix profile install nixpkgs#devenv
       - name: Setup go
         uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT_TOKEN }}
-      - name: Bump version and push tag 
-        shell: bash
+      - name: Bump version and push tag
+        shell: bash -c 'nix develop --no-pure-eval -c {0}'
         run: |
           git config --global user.email "[email protected]"
           git config --global user.name "Github Actions"
           go install github.com/caarlos0/svu@latest
-          OLD_TAG=$(svu current --strip-prefix)
-          NEW_TAG=$(svu next --strip-prefix)
+          OLD_TAG=$(svu current)
+          NEW_TAG=$(svu next)
           [ "$OLD_TAG" == "$NEW_TAG" ] && echo "no version bump" && exit 0
-          echo default.nix README.md main.go | xargs sed -i "s/$(svu current)/$(svu next)/g"
-          echo default.nix README.md main.go | xargs sed -i "s/$(svu current --prefix='')/$(svu next --prefix='')/g"
-          sed -i "s/BUILD_DATE = \".*\"/BUILD_DATE = \"$(date -Iseconds)\"/g" main.go 
+          echo default.nix README.md | xargs sed -i "s/$(svu current)/$(svu next)/g"
+          go mod vendor
+          sed -i "s|vendorHash = \".*\"|vendorHash = \"$(nix hash path ./vendor | tr --delete '\n')\"|g" default.nix
           git add default.nix main.go README.md
           git commit -m "bump release version" --allow-empty
           git tag v$NEW_TAG

.gitignore

@@ -2,3 +2,6 @@
 .direnv
 .devenv 
 .pre-commit-config.yaml
+result/
+vendor/
+ess

default.nix

@@ -1,21 +1,17 @@
-{ pkgs ? (
+{
+  pkgs ? (
     let
       inherit (builtins) fetchTree fromJSON readFile;
-      inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs gomod2nix;
+      inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs;
     in
-    import (fetchTree nixpkgs.locked) {
-      overlays = [
-        (import "${fetchTree gomod2nix.locked}/overlay.nix")
-      ];
-    }
-  )
-, buildGoApplication ? pkgs.buildGoApplication
+      import (fetchTree nixpkgs.locked) {}
+  ),
+  buildGoModule ? pkgs.buildGoModule,
 }:
-
-buildGoApplication {
+buildGoModule {
   pname = "ess";
   version = "2.14.1";
   pwd = ./.;
   src = ./.;
-  modules = ./gomod2nix.toml;
+  vendorHash = "sha256-ooTP3mS7AEzwJm1JKebL0V2lqVge3WnpFZcbr1f/LIg=";
 }

flake.lock

@@ -1,62 +1,51 @@
 {
+  description = "ess (env sampple sync)";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    systems.url = "github:nix-systems/default";
+    flake-utils.url = "github:numtide/flake-utils";
     devenv.url = "github:cachix/devenv";
-
-    gomod2nix = {
-      url = "github:nix-community/gomod2nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
     self,
     nixpkgs,
+    flake-utils,
     devenv,
-    systems,
-    gomod2nix,
-    ...
-  } @ inputs: let
-    forEachSystem = nixpkgs.lib.genAttrs (import systems);
-  in {
-    packages = forEachSystem (system: let
-      callPackage = nixpkgs.darwin.apple_sdk_11_0.callPackage or nixpkgs.legacyPackages.${system}.callPackage;
-    in {
-      default = callPackage ./. {
-        inherit (gomod2nix.legacyPackages.${system}) buildGoApplication;
-      };
-    });
+  } @ inputs:
+    flake-utils.lib.eachDefaultSystem (
+      system: let
+        pkgs = import nixpkgs {
+          inherit system;
+        };
+      in {
+        packages.default = pkgs.callPackage ./. {};
+        CGO_ENABLED = 0;
+        defaultPackage = self.packages.${system}.default;
+        apps.default = flake-utils.lib.mkApp {
+          drv = self.packages.${system}.default;
+        };
 
-    devShells = forEachSystem (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      default = devenv.lib.mkShell {
-        inherit inputs pkgs;
-        modules = [
-          {
-            packages = with pkgs; [
-              automake
-              go_1_23
-              gomod2nix.legacyPackages.${system}.gomod2nix
-              gotools
-              golangci-lint
-              go-tools
-              gopls
-              pre-commit
-              svu
+        devShells = let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in {
+          default = devenv.lib.mkShell {
+            inherit inputs pkgs;
+            modules = [
+              {
+                packages = with pkgs; [
+                  act
+                  automake
+                  go_1_24
+                  gotools
+                  golangci-lint
+                  go-tools
+                  gopls
+                  svu
+                ];
+              }
             ];
-
-            pre-commit.hooks.gomod2nix = {
-              enable = true;
-              pass_filenames = false;
-              name = "gomod2nix";
-              description = "Run gomod2nix before commit";
-              entry = "${gomod2nix.legacyPackages.${system}.gomod2nix}/bin/gomod2nix";
-            };
-          }
-        ];
-      };
-    });
-  };
+          };
+        };
+      }
+    );
 }

flake.nix

@@ -1,5 +1,7 @@
 module github.com/acaloiaro/ess
 
-go 1.24
+go 1.24.1
 
-require github.com/acaloiaro/go-envparse v0.5.0
+require (
+	github.com/acaloiaro/go-envparse v0.5.0
+)

go.mod

@@ -14,12 +14,16 @@ import (
 	"regexp"
 	"strings"
 	"text/template"
+	"time"
 
 	"github.com/acaloiaro/go-envparse"
 )
 
-const VERSION = "2.14.1"
-const BUILD_DATE = "2024-12-12T19:42:19+00:00"
+var (
+	version = "dev"
+	commit  = "none"
+	date    = time.Now().Format(time.RFC822)
+)
 
 type exampleFlag map[string]string
 
@@ -71,7 +75,7 @@ func init() {
 	flag.Parse()
 
 	if versionFlag {
-		fmt.Fprintf(os.Stdout, "ess version: %s built at: %s\n", VERSION, BUILD_DATE)
+		fmt.Fprintf(os.Stdout, "ess version: %s built at: %s\n", version, date)
 		os.Exit(0)
 	}