diff --git a/flake.lock b/flake.lock index f69c4ce8c437e1c377e1ac4af99687caa81752ec..e8408a257429bfbc70205e5e649685f7138b5a0b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,15 @@ { "nodes": { "nixpkgs": { "locked": { - "lastModified": 1733935885, - "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", + "lastModified": 1703206931, + "narHash": "sha256-GHJl3HHdH4jWjRVBuyDRIaUoNNMTuVbw0i9+EaYzcBU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", + "rev": "bfbfb344598544058481e254b9f0f174d05b5e6a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 00d45c1c0cb539f6ab368926d62f338b26f0022e..a7c7508c716fabe261ce3c719c7ad302630a45c4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,41 +1,39 @@ { description = "go mod init"; - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - outputs = - { - self, - nixpkgs, - }: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in - { - packages.${system}.default = pkgs.buildGoModule rec { - pname = "gomodinit"; - version = self.rev or "dev"; - src = ./.; - vendorHash = nixpkgs.lib.fileContents ./go.mod.sri; - ldflags = [ - "-s" - "-w" - "-X=main.Version=${version}" - ]; + inputs.nixpkgs.url = "github:nixos/nixpkgs"; - meta = with pkgs.lib; { - description = "go mod init"; - homepage = "https://git.jolheiser.com/gomodinit"; - maintainers = with maintainers; [ jolheiser ]; - mainProgram = "gomodinit"; - }; - }; + outputs = { + self, + nixpkgs, + }: let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + in { + packages.${system}.default = pkgs.buildGoModule rec { + pname = "gomodinit"; + version = self.rev or "dev"; + src = ./.; + vendorHash = nixpkgs.lib.fileContents ./go.mod.sri; + ldflags = [ + "-s" + "-w" + "-X=main.Version=${version}" + ]; - devShells.${system}.default = pkgs.mkShell { - nativeBuildInputs = with pkgs; [ - go - gopls - ]; + meta = with pkgs.lib; { + description = "go mod init"; + homepage = "https://git.jolheiser.com/gomodinit"; + maintainers = with maintainers; [jolheiser]; + mainProgram = "gomodinit"; }; }; + + devShells.${system}.default = pkgs.mkShell { + nativeBuildInputs = with pkgs; [ + go + gopls + ]; + }; + }; } diff --git a/main.go b/main.go index 7d390454567c4aff67019aa85f5ccf8fd53d5b28..6b688ad153d627b197eff14fb1c5d6ebb9f4cd5a 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,6 @@ package main import ( - "bytes" "errors" "flag" "fmt" @@ -74,5 +73,5 @@ } parts := strings.SplitN(name, "/", 2) - return fmt.Sprintf("%s/%s", bytes.TrimSpace(override), parts[1]), nil + return fmt.Sprintf("%s/%s", override, parts[1]), nil }