fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix local build

Browse Source
This commit is contained in:
Gregor Kleen 2023-04-27 07:46:17 +00:00
parent c86f36b2f6
commit d89d4cfbbc
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -942,16 +942,16 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1680296362, "lastModified": 1628953589,
"narHash": "sha256-zI8rKfSoRf261clT5Fi5M+buLyN1z5FgWFgnPHgJd1Y=", "narHash": "sha256-k9iFFwHvqKFBjCL2tOsJGlpzWRd0UQvsGSTDInCrkRM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff40c8086733f2104d416b6ffd4770068a1fd43f", "rev": "283d622397539f196416657da9dc804a4ca89846",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "master", "ref": "283d622397539f196416657da9dc804a4ca89846",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

5
flake.nix
View File

@ -12,7 +12,8 @@
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "master"; # ref = "master";
ref = "283d622397539f196416657da9dc804a4ca89846";
}; };
flake-utils = { flake-utils = {
type = "github"; type = "github";
@ -113,7 +114,7 @@
(import ./nix/maildev) (import ./nix/maildev)
haskell-nix.overlay haskell-nix.overlay
(import ./nix/uniworx { inherit inputs frontendSource backendSource; }) (import ./nix/uniworx { inherit inputs frontendSource backendSource; gitRevision = if self ? rev then self.rev else null; })
(import ./nix/docker { inherit self; }) (import ./nix/docker { inherit self; })
(import ./nix/parse-changelog.nix {}) (import ./nix/parse-changelog.nix {})
]; ];

7
nix/uniworx/backend.nix
View File

@ -1,8 +1,8 @@
# SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Steffen Jost <jost@cip.ifi.lmu.de> # SPDX-FileCopyrightText: 2022-2023 Gregor Kleen <gregor@kleen.consulting>, Steffen Jost <jost@cip.ifi.lmu.de>
# #
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
{ inputs, backendSource, ... }: final: prev: { inputs, backendSource, gitRevision ? null, ... }: final: prev:
with prev.lib; with prev.lib;
@ -66,6 +66,9 @@ in {
''; '';
preBuild = '' preBuild = ''
export TZDIR=${final.tzdata}/share/zoneinfo export TZDIR=${final.tzdata}/share/zoneinfo
${optionalString (gitRevision != null) ''
export GIT_REVISION=${gitRevision}
''}
''; '';
components.library.build-tools = with final.pkgs; [ llvm_9 ]; components.library.build-tools = with final.pkgs; [ llvm_9 ];
components.exes.uniworx.build-tools = with final.pkgs; [ llvm_9 ]; components.exes.uniworx.build-tools = with final.pkgs; [ llvm_9 ];

6
nix/uniworx/default.nix
View File

@ -1,10 +1,10 @@
# SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de> # SPDX-FileCopyrightText: 2022-2023 Gregor Kleen <gregor@kleen.consulting>
# #
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
{ inputs, frontendSource, backendSource }: final: prev: prev.lib.composeManyExtensions [ { inputs, frontendSource, backendSource, gitRevision ? null }: final: prev: prev.lib.composeManyExtensions [
(import ./node-dependencies.nix { inherit inputs; }) (import ./node-dependencies.nix { inherit inputs; })
(import ./well-known.nix { inherit frontendSource; }) (import ./well-known.nix { inherit frontendSource; })
(import ./frontend.nix { inherit frontendSource; }) (import ./frontend.nix { inherit frontendSource; })
(import ./backend.nix { inherit backendSource inputs; }) (import ./backend.nix { inherit backendSource inputs gitRevision; })
] final prev ] final prev

6
shell.nix
View File

@ -268,12 +268,14 @@ in pkgs.mkShell {
${pkgs.lib.optionalString (nixpkgsPath != null) '' ${pkgs.lib.optionalString (nixpkgsPath != null) ''
export NIX_PATH=nixpkgs=${nixpkgsPath} export NIX_PATH=nixpkgs=${nixpkgsPath}
''} ''}
export CHROME_BIN=${pkgs.chromium}/bin/chromium
''; '';
nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] nativeBuildInputs = [develop inDevelop killallUni2work diffRunning]
++ (with pkgs; ++ (with pkgs;
[ nodejs-14_x postgresql_12 openldap chromium exiftool memcached minio minio-client [ nodejs-14_x postgresql_12 openldap exiftool memcached minio minio-client
gup reuse pre-commit gup reuse pre-commit
node2nix # node2nix
# 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