Merge pull request 'buld(nix): Misc Nix-related improvements' (#68 ) from tasiaiso/tildefriends:tasiaiso-nix-misc into main

Reviewed-on: #68
buld(nix): Misc Nix-related improvements
2024-06-04 20:16:15 -04:00 · 2024-06-04 15:22:18 +02:00
4 changed files with 65 additions and 60 deletions
--- a/.prettierignore
+++ b/.prettierignore
@ -2,6 +2,7 @@ node_modules
 src
 deps
 .clang-format
+flake.lock

 # Minified files
 **/*.min.css
--- a/default.nix
+++ b/default.nix
@ -33,12 +33,14 @@ pkgs.stdenv.mkDerivation rec {
  };

  nativeBuildInputs = with pkgs; [
+    glibc
    gnumake
    openssl
    which
  ];

  buildInputs = with pkgs; [
+    glibc
    openssl
    which
  ];
--- a/flake.lock
+++ b/flake.lock
@ -20,16 +20,16 @@
    },
    "nixpkgs": {
      "locked": {
-				"lastModified": 1715395895,
-				"narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=",
+        "lastModified": 1717281328,
+        "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-				"rev": "71bae31b7dbc335528ca7e96f479ec93462323ff",
+        "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-				"ref": "nixos-23.11",
+        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@ -2,7 +2,7 @@
  description = "Tilde Friends is a platform for making, running, and sharing web applications.";

  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
    flake-utils.url = "github:numtide/flake-utils";
  };

@ -31,6 +31,8 @@
            openssl
            llvmPackages_17.clang-unwrapped
            unzip
+            doxygen
+            graphviz
          ];
        };
      });
Author	SHA1	Message	Date
Cory McWilliams	0394201113	Merge pull request 'buld(nix): Misc Nix-related improvements' (#68 ) from tasiaiso/tildefriends:tasiaiso-nix-misc into main Reviewed-on: #68	2024-06-04 20:16:15 -04:00
Tasia Iso	4c10538632	buld(nix): Misc Nix-related improvements - Nixpkgs 23.11 is deprecated, use 24.05 instead - update flake.lock - add glibc as a build dependency - add doxygen and graphviz as development dependencies for `make format`	2024-06-04 15:22:18 +02:00