diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7effac10..02475780b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,8 +42,7 @@ node modules: - .npm - node_modules script: - - "nix-shell --version" - - "nix-shell --command 'make node_modules'" + - "nix develop --command 'make node_modules'" before_script: &nix-before - git config --global init.defaultBranch master - install -v -m 0700 -d ~/.ssh @@ -64,7 +63,7 @@ node modules: frontend lint: stage: lint script: - - "nix-shell --comand 'make frontend-lint'" + - "nix develop --comand 'make frontend-lint'" before_script: *nix-before needs: - job: node modules @@ -80,7 +79,7 @@ frontend build: paths: - .well-known-cache script: - - "nix-shell --command 'make frontend-build'" + - "nix develop --command 'make frontend-build'" before_script: *nix-before needs: - job: node modules diff --git a/flake.nix b/flake.nix index 226fb3504..40a088c4c 100644 --- a/flake.nix +++ b/flake.nix @@ -136,9 +136,6 @@ devShell = import ./shell.nix { pkgs = self.legacyPackages.${system}; nixpkgsPath = nixpkgs; }; legacyPackages = pkgs.lib.foldr (overlay: acc: acc // recursiveUpdate (overlay self.legacyPackages.${system} pkgs) pkgs) {} overlays; - - defaultPackage = self.packages.${system}."uniworx:exe:uniworx"; - defaultApp = self.apps.${system}."uniworx:exe:uniworx"; } ); } diff --git a/shell.nix b/shell.nix index 9dfa3e3f9..3598f9094 100644 --- a/shell.nix +++ b/shell.nix @@ -275,7 +275,7 @@ in pkgs.mkShell { ''; nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] ++ (with pkgs; - [ (builtins.trace (lib.version) stack) (builtins.trace (lib.version) nodejs_21) postgresql_12 openldap exiftool expat memcached minio minio-client + [ stack nodejs_21 postgresql_12 openldap exiftool expat memcached minio minio-client gnumake gup reuse pre-commit # busybox # for print services, but interferes with build commands in develop-shell htop