about summary refs log tree commit diff stats
path: root/nix
diff options
context:
space:
mode:
authorAlan Pearce2024-05-12 22:34:23 +0200
committerAlan Pearce2024-05-12 23:12:39 +0200
commit895a3b061bb4717955ffbceab3bf3c6ecebacd70 (patch)
treefed970785b9b0460693d07dcffae08283be90ce4 /nix
parent7077a3748fa545e8dee83d4f3464c55b4b459183 (diff)
downloadsearchix-895a3b061bb4717955ffbceab3bf3c6ecebacd70.tar.lz
searchix-895a3b061bb4717955ffbceab3bf3c6ecebacd70.tar.zst
searchix-895a3b061bb4717955ffbceab3bf3c6ecebacd70.zip
build: switch to flakes
Diffstat (limited to 'nix')
-rw-r--r--nix/dev-shell.nix21
-rw-r--r--nix/package.nix37
-rw-r--r--nix/pre-commit-checks.nix95
-rw-r--r--nix/sources.json51
-rw-r--r--nix/sources.nix198
5 files changed, 153 insertions, 249 deletions
diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix
new file mode 100644
index 0000000..0ba6b91
--- /dev/null
+++ b/nix/dev-shell.nix
@@ -0,0 +1,21 @@
+{ pre-commit-check
+, mkGoEnv
+, gomod2nix
+, mkShell
+, pkgs
+}:
+let
+  goEnv = mkGoEnv { pwd = ../.; };
+in
+mkShell {
+  packages = with pkgs;  [
+    goEnv
+
+    brotli
+    bleve
+    wgo
+    gomod2nix
+    nixpkgs-lint
+  ] ++ pre-commit-check.enabledPackages;
+  inherit (pre-commit-check) shellHook;
+}
diff --git a/nix/package.nix b/nix/package.nix
new file mode 100644
index 0000000..6c942b0
--- /dev/null
+++ b/nix/package.nix
@@ -0,0 +1,37 @@
+{ pkgs ? (
+    let
+      inherit (builtins) fetchTree fromJSON readFile;
+      inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs gomod2nix;
+    in
+    import (fetchTree nixpkgs.locked) {
+      overlays = [
+        (import "${fetchTree gomod2nix.locked}/overlay.nix")
+      ];
+    }
+  )
+, buildGoApplication ? pkgs.buildGoApplication
+, css
+}:
+buildGoApplication {
+  pname = "searchix";
+  version = "0.1";
+  src = with pkgs.lib.fileset; toSource {
+    root = ../.;
+    fileset = difference
+      (unions [
+        ../go.mod
+        ../go.sum
+        ../serve
+        ../import
+        ../internal
+        ../frontend
+      ])
+      (maybeMissing ../frontend/static/base.css);
+  };
+
+  patchPhase = ''
+    cp ${css} frontend/static/base.css
+  '';
+  tags = [ "embed" ];
+  modules = ../gomod2nix.toml;
+}
diff --git a/nix/pre-commit-checks.nix b/nix/pre-commit-checks.nix
new file mode 100644
index 0000000..bd6df7c
--- /dev/null
+++ b/nix/pre-commit-checks.nix
@@ -0,0 +1,95 @@
+{ pkgs }:
+rec {
+  src = ../.;
+  hooks = {
+    gotest.enable = true;
+    golangci-lint.enable = true;
+    staticcheck =
+      let
+        wrapper = pkgs.symlinkJoin {
+          name = "staticcheck-wrapped";
+          paths = [ pkgs.go-tools ];
+          nativeBuildInputs = [ pkgs.makeWrapper ];
+          postBuild = ''
+            wrapProgram $out/bin/staticcheck \
+              --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.go ]}
+          '';
+        };
+      in
+      {
+        enable = true;
+        package = wrapper;
+        entry =
+          let
+            script = pkgs.writeShellScript "precommit-staticcheck" ''
+              err=0
+              for dir in $(echo "$@" | xargs -n1 dirname | sort -u); do
+                ${hooks.staticcheck.package}/bin/staticcheck ./"$dir"
+                code="$?"
+                if [[ "$err" -eq 0 ]]; then
+                  err="$code"
+                fi
+              done
+              exit $err
+            '';
+          in
+          builtins.toString script;
+      };
+
+    statix = {
+      enable = true;
+      settings.ignore = [ "nix/*" ];
+    };
+    deadnix = {
+      enable = true;
+      excludes = [ "nix/.*" ];
+    };
+    nixpkgs-fmt = {
+      enable = true;
+      excludes = [ "nix/.*" ];
+    };
+
+    convco.enable = true;
+
+    check-case-conflicts.enable = true;
+    check-symlinks.enable = true;
+    editorconfig-checker.enable = true;
+    prettier = {
+      enable = true;
+      types_or = [ "plain-text" "yaml" "gotmpl" "javascript" ];
+      settings = {
+        plugins = with pkgs.nodePackages; [
+          "${prettier-plugin-go-template}/lib/node_modules/prettier-plugin-go-template/lib/index.js"
+        ];
+      };
+    };
+
+    yamllint = {
+      enable = true;
+    };
+    golines = {
+      enable = true;
+      name = "golines";
+      description = "A golang formatter that fixes long lines";
+      types_or = [ "go" ];
+      entry = "${pkgs.golines}/bin/golines --write-output";
+      pass_filenames = true;
+    };
+    go-mod-tidy = {
+      enable = true;
+      name = "go-mod-tidy";
+      description = "Run `go mod tidy`";
+      types_or = [ "go" "go-mod" ];
+      entry = "${pkgs.go}/bin/go mod tidy";
+      pass_filenames = false;
+    };
+    gomod2nix = {
+      enable = true;
+      name = "gomod2nix";
+      description = "Import go.mod updates to nix";
+      types_or = [ "go-sum" ];
+      entry = "${pkgs.gomod2nix}/bin/gomod2nix";
+      pass_filenames = false;
+    };
+  };
+}
diff --git a/nix/sources.json b/nix/sources.json
deleted file mode 100644
index 1534db4..0000000
--- a/nix/sources.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "git-hooks": {
-        "branch": "master",
-        "description": "Seamless integration of https://pre-commit.com git hooks with Nix.",
-        "homepage": "",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "2849da033884f54822af194400f8dff435ada242",
-        "sha256": "0ag90l0hrkhm02mkmm8yf3fnjjawv99czc7bp0szzgknps0xrzxb",
-        "type": "tarball",
-        "url": "https://github.com/cachix/git-hooks.nix/archive/2849da033884f54822af194400f8dff435ada242.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "gomod2nix": {
-        "branch": "master",
-        "description": "Convert applications using Go modules to Nix expressions [maintainer=@adisbladis]",
-        "homepage": "",
-        "owner": "nix-community",
-        "repo": "gomod2nix",
-        "rev": "872b63ddd28f318489c929d25f1f0a3c6039c971",
-        "sha256": "1wh9rlhg2w42fsavh7wxvmw42l7m5wg290gnp571dq0qcr1z7kg1",
-        "type": "tarball",
-        "url": "https://github.com/nix-community/gomod2nix/archive/872b63ddd28f318489c929d25f1f0a3c6039c971.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs": {
-        "branch": "nixos-unstable",
-        "description": "Nix Packages collection",
-        "homepage": null,
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
-        "sha256": "05rpyikxpjf15nrzggrx4m0kjkjcmpyhm714nfrbhsp5cp1x1m4r",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/58a1abdbae3217ca6b702f03d3b35125d88a2994.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "simple-css": {
-        "branch": "main",
-        "description": "Mostly-reasonable HTML Styles.",
-        "homepage": "",
-        "owner": "kevquirk",
-        "repo": "simple.css",
-        "rev": "89787585fc44e6023f2b5e6f78a3e3ca8c60b10a",
-        "sha256": "1q35vvq932x3r02zycr2plfkzd8x5plzlwk71cl6gxpwvq26jhbx",
-        "type": "file",
-        "url": "https://raw.githubusercontent.com/kevquirk/simple.css/v2.3.0/simple.css",
-        "url_template": "https://raw.githubusercontent.com/<owner>/<repo>/v<version>/simple.css",
-        "version": "2.3.0"
-    }
-}
diff --git a/nix/sources.nix b/nix/sources.nix
deleted file mode 100644
index fe3dadf..0000000
--- a/nix/sources.nix
+++ /dev/null
@@ -1,198 +0,0 @@
-# This file has been generated by Niv.
-
-let
-
-  #
-  # The fetchers. fetch_<type> fetches specs of type <type>.
-  #
-
-  fetch_file = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-    if spec.builtin or true then
-      builtins_fetchurl { inherit (spec) url sha256; name = name'; }
-    else
-      pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
-
-  fetch_tarball = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-    if spec.builtin or true then
-      builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
-    else
-      pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
-
-  fetch_git = name: spec:
-    let
-      ref =
-        spec.ref or (
-          if spec ? branch then "refs/heads/${spec.branch}" else
-          if spec ? tag then "refs/tags/${spec.tag}" else
-          abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"
-        );
-      submodules = spec.submodules or false;
-      submoduleArg =
-        let
-          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
-          emptyArgWithWarning =
-            if submodules
-            then
-              builtins.trace
-                (
-                  "The niv input \"${name}\" uses submodules "
-                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
-                  + "does not support them"
-                )
-                { }
-            else { };
-        in
-        if nixSupportsSubmodules
-        then { inherit submodules; }
-        else emptyArgWithWarning;
-    in
-    builtins.fetchGit
-      ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
-
-  fetch_local = spec: spec.path;
-
-  fetch_builtin-tarball = name: throw
-    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=tarball -a builtin=true'';
-
-  fetch_builtin-url = name: throw
-    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=file -a builtin=true'';
-
-  #
-  # Various helpers
-  #
-
-  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
-  sanitizeName = name:
-    (
-      concatMapStrings (s: if builtins.isList s then "-" else s)
-        (
-          builtins.split "[^[:alnum:]+._?=-]+"
-            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
-        )
-    );
-
-  # The set of packages used when specs are fetched using non-builtins.
-  mkPkgs = sources: system:
-    let
-      sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
-      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
-      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in
-    if builtins.hasAttr "nixpkgs" sources
-    then sourcesNixpkgs
-    else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-      import <nixpkgs> { }
-    else
-      abort
-        ''
-          Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-          add a package called "nixpkgs" to your sources.json.
-        '';
-
-  # The actual fetching function.
-  fetch = pkgs: name: spec:
-
-    if ! builtins.hasAttr "type" spec then
-      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs name spec
-    else if spec.type == "tarball" then fetch_tarball pkgs name spec
-    else if spec.type == "git" then fetch_git name spec
-    else if spec.type == "local" then fetch_local spec
-    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
-    else if spec.type == "builtin-url" then fetch_builtin-url name
-    else
-      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
-
-  # If the environment variable NIV_OVERRIDE_${name} is set, then use
-  # the path directly as opposed to the fetched source.
-  replace = name: drv:
-    let
-      saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
-      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
-    in
-    if ersatz == "" then drv else
-      # this turns the string into an actual Nix path (for both absolute and
-      # relative paths)
-    if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
-
-  # Ports of functions for older nix versions
-
-  # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (
-    f: set: with builtins;
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
-  );
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
-  range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
-  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
-  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
-  concatMapStrings = f: list: concatStrings (map f list);
-  concatStrings = builtins.concatStringsSep "";
-
-  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
-  optionalAttrs = cond: as: if cond then as else { };
-
-  # fetchTarball version that is compatible between all the versions of Nix
-  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchTarball;
-    in
-    if lessThan nixVersion "1.12" then
-      fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
-    else
-      fetchTarball attrs;
-
-  # fetchurl version that is compatible between all the versions of Nix
-  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchurl;
-    in
-    if lessThan nixVersion "1.12" then
-      fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
-    else
-      fetchurl attrs;
-
-  # Create the final "sources" from the config
-  mkSources = config:
-    mapAttrs
-      (
-        name: spec:
-          if builtins.hasAttr "outPath" spec
-          then
-            abort
-              "The values in sources.json should not have an 'outPath' attribute"
-          else
-            spec // { outPath = replace name (fetch config.pkgs name spec); }
-      )
-      config.sources;
-
-  # The "config" used by the fetchers
-  mkConfig =
-    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
-    , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile)
-    , system ? builtins.currentSystem
-    , pkgs ? mkPkgs sources system
-    }: rec {
-      # The sources, i.e. the attribute set of spec name to spec
-      inherit sources;
-
-      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
-      inherit pkgs;
-    };
-
-in
-mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }