Unverified Commit 3ef988ce authored by Naïm Favier's avatar Naïm Favier Committed by GitHub
Browse files

Merge pull request #237259 from ncfavier/extraDependencies-path 

nixos/top-level: change extraDependencies from packages to paths
parents b5fcbad5 4bdff8cb

lib/tests/modules.sh

+10 −0
Original line number Diff line number Diff line
@@ -63,6 +63,16 @@ checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix 


checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix



# types.pathInStore

checkConfigOutput '".*/store/5lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix

checkConfigOutput '".*/store/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix

checkConfigOutput '".*/store/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash"' config.pathInStore.ok3 ./types.nix

checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ""' config.pathInStore.bad1 ./types.nix

checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store"' config.pathInStore.bad2 ./types.nix

checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/"' config.pathInStore.bad3 ./types.nix

checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/.links"' config.pathInStore.bad4 ./types.nix

checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: "/foo/bar"' config.pathInStore.bad5 ./types.nix



# Check boolean option.

checkConfigOutput '^false$' config.enable ./declare-enable.nix

checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix

lib/tests/modules/types.nix

0 → 100644
+24 −0
Original line number Diff line number Diff line 
{ lib, ... }:

let

  inherit (builtins)

    storeDir;

  inherit (lib)

    types

    mkOption

    ;

in

{

  options = {

    pathInStore = mkOption { type = types.lazyAttrsOf types.pathInStore; };

  };

  config = {

    pathInStore.ok1 = "${storeDir}/5lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv";

    pathInStore.ok2 = "${storeDir}/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15";

    pathInStore.ok3 = "${storeDir}/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash";

    pathInStore.bad1 = "";

    pathInStore.bad2 = "${storeDir}";

    pathInStore.bad3 = "${storeDir}/";

    pathInStore.bad4 = "${storeDir}/.links"; # technically true, but not reasonable

    pathInStore.bad5 = "/foo/bar";

  };

}

lib/tests/release.nix

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ let 
      export PAGER=cat

      cacheDir=$TEST_ROOT/binary-cache



      mkdir -p $NIX_CONF_DIR

      echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf



      nix-store --init



      cp -r ${../.} lib

lib/types.nix

+9 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ rec { 
    # - strings with context, e.g. "${pkgs.foo}" or (toString pkgs.foo)

    # - hardcoded store path literals (/nix/store/hash-foo) or strings without context

    #   ("/nix/store/hash-foo"). These get a context added to them using builtins.storePath.

    # If you don't need a *top-level* store path, consider using pathInStore instead.

    package = mkOptionType {

      name = "package";

      descriptionClass = "noun";
@@ -491,6 +492,14 @@ rec { 
      merge = mergeEqualOption;

    };



    pathInStore = mkOptionType {

      name = "pathInStore";

      description = "path in the Nix store";

      descriptionClass = "noun";

      check = x: isStringLike x && builtins.match "${builtins.storeDir}/[^.].*" (toString x) != null;

      merge = mergeEqualOption;

    };



    listOf = elemType: mkOptionType rec {

      name = "listOf";

      description = "list of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";

nixos/doc/manual/development/option-types.section.md

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ merging is handled. 
    coerced to a string. Even if derivations can be considered as

    paths, the more specific `types.package` should be preferred.



`types.pathInStore`



:   A path that is contained in the Nix store. This can be a top-level store

    path like `pkgs.hello` or a descendant like `"${pkgs.hello}/bin/hello"`.



`types.package`



:   A top-level store path. This can be an attribute set pointing