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: use some more modern build inputs

Browse Source
This commit is contained in:
Gregor Kleen 2023-04-29 08:47:44 +00:00
parent bedb47e9d4
commit 6f47f21fe6
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -154,11 +154,11 @@
"docker-nixpkgs": { "docker-nixpkgs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1631525111, "lastModified": 1678089139,
"narHash": "sha256-dJKw280B1Hp0f6tSkBtkY0nrMT0DR/bmerrS3cQdBjI=", "narHash": "sha256-cK0RDcxR4eWMrdZIcqNVqnjo9k2LwVmNZO3qj1ctDXU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "docker-nixpkgs", "repo": "docker-nixpkgs",
"rev": "df7f64139a0b2384fb2448dc2a406815f8d03867", "rev": "2205fb4968adf683324e6d0401b74b9d250d8f56",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -120,7 +120,7 @@
(final: prev: let (final: prev: let
pkgs-recent = import nixpkgs-recent { inherit system; }; pkgs-recent = import nixpkgs-recent { inherit system; };
in { inherit (pkgs-recent) dockerTools node2nix stack glibcLocalesUtf8 tzdata; inherit (pkgs-recent.stdenv) fetchurlBoot; }) in { inherit (pkgs-recent) dockerTools node2nix stack glibcLocalesUtf8 tzdata chromium minio minio-client; inherit (pkgs-recent.stdenv) fetchurlBoot; })
(import ./nix/maildev) (import ./nix/maildev)
haskell-nix.overlay haskell-nix.overlay

13
nix/docker/default.nix
View File

@ -168,11 +168,14 @@ in
tag = (builtins.fromJSON (prev.lib.readFile ./ci-version.json)).version; tag = (builtins.fromJSON (prev.lib.readFile ./ci-version.json)).version;
fromImage = prev.docker-nixpkgs.nix-unstable; fromImage = prev.docker-nixpkgs.nix-unstable;
contents = with final; [ copyToRoot = prev.buildEnv {
bash coreutils name = "uniworx-ci-root";
minio-client paths = with final; [
xz bash coreutils
]; minio-client
xz
];
};
runAsRoot = '' runAsRoot = ''
#!${final.stdenv.shell} #!${final.stdenv.shell}