diff --git a/flake.lock b/flake.lock index 79637b2..e037f3d 100644 --- a/flake.lock +++ b/flake.lock @@ -175,6 +175,22 @@ "type": "github" } }, + "nginx": { + "flake": false, + "locked": { + "lastModified": 1713277799, + "narHash": "sha256-VNDzQvUGeh54F3s6SIq6lBrp4RatURzJoJqVorexttA=", + "owner": "nginx", + "repo": "nginx", + "rev": "d8a849ae3c99ee5ca82c9a06074761e937dac6d6", + "type": "github" + }, + "original": { + "owner": "nginx", + "repo": "nginx", + "type": "github" + } + }, "nix": { "inputs": { "flake-compat": "flake-compat", @@ -388,6 +404,7 @@ "root": { "inputs": { "devenv": "devenv", + "nginx": "nginx", "nixpkgs": "nixpkgs_2", "systems": "systems_3" } diff --git a/flake.nix b/flake.nix index 2d95951..a5e0598 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,11 @@ systems.url = "github:nix-systems/default"; devenv.url = "github:cachix/devenv"; devenv.inputs.nixpkgs.follows = "nixpkgs"; + + nginx = { + url = "github:nginx/nginx"; + flake = false; + }; }; nixConfig = { @@ -12,7 +17,7 @@ extra-substituters = "https://devenv.cachix.org"; }; - outputs = { self, nixpkgs, devenv, systems, ... } @ inputs: + outputs = { self, nixpkgs, devenv, systems, nginx, ... }@inputs: let forEachSystem = nixpkgs.lib.genAttrs (import systems); in @@ -22,19 +27,7 @@ pkgs = nixpkgs.legacyPackages.${system}; in { - # images.hello = pkgs.dockerTools.buildImage { - # name = "hello-docker"; - # copyToRoot = pkgs.buildEnv { - # name = "image-root"; - # paths = [ pkgs.bashInteractive ]; - # pathsToLink = [ "/bin" ]; # For bash - # }; - - # config = { - # Cmd = [ "${pkgs.coreutils}/bin/sleep" "99999" ]; - # }; - # }; - + # Copied from: https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/docker/examples.nix nginx = let nginxPort = "80"; @@ -46,7 +39,7 @@ events {} http { access_log /dev/stdout; - include ${./mime.types}; + include ${nginx.outPath}/conf/mime.types; server { listen ${nginxPort}; diff --git a/mime.types b/mime.types deleted file mode 100644 index 8d37c86..0000000 --- a/mime.types +++ /dev/null @@ -1,98 +0,0 @@ -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/avif avif; - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/wasm wasm; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/result b/result new file mode 120000 index 0000000..4545c9c --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/24wf9rjlljlhpz1r8klv376zmyvw2cpd-nginx-container.tar.gz \ No newline at end of file