Commit Diff


commit - 542aa16cd64f73317bcb505e0573e411501eca3c
commit + eb30dd9cceddeab4af6aba3178a0f45c758bad6c
blob - 4aa73ff5253f30c9bf7658e2fa547362cbf752ce
blob + d0e2bfe5cee6034c2ac32d14fc899e2f65ed99c8
--- flake.lock
+++ flake.lock
@@ -1,21 +1,5 @@
 {
   "nodes": {
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1678901627,
@@ -49,7 +33,6 @@
     },
     "root": {
       "inputs": {
-        "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
blob - 26cd6183c2b3f1756cea05dd9658b0086127550d
blob + 618894067e5a373516eaba7313ccd8019b957325
--- flake.nix
+++ flake.nix
@@ -8,29 +8,25 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
     flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = { self, nixpkgs, flake-utils, ... }:
-    with flake-utils.lib; eachSystem allSystems (system:
+    flake-utils.lib.eachSystem flake-utils.lib.allSystems (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
         tex = pkgs.texlive.combine {
           inherit (pkgs.texlive) scheme-medium latexmk biber acronym
-            listingsutf8 csquotes biblatex biblatex-ieee draftwatermark;
+            listingsutf8 csquotes biblatex biblatex-ieee;
         };
-        buildDeps = [ pkgs.glibcLocales pkgs.coreutils tex pkgs.gnumake ];
+        buildInputs = [ pkgs.glibcLocales pkgs.coreutils tex pkgs.gnumake ];
       in
       rec {
         packages = {
           thesis = pkgs.stdenvNoCC.mkDerivation rec {
             name = "bachelor-thesis-ble-throughput";
             src = self;
-            buildInputs = buildDeps;
+            inherit buildInputs;
             phases = [ "unpackPhase" "buildPhase" "installPhase" ];
             buildPhase = ''
               export PATH="${pkgs.lib.makeBinPath buildInputs}";
@@ -46,7 +42,7 @@
         };
         defaultPackage = packages.thesis;
         devShells.default = pkgs.mkShell {
-          buildInputs = buildDeps ++ [ pkgs.inotify-tools ];
+          buildInputs = buildInputs ++ [ pkgs.inotify-tools ];
         };
         devShell = self.devShells.${system}.default;
       });