summary refs log tree commit diff
path: root/lib/systems/doubles.nix
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-07-28 20:05:35 -0400
committerGraham Christensen <graham@grahamc.com>2017-09-16 21:36:43 -0400
commit152c63c9ff82276e225ac4a4fa71c791d33e443d (patch)
tree0755fd329430e64c6eacfdf4d45e75693ea824ae /lib/systems/doubles.nix
parent4d205eb0444996b1939ab9e495201912a3316b36 (diff)
downloadnixpkgs-152c63c9ff82276e225ac4a4fa71c791d33e443d.tar
nixpkgs-152c63c9ff82276e225ac4a4fa71c791d33e443d.tar.gz
nixpkgs-152c63c9ff82276e225ac4a4fa71c791d33e443d.tar.bz2
nixpkgs-152c63c9ff82276e225ac4a4fa71c791d33e443d.tar.lz
nixpkgs-152c63c9ff82276e225ac4a4fa71c791d33e443d.tar.xz
nixpkgs-152c63c9ff82276e225ac4a4fa71c791d33e443d.tar.zst
nixpkgs-152c63c9ff82276e225ac4a4fa71c791d33e443d.zip
Convert libs to a fixed-point
This does break the API of being able to import any lib file and get
its libs, however I'm not sure people did this.

I made this while exploring being able to swap out docFn with a stub
in #2305, to avoid functor performance problems. I don't know if that
is going to move forward (or if it is a problem or not,) but after
doing all this work figured I'd put it up anyway :)

Two notable advantages to this approach:

1. when a lib inherits another lib's functions, it doesn't
   automatically get put in to the scope of lib
2. when a lib implements a new obscure functions, it doesn't
   automatically get put in to the scope of lib

Using the test script (later in this commit) I got the following diff
on the API:

  + diff master fixed-lib
  11764a11765,11766
  > .types.defaultFunctor
  > .types.defaultTypeMerge
  11774a11777,11778
  > .types.isOptionType
  > .types.isType
  11781a11786
  > .types.mkOptionType
  11788a11794
  > .types.setType
  11795a11802
  > .types.types

This means that this commit _adds_ to the API, however I can't find a
way to fix these last remaining discrepancies. At least none are
_removed_.

Test script (run with nix-repl in the PATH):

  #!/bin/sh

  set -eux

  repl() {
      suff=${1:-}
      echo "(import ./lib)$suff" \
          | nix-repl 2>&1
  }

  attrs_to_check() {
      repl "${1:-}" \
          | tr ';'  $'\n' \
          | grep "\.\.\." \
          | cut -d' ' -f2 \
          | sed -e "s/^/${1:-}./" \
          | sort
  }

  summ() {
      repl "${1:-}" \
          | tr ' ' $'\n' \
          | sort \
          | uniq
  }

  deep_summ() {
      suff="${1:-}"
      depth="${2:-4}"
      depth=$((depth - 1))
      summ "$suff"

      for attr in $(attrs_to_check "$suff" | grep -v "types.types"); do
          if [ $depth -eq 0 ]; then
              summ "$attr" | sed -e "s/^/$attr./"
          else
              deep_summ "$attr" "$depth" | sed -e "s/^/$attr./"
          fi
      done
  }

  (
      cd nixpkgs

      #git add .
      #git commit -m "Auto-commit, sorry" || true
      git checkout fixed-lib
      deep_summ > ../fixed-lib
      git checkout master
      deep_summ > ../master
  )

  if diff master fixed-lib; then
      echo "SHALLOW MATCH!"
  fi

  (
      cd nixpkgs
      git checkout fixed-lib
      repl .types
  )
Diffstat (limited to 'lib/systems/doubles.nix')
-rw-r--r--lib/systems/doubles.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index ac1a199d80c..0cae8ec56fd 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -1,8 +1,9 @@
+{ lib }:
 let
-  lists = import ../lists.nix;
-  parse = import ./parse.nix;
-  inherit (import ./inspect.nix) predicates;
-  inherit (import ../attrsets.nix) matchAttrs;
+  inherit (lib) lists;
+  parse = import ./parse.nix { inherit lib; };
+  inherit (import ./inspect.nix { inherit lib; }) predicates;
+  inherit (lib.attrsets) matchAttrs;
 
   all = [
     "aarch64-linux"