Commit e47455f5 authored by d068328's avatar d068328
Browse files

Revert "stdenv: pURL implementation (#421125)"

This reverts commit 54271156, reversing
changes made to 88ee2ac3.
parent e1920deb
Loading
Loading
Loading
Loading
+0 −12
Original line number Diff line number Diff line
@@ -237,9 +237,6 @@
  "sec-meta-identifiers-cpe": [
    "index.html#sec-meta-identifiers-cpe"
  ],
  "sec-meta-identifiers-purl": [
    "index.html#sec-meta-identifiers-purl"
  ],
  "sec-modify-via-packageOverrides": [
    "index.html#sec-modify-via-packageOverrides"
  ],
@@ -664,15 +661,6 @@
  "var-meta-identifiers-possibleCPEs": [
    "index.html#var-meta-identifiers-possibleCPEs"
  ],
  "var-meta-identifiers-purl": [
    "index.html#var-meta-identifiers-purl"
  ],
  "var-meta-identifiers-purlParts": [
    "index.html#var-meta-identifiers-purlParts"
  ],
  "var-meta-identifiers-purls": [
    "index.html#var-meta-identifiers-purls"
  ],
  "var-meta-teams": [
    "index.html#var-meta-teams"
  ],
+0 −2
Original line number Diff line number Diff line
@@ -238,8 +238,6 @@

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

- Metadata identifier purl (Package URL, https://github.com/package-url/purl-spec) has been added for fetchgit, fetchpypi and fetchFromGithub fetchers and mkDerivation has been adjusted to reuse these informations. Package URL's enables a reliable identification and locatization of software packages. Maintainers of derivations using the adopted fetchers should rely on the `drv.src.meta.identifiers.v1.purl` default identifier and can enhance their `drv.meta.identifiers.v1.purls` list once they would like to have additional identifiers. Maintainers using fetchurl for `drv.src` are urged to adopt their `drv.meta.identifiers.purlParts` for proper identification.

- Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`.
- Added `hashedMirrors` attribute to the nixpkgs `config`, to allow for customization of the hashed mirrors used by `fetchurl`.

+0 −19
Original line number Diff line number Diff line
@@ -319,22 +319,3 @@ A readonly attribute that concatenates all CPE parts in one string.
#### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs}

A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess.

### Package URL {#sec-meta-identifiers-purl}

[Package-URL](https://github.com/package-url/purl-spec) (PURL) is a specification to reliably identify and locate software packages. Through identification of software packages, additional (non-major) use cases are e.g. software license cross-verification via third party databases or initial vulnerability response management. Package URL's default to the mkDerivation.src, as the original consumed software package is the single point of truth.

#### `meta.identifiers.purlParts` {#var-meta-identifiers-purlParts}

This attribute contains an attribute set of all parts of the PURL for this package.

* `type` mandatory [type](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/docs/standard/summary.md) which needs to be provided
* `spec` specify the PURL in accordance with the [purl-spec](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/purl-specification.md)

#### `meta.identifiers.purl` {#var-meta-identifiers-purl}

An extendable attribute which is built based on purlParts. It is the main identifier, consumers should consider using the PURL's list interface to be prepared for edge cases.

#### `meta.identifiers.purls` {#var-meta-identifiers-purls}

An extendable attribute list which defaults to a single element equal to the main PURL. It provides an interface for additional identifiers of mkDerivation.src and / or vendored dependencies inside mkDerivation.src, which maintainers can conciously decide to use on top. Identifiers different to the default src identifier are not recommended by default as they might cause maintenance overhead or may diverge (e.g. differences between source distribution pkg:github and binary distribution like pkg:pypi).
+1 −12
Original line number Diff line number Diff line
@@ -190,18 +190,7 @@ lib.makeOverridable (
            "FETCHGIT_HTTP_PROXIES"
          ];

        inherit preferLocalBuild allowedRequisites;

        meta = meta // {
          identifiers = {
            purlParts = {
              type = "generic";
              # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
              spec = "${name}?vcs_url=${url}@${(lib.revOrTag rev tag)}";
            };
          }
          // meta.identifiers or { };
        };
        inherit preferLocalBuild meta allowedRequisites;

        passthru = {
          gitRepoUrl = url;
+1 −18
Original line number Diff line number Diff line
@@ -47,28 +47,11 @@ lib.makeOverridable (
      meta
      // {
        homepage = meta.homepage or baseUrl;
        identifiers = {
          purlParts =
            if githubBase == "github.com" then
              {
                type = "github";
                # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/github-definition.md
                spec = "${owner}/${repo}@${(lib.revOrTag rev tag)}";
              }
            else
              {
                type = "generic";
                # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
                spec = "${repo}?vcs_url=https://${githubBase}/${owner}/${repo}@${(lib.revOrTag rev tag)}";
              };
        }
        // meta.identifiers or { };
      }
      // lib.optionalAttrs (position != null) {
        # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
        position = "${position.file}:${toString position.line}";
      };

    passthruAttrs = removeAttrs args [
      "owner"
      "repo"
@@ -172,12 +155,12 @@ lib.makeOverridable (
      // passthruAttrs
      // {
        inherit name;
        meta = newMeta;
      };
  in

  fetcher fetcherArgs
  // {
    meta = newMeta;
    inherit owner repo tag;
    rev = revWithTag;
  }
Loading