forked from cory/tildefriends
		
	Merge pull request 'buld(nix): Misc Nix-related improvements' (#68) from tasiaiso/tildefriends:tasiaiso-nix-misc into main
Reviewed-on: cory/tildefriends#68
This commit is contained in:
		@@ -2,6 +2,7 @@ node_modules
 | 
				
			|||||||
src
 | 
					src
 | 
				
			||||||
deps
 | 
					deps
 | 
				
			||||||
.clang-format
 | 
					.clang-format
 | 
				
			||||||
 | 
					flake.lock
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Minified files
 | 
					# Minified files
 | 
				
			||||||
**/*.min.css
 | 
					**/*.min.css
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -33,12 +33,14 @@ pkgs.stdenv.mkDerivation rec {
 | 
				
			|||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nativeBuildInputs = with pkgs; [
 | 
					  nativeBuildInputs = with pkgs; [
 | 
				
			||||||
 | 
					    glibc
 | 
				
			||||||
    gnumake
 | 
					    gnumake
 | 
				
			||||||
    openssl
 | 
					    openssl
 | 
				
			||||||
    which
 | 
					    which
 | 
				
			||||||
  ];
 | 
					  ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  buildInputs = with pkgs; [
 | 
					  buildInputs = with pkgs; [
 | 
				
			||||||
 | 
					    glibc
 | 
				
			||||||
    openssl
 | 
					    openssl
 | 
				
			||||||
    which
 | 
					    which
 | 
				
			||||||
  ];
 | 
					  ];
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										8
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@@ -20,16 +20,16 @@
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    "nixpkgs": {
 | 
					    "nixpkgs": {
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
				"lastModified": 1715395895,
 | 
					        "lastModified": 1717281328,
 | 
				
			||||||
				"narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=",
 | 
					        "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
 | 
				
			||||||
        "owner": "NixOS",
 | 
					        "owner": "NixOS",
 | 
				
			||||||
        "repo": "nixpkgs",
 | 
					        "repo": "nixpkgs",
 | 
				
			||||||
				"rev": "71bae31b7dbc335528ca7e96f479ec93462323ff",
 | 
					        "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
        "owner": "NixOS",
 | 
					        "owner": "NixOS",
 | 
				
			||||||
				"ref": "nixos-23.11",
 | 
					        "ref": "nixos-24.05",
 | 
				
			||||||
        "repo": "nixpkgs",
 | 
					        "repo": "nixpkgs",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@
 | 
				
			|||||||
  description = "Tilde Friends is a platform for making, running, and sharing web applications.";
 | 
					  description = "Tilde Friends is a platform for making, running, and sharing web applications.";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  inputs = {
 | 
					  inputs = {
 | 
				
			||||||
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 | 
					    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 | 
				
			||||||
    flake-utils.url = "github:numtide/flake-utils";
 | 
					    flake-utils.url = "github:numtide/flake-utils";
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -31,6 +31,8 @@
 | 
				
			|||||||
            openssl
 | 
					            openssl
 | 
				
			||||||
            llvmPackages_17.clang-unwrapped
 | 
					            llvmPackages_17.clang-unwrapped
 | 
				
			||||||
            unzip
 | 
					            unzip
 | 
				
			||||||
 | 
					            doxygen
 | 
				
			||||||
 | 
					            graphviz
 | 
				
			||||||
          ];
 | 
					          ];
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
      });
 | 
					      });
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user