From edc1474077fc0a9276d730b21340801274ce3668 Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Wed, 13 Sep 2023 15:19:18 -0400 Subject: [PATCH] minor cleanup --- TODO | 6 ++---- flake.nix | 6 +++--- shell.nix | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/TODO b/TODO index 876c44f..be143c1 100644 --- a/TODO +++ b/TODO @@ -3,14 +3,12 @@ * Docker container on DockerHub, GitHub Container Repository (ghcr.io) * containers could have multiple tags as in `latest` and `1.0.0` * build windows MSYS2 -* formatting -* lint -* security audits * Gitpod -* recorded ascii demo * README.md * build and other badges ----- nix flake show +nix flake check +nix shell github:gburd/hello -c hello nix flake show --json | jq '.packages."x86_64-linux"|keys[]'| xargs -I {} nix build .#{} diff --git a/flake.nix b/flake.nix index 0fae4a2..3c3b5aa 100644 --- a/flake.nix +++ b/flake.nix @@ -40,9 +40,9 @@ hello = with final; stdenv.mkDerivation rec { pname = "hello"; inherit version; - src = ./.; + src = self; nativeBuildInputs = [ autoreconfHook ]; - }; + }; }) ]; }; @@ -53,7 +53,7 @@ packages.container = pkgs.callPackage ./container.nix { package = packages.default; }; apps.hello = flake-utils.lib.mkApp { drv = packages.default; }; - defaultApp = apps.hello; + apps.${system}.default = apps.hello; devShells.default = import ./shell.nix { inherit pkgs; }; } diff --git a/shell.nix b/shell.nix index d25767b..2e72968 100644 --- a/shell.nix +++ b/shell.nix @@ -1,5 +1,5 @@ { pkgs ? import {} }: pkgs.mkShell { # nativeBuildInputs is usually what you want -- tools you need to run - #nativeBuildInputs = with pkgs.buildPackages; [ ]; + nativeBuildInputs = with pkgs.buildPackages; [ ripgrep ]; }