diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 455e8e7b55d1d04f73e767ac0ef4484b77ba2b80..a0dcfb0fa588b785da709f324d3a57cfd5ac04f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,14 +26,14 @@ test: script: - nix develop .#gitlab --command run-ci-tests -deploy: - stage: deploy - tags: - - nixos-gen3 - script: - - nix develop --command deploy - after_script: - - nix develop --command clean-up - - when: on_success +#deploy: +# stage: deploy +# tags: +# - nixos-gen3 +# script: +# - nix develop --command deploy +# after_script: +# - nix develop --command clean-up +# +# when: on_success \ No newline at end of file diff --git a/flake.lock b/flake.lock index 127ebc463f9fb8fc7de81539a2bfce6a3a00ef1b..1affddb717c84d20bfba2c68d924b40629c39100 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "rev": "4a30b23f6580958ff5e06af5534f03228f7be631", "revCount": 28, "type": "git", - "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git" + "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git/" }, "original": { "type": "git", - "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git" + "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git/" } }, "flake-utils": { diff --git a/flake.nix b/flake.nix index c0f3e6cc7a8bf0a5cc9522e0a349e9f64affa553..2a17356361202e74ba32fac0c2144bb3ba5d05ed 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs = {url = "github:nixos/nixpkgs/nixos-23.11";}; flake-utils = {url = "github:numtide/flake-utils";}; version = {url = "git+https://gitlab.schukai.com/oss/utilities/version.git/";}; - devFlakes = {url = "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git";}; + devFlakes = {url = "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git/";}; }; outputs = { @@ -35,8 +35,8 @@ rootPath = ./.; - commonPck = devFlakes.packages.${system}.common; - commonScript = commonPck + "/bin/common"; + # commonPck = devFlakes.packages.${system}.common; + commonScript = "/bin/common"; commonPackages = import ./nix/config/common-packages.nix {inherit pkgs';};