diff options
| -rw-r--r-- | .envrc.sample | 2 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | default.nix | 107 | ||||
| -rw-r--r-- | flake.lock | 192 | ||||
| -rw-r--r-- | flake.nix | 62 | ||||
| -rw-r--r-- | nix/dev-shell.nix | 21 | ||||
| -rw-r--r-- | nix/package.nix | 37 | ||||
| -rw-r--r-- | nix/pre-commit-checks.nix | 95 | ||||
| -rw-r--r-- | nix/sources.json | 51 | ||||
| -rw-r--r-- | nix/sources.nix | 198 | ||||
| -rw-r--r-- | shell.nix | 38 |
11 files changed, 416 insertions, 395 deletions
diff --git a/.envrc.sample b/.envrc.sample index dc0051f..b1fc9e5 100644 --- a/.envrc.sample +++ b/.envrc.sample @@ -7,5 +7,5 @@ if type -P lorri &>/dev/null; then eval "$(lorri direnv)" else echo 'while direnv evaluated .envrc, could not find the command "lorri" [https://github.com/nix-community/lorri]' - use nix + use flake fi diff --git a/README.md b/README.md index e6cf90d..f5965e5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ - [cachix](https://docs.cachix.org/installation#installation) - [lorri](https://github.com/nix-community/lorri) - [direnv](https://direnv.net/) - + ### Setup 1. Optional: use cachix to avoid building some tools @@ -21,10 +21,10 @@ 2. Start a nix shell (this will take some time) ```shell-session - nix-shell + nix develop ``` -3. Optional: install and set up lorri and use `lorri shell` instead of `nix-shell` +3. Optional: install and set up lorri and use `lorri shell` instead of `nix develop` 4. Optional: install direnv, integrate it with your shell and then run @@ -32,4 +32,4 @@ ln -s .envrc.sample .envrc ``` - Now `nix-shell` or `lorri shell` will be run for you automatically when you `cd` into this directory. + Now `nix develop` or `lorri shell` will be run for you automatically when you `cd` into this directory. diff --git a/default.nix b/default.nix index 506be0e..f25ce84 100644 --- a/default.nix +++ b/default.nix @@ -1,106 +1,3 @@ -let - sources = import ./nix/sources.nix; -in -{ pkgs ? ( - import sources.nixpkgs { - overlays = [ - (import "${sources.gomod2nix}/overlay.nix") - (import ./nix/overlays/default.nix) - ]; - } - ) -}: -rec { - css = pkgs.fetchurl { - inherit (sources.simple-css) url sha256; - }; +{ system ? builtins.currentSystem }: - searchix = pkgs.buildGoApplication { - pname = "searchix"; - version = "0.1"; - src = with pkgs.lib.fileset; toSource { - root = ./.; - fileset = intersection - (unions [ - ./go.mod - ./go.sum - ./serve - ./import - ./internal - ./frontend - ]) - (gitTracked ./.); - }; - - patchPhase = '' - cp ${css} frontend/static/base.css - ''; - tags = [ "embed" ]; - modules = ./gomod2nix.toml; - }; - - pre-commit-check = (import sources.git-hooks).run { - src = ./.; - hooks = { - gotest.enable = true; - golangci-lint.enable = true; - staticcheck.enable = true; - - 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; - }; - }; - }; -} +(builtins.getFlake (toString ./.)).packages.${system}.default diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..28bc503 --- /dev/null +++ b/flake.lock @@ -0,0 +1,192 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710154385, + "narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "872b63ddd28f318489c929d25f1f0a3c6039c971", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "gomod2nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1715447595, + "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1710765496, + "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1714478972, + "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "2849da033884f54822af194400f8dff435ada242", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "gomod2nix": "gomod2nix", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks", + "simple-css": "simple-css" + } + }, + "simple-css": { + "flake": false, + "locked": { + "narHash": "sha256-AAA6fucfxB8R7z66UjOps79XMxbK/gZAB+JDEpZeXGo=", + "type": "file", + "url": "https://raw.githubusercontent.com/kevquirk/simple.css/v2.3.0/simple.css" + }, + "original": { + "type": "file", + "url": "https://raw.githubusercontent.com/kevquirk/simple.css/v2.3.0/simple.css" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..389c646 --- /dev/null +++ b/flake.nix @@ -0,0 +1,62 @@ +{ + description = "A basic gomod2nix flake"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + pre-commit-hooks = { + url = "github:cachix/pre-commit-hooks.nix"; + inputs.flake-utils.follows = "flake-utils"; + }; + gomod2nix = { + url = "github:nix-community/gomod2nix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + simple-css = { + url = "https://raw.githubusercontent.com/kevquirk/simple.css/v2.3.0/simple.css"; + flake = false; + }; + }; + + outputs = { self, nixpkgs, flake-utils, gomod2nix, pre-commit-hooks, simple-css }: + (flake-utils.lib.eachDefaultSystem + (system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ + (import ./nix/overlays) + gomod2nix.overlays.default + ]; + }; + + # The current default sdk for macOS fails to compile go projects, so we use a newer one for now. + # This has no effect on other platforms. + callPackage = pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage; + in + { + packages.default = callPackage ./nix/package.nix { + inherit (gomod2nix.legacyPackages.${system}) buildGoApplication; + css = simple-css; + }; + devShells.default = callPackage ./nix/dev-shell.nix { + pre-commit-check = { + inherit (self.checks.${system}.pre-commit-check) + shellHook + enabledPackages; + }; + inherit (gomod2nix.legacyPackages.${system}) mkGoEnv gomod2nix; + }; + checks = { + pre-commit-check = pre-commit-hooks.lib.${system}.run ( + import ./nix/pre-commit-checks.nix { + inherit pkgs; + } + ); + }; + }) + ); +} 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); } diff --git a/shell.nix b/shell.nix index 2e85e8c..d2c4c45 100644 --- a/shell.nix +++ b/shell.nix @@ -1,37 +1,3 @@ -{ pkgs ? ( - let - sources = import ./nix/sources.nix; - in - import sources.nixpkgs { - overlays = [ - (import "${sources.gomod2nix}/overlay.nix") - (import ./nix/overlays/default.nix) - ]; - } - ) -}: +{ system ? builtins.currentSystem }: -let - goEnv = pkgs.mkGoEnv { pwd = ./.; }; - searchix = import ./default.nix { - inherit pkgs; - }; -in -pkgs.mkShell { - packages = with pkgs; [ - goEnv - - brotli - bleve - wgo - gomod2nix - niv - nixpkgs-lint - - bun - ]; - shellHook = '' - ${searchix.pre-commit-check.shellHook} - ''; - buildInputs = searchix.pre-commit-check.enabledPackages; -} +(builtins.getFlake (toString ./.)).devShells.${system}.default |