diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-02-25 23:01:09 +0100 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-02-25 23:01:09 +0100 |
commit | 7f7d5bcd902f88fdb6959a33e3e4ae15fcde95c4 (patch) | |
tree | 0dae16742778d9df8cc81407429c144ea92f31b8 /lib | |
parent | 33fe54081404571adf5688e2c405f5a1f1b22ee5 (diff) | |
download | nixpkgs-7f7d5bcd902f88fdb6959a33e3e4ae15fcde95c4.tar nixpkgs-7f7d5bcd902f88fdb6959a33e3e4ae15fcde95c4.tar.gz nixpkgs-7f7d5bcd902f88fdb6959a33e3e4ae15fcde95c4.tar.bz2 nixpkgs-7f7d5bcd902f88fdb6959a33e3e4ae15fcde95c4.tar.lz nixpkgs-7f7d5bcd902f88fdb6959a33e3e4ae15fcde95c4.tar.xz nixpkgs-7f7d5bcd902f88fdb6959a33e3e4ae15fcde95c4.tar.zst nixpkgs-7f7d5bcd902f88fdb6959a33e3e4ae15fcde95c4.zip |
lib/licenses: fix regression removing shortName for some licenses
Usually we ensure using the mapAttrs call wrapping the license set that every license has an associated shortName. A change related to legacy aliases most likely introduced the removal of the shortName attribute for all the legacy license names by splitting the set into two sets connected by a record update operator -- leading to mapAttrs only affecting the first set. Since it used to be a valid assumption to have that every license had a shortName attribute, we reintroduce this attribute for the legacy aliases as well.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/licenses.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index ee136c7337c..993783db3ed 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -7,7 +7,7 @@ let in -lib.mapAttrs (n: v: v // { shortName = n; }) { +lib.mapAttrs (n: v: v // { shortName = n; }) ({ /* License identifiers from spdx.org where possible. * If you cannot find your license here, then look for a similar license or * add it to this list. The URL mentioned above is a good source for inspiration. @@ -877,4 +877,4 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Lesser General Public License v3.0"; deprecated = true; }; -} +}) |