diff --git a/devenv.lock b/devenv.lock index d0d0a784eb3f9140dcad3bc477f50ef70261fdf2..9f48c8fcf632fbd41912d37bf6a358dacd5e5016 100644 --- a/devenv.lock +++ b/devenv.lock @@ -171,11 +171,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1704308484, - "narHash": "sha256-aclQ3GUoElRa5OlVZgtxzP1iM6Lus8ffDLRfV+0R9gQ=", + "lastModified": 1704365671, + "narHash": "sha256-/UhQdOlnqRPpD+bY4urniXJAMy8wgxjtnlYVl5fxOS4=", "ref": "refs/heads/master", - "rev": "8b59839682aafe4285c333a943046dc101d94a0d", - "revCount": 76, + "rev": "878e017276ba1f4cab5663f31f8d88d2b2244f4f", + "revCount": 79, "type": "git", "url": "https://gitlab.schukai.com/oss/utilities/version.git" }, diff --git a/devenv.nix b/devenv.nix index e5082530a0ea0b81df88e60883d8fd83ef3589a6..d6a81e4f7375e3f84db4084a1560f4fea425d3ec 100644 --- a/devenv.nix +++ b/devenv.nix @@ -10,6 +10,10 @@ }: let taskfileYaml = let gitCommit = (builtins.getFlake "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes").packages.${builtins.currentSystem}.git-commit; + + goPkgReleaseData = import ./project.nix; + goPkgName = goPkgReleaseData.name or "goPkg"; + goPkgMnemonic = goPkgReleaseData.mnemonic or "go-pkg"; in pkgs.writeTextFile { name = "Taskfile.yaml"; @@ -169,9 +173,6 @@ tasks: goPkgReleaseData = import ./project.nix; goPkgName = goPkgReleaseData.name or "goPkg"; goPkgMnemonic = goPkgReleaseData.mnemonic or "go-pkg"; - goPkgDescription = goPkgReleaseData.description or "this is a goPkg"; - goPkgVersion = goPkgReleaseData.version or "0.1.0"; - in pkgs.writeTextFile { name = ".goreleaser.yml"; @@ -207,7 +208,10 @@ tasks: ''; }; in { - env.APP_NAME = "version"; + env.APP_NAME = let + goPkgReleaseData = import ./project.nix; + goPkgMnemonic = goPkgReleaseData.mnemonic or "go-pkg"; + in goPkgMnemonic; # https://devenv.sh/packages/ packages = with pkgs; [ diff --git a/flake.lock b/flake.lock index d6ef0263fbed9c300730e22eb4a11bea12e635e5..655890ead74dd9a2fe7e38cad2b78a8a0033f1e4 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1689431009, - "narHash": "sha256-hPgQCRWP5q/Xc4qOIP3c2krR9nQua78+t9EDiuey5nc=", + "lastModified": 1704018918, + "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af8279f65fe71ce5a448408034a8c06e2b4b2c66", + "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", "type": "github" }, "original": {