diff --git a/build/version-linux-386 b/build/version-linux-386 index 86d56de48d9176d88417dcc57d01271d3ce92cda..47f7ff69db3bd82ca7aea748b745e1fcc96f8703 100755 Binary files a/build/version-linux-386 and b/build/version-linux-386 differ diff --git a/build/version-linux-amd64 b/build/version-linux-amd64 index 31f61a6f186a04d8f5eb61b908a3b85c9556df6f..792de4bacee0552b1411b266b13b76966c146e2c 100755 Binary files a/build/version-linux-amd64 and b/build/version-linux-amd64 differ diff --git a/build/version-linux-arm b/build/version-linux-arm index c6e7497d58529f57c583d3d78a88ee382c5eed13..5daed074988f75c0dbf63af49f5c75a8a6b69962 100755 Binary files a/build/version-linux-arm and b/build/version-linux-arm differ diff --git a/build/version-linux-arm64 b/build/version-linux-arm64 index fe83f77150eebabd2f710a3ce5cf9fb677e1e4bb..d430461dc1a3731bb87e388075a4475df48e009f 100755 Binary files a/build/version-linux-arm64 and b/build/version-linux-arm64 differ diff --git a/build/version-windows b/build/version-windows index 902c688f9e4e0c5b69f9459203251a769cd711e6..14b956b013ab4ad94215956ec16ae3bf5d073556 100755 Binary files a/build/version-windows and b/build/version-windows differ diff --git a/devenv.lock b/devenv.lock index 916141438549ab4a905bf7b1a088505985d66ada..74cfa96c112b04d0500698f48a68c239248d4fb1 100644 --- a/devenv.lock +++ b/devenv.lock @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689431009, - "narHash": "sha256-hPgQCRWP5q/Xc4qOIP3c2krR9nQua78+t9EDiuey5nc=", + "lastModified": 1689503327, + "narHash": "sha256-qVwzYLA8oT2oWNDXO0A3bZHOhoPOihIB9T677+Hor1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "af8279f65fe71ce5a448408034a8c06e2b4b2c66", + "rev": "f64b9738da8e86195766147e9752c67fccee006c", "type": "github" }, "original": { @@ -104,6 +104,21 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1689503327, + "narHash": "sha256-qVwzYLA8oT2oWNDXO0A3bZHOhoPOihIB9T677+Hor1E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f64b9738da8e86195766147e9752c67fccee006c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -132,7 +147,8 @@ "inputs": { "devenv": "devenv", "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks", + "version": "version" } }, "systems": { @@ -149,6 +165,24 @@ "repo": "default", "type": "github" } + }, + "version": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1689584837, + "narHash": "sha256-fthvNvvzQlXBP2is6UanGY06nKmmBOU1m+NJoOtptpA=", + "ref": "refs/heads/master", + "rev": "226cf5dc731ce42d842466257382e983a0bb2c4c", + "revCount": 25, + "type": "git", + "url": "https://gitlab.schukai.com/oss/utilities/version.git" + }, + "original": { + "type": "git", + "url": "https://gitlab.schukai.com/oss/utilities/version.git" + } } }, "root": "root", diff --git a/devenv.nix b/devenv.nix index bfc805ca263fac522ceb15dfccd436003ee78150..f802f6af506f3a5fa0b853dd1a0a320e44fbbd32 100644 --- a/devenv.nix +++ b/devenv.nix @@ -2,13 +2,11 @@ { pkgs, inputs, phps, lib, config, modulesPath,... }: { - - # https://devenv.sh/packages/ packages = [ + inputs.version.defaultPackage."${builtins.currentSystem}" pkgs.git pkgs.gcc12 - #pkgs.glibc pkgs.go-task pkgs.blackbox pkgs.blackbox-terminal @@ -26,21 +24,12 @@ pkgs.gnugrep pkgs.gnumake pkgs.util-linux - # pkgs.logrotate pkgs.httpie pkgs.netcat pkgs.memcached pkgs.fd - - #pkgs.process-compose - # pkgs.glibc_multi - # pkgs.curl ]; - ## curl geht nicht! - - # https://devenv.sh/languages/ - # languages.nix.enable = true; languages = { go = { enable = true; diff --git a/devenv.yaml b/devenv.yaml index 8c47a8d08c983cb1085eb2c566b97a9a206d4dec..525a6f02f172bb9108a23c335a4ced3e80f78502 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -1,3 +1,7 @@ inputs: nixpkgs: - url: github:nixos/nixpkgs/nixos-23.05 + url: github:nixos/nixpkgs/nixos-23.05 + + version: + url: git+https://gitlab.schukai.com/oss/utilities/version.git + flake: true diff --git a/version.json b/version.json index 55bb4035b42959d7ada1bdb4b2c6af6851a5a107..82c19fd9aecca44dada2cb639a92359f69a1b8f5 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.28" + "version": "1.0.29" } \ No newline at end of file