fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

chore(gitlab-ci): use stdenv make

Browse Source
This commit is contained in:
Sarah Vaupel 2024-01-17 09:37:32 +01:00
parent 31a192f707
commit 34c71b76c7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -42,7 +42,7 @@ node modules:
- .npm - .npm
- node_modules - node_modules
script: script:
- "nix develop --command 'make node_modules'" - "nix shell .#gup .#nodejs_21 --command 'make node_modules'"
before_script: &nix-before before_script: &nix-before
- git config --global init.defaultBranch master - git config --global init.defaultBranch master
- install -v -m 0700 -d ~/.ssh - install -v -m 0700 -d ~/.ssh

2
flake.nix
View File

@ -107,7 +107,7 @@
(final: prev: let (final: prev: let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
in { in {
inherit (pkgs) dockerTools nodejs_21 glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot; inherit (pkgs) gup dockerTools nodejs_21 glibcLocalesUtf8 tzdata exiftools chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot make;
stack = pkgs.symlinkJoin { stack = pkgs.symlinkJoin {
inherit (pkgs.stack) name; inherit (pkgs.stack) name;
paths = [pkgs.stack]; paths = [pkgs.stack];

4
shell.nix
View File

@ -275,8 +275,8 @@ in pkgs.mkShell {
''; '';
nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] nativeBuildInputs = [develop inDevelop killallUni2work diffRunning]
++ (with pkgs; ++ (with pkgs;
[ stack nodejs_21 postgresql_12 openldap exiftool expat memcached minio minio-client [ stdenv stack nodejs_21 postgresql_12 openldap exiftool expat memcached minio minio-client
gnumake gup reuse pre-commit gup reuse pre-commit
# busybox # for print services, but interferes with build commands in develop-shell # busybox # for print services, but interferes with build commands in develop-shell
htop htop
pdftk # pdftk just for testing pdf-passwords pdftk # pdftk just for testing pdf-passwords