From e69da9aeb7c5caa6b0b49de853876e8bcf71b15d Mon Sep 17 00:00:00 2001 From: Las Safin Date: Wed, 6 Oct 2021 16:07:46 +0000 Subject: [PATCH] Fix licenses --- nix/anabatic.nix | 1 + nix/bootstrap.nix | 4 +++- nix/bora.nix | 1 + nix/coloquinte.nix | 4 +++- nix/documentation.nix | 2 +- nix/equinox.nix | 6 ++++-- nix/etesian.nix | 4 +++- nix/flute.nix | 1 + nix/ispd.nix | 2 +- nix/katabatic.nix | 1 + nix/katana.nix | 1 + nix/kite.nix | 1 + nix/knik.nix | 4 +++- nix/mauka.nix | 2 +- nix/metis.nix | 2 +- nix/nimbus.nix | 2 +- nix/solstice.nix | 4 +++- nix/tutorial.nix | 1 + nix/unicorn.nix | 2 ++ nix/vlsisapd.nix | 2 ++ 20 files changed, 35 insertions(+), 12 deletions(-) diff --git a/nix/anabatic.nix b/nix/anabatic.nix index 02764024..c7479e5c 100644 --- a/nix/anabatic.nix +++ b/nix/anabatic.nix @@ -13,5 +13,6 @@ let pkg = ]; nativeBuildInputs = [ doxygen ]; pythonImportsCheck = [ "Anabatic" ]; + meta.license = lib.licenses.gpl2Plus; }; in generic pkg diff --git a/nix/bootstrap.nix b/nix/bootstrap.nix index 3b475d3b..dd4ee3b2 100644 --- a/nix/bootstrap.nix +++ b/nix/bootstrap.nix @@ -10,5 +10,7 @@ stdenv.mkDerivation { buildInputs = [ python2 ]; nativeBuildInputs = [ cmake ninja ]; - inherit version meta; + inherit version; + + meta = meta // { license = lib.licenses.gpl2Plus; }; } diff --git a/nix/bora.nix b/nix/bora.nix index dc2be996..be2cd540 100644 --- a/nix/bora.nix +++ b/nix/bora.nix @@ -15,5 +15,6 @@ let pkg = ]; nativeBuildInputs = [ doxygen ]; pythonImportsCheck = "Bora"; + meta.license = lib.licenses.gpl2Plus; }; in generic pkg diff --git a/nix/coloquinte.nix b/nix/coloquinte.nix index 6ef37f7b..b1dc12e1 100644 --- a/nix/coloquinte.nix +++ b/nix/coloquinte.nix @@ -14,5 +14,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DWITH_OPENMP:STRING=TRUE" ]; - inherit version meta; + inherit version; + + meta = meta // { license = lib.licenses.gpl2Plus; }; } diff --git a/nix/documentation.nix b/nix/documentation.nix index 83bf172c..0fef307e 100644 --- a/nix/documentation.nix +++ b/nix/documentation.nix @@ -14,5 +14,5 @@ stdenv.mkDerivation { inherit version; - meta = meta // { broken = true; }; + meta = meta // { broken = true; license = lib.licenses.cc-by-nc-sa-40; }; } diff --git a/nix/equinox.nix b/nix/equinox.nix index 79dff9b3..7a5af02c 100644 --- a/nix/equinox.nix +++ b/nix/equinox.nix @@ -1,4 +1,4 @@ -{ version, meta }: +{ version, meta, ... }: { lib, stdenv, cmake, ninja, python2, boost , coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane @@ -18,5 +18,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ninja ]; - inherit version meta; + inherit version; + + meta = meta // { license = lib.licenses.gpl2Plus; } } diff --git a/nix/etesian.nix b/nix/etesian.nix index e0b15b8e..b8c2df61 100644 --- a/nix/etesian.nix +++ b/nix/etesian.nix @@ -1,6 +1,7 @@ { generic, ... }: let pkg = - { doxygen, qt4, coriolis-coloquinte, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore }: + { doxygen, qt4, coriolis-coloquinte, coriolis-vlsisapd, coriolis-hurricane, + , lib, coriolis-crlcore }: { name = "etesian"; src = ../etesian; @@ -13,5 +14,6 @@ let pkg = ]; nativeBuildInputs = [ doxygen ]; pythonImportsCheck = [ "Etesian" ]; + meta.license = lib.licenses.gpl2Plus; }; in generic pkg diff --git a/nix/flute.nix b/nix/flute.nix index 1cace7f4..c98d1636 100644 --- a/nix/flute.nix +++ b/nix/flute.nix @@ -7,5 +7,6 @@ let pkg = buildInputs = [ coriolis-vlsisapd coriolis-hurricane coriolis-crlcore ]; nativeBuildInputs = [ ]; pythonImportsCheck = [ "Flute" ]; + meta.license = lib.licenses.gpl2Plus; }; in generic pkg diff --git a/nix/ispd.nix b/nix/ispd.nix index 3aae59b0..7abe8031 100644 --- a/nix/ispd.nix +++ b/nix/ispd.nix @@ -22,5 +22,5 @@ stdenv.mkDerivation { inherit version; - meta = meta // { broken = true; }; + meta = meta // { broken = true; license = lib.licenses.gpl2Plus; }; } diff --git a/nix/katabatic.nix b/nix/katabatic.nix index 4a1d4e4f..88901d5e 100644 --- a/nix/katabatic.nix +++ b/nix/katabatic.nix @@ -14,5 +14,6 @@ let pkg = ]; nativeBuildInputs = [ doxygen ]; pythonImportsCheck = [ "Katabatic" ]; + meta.license = lib.licenses.gpl2Plus; }; in generic pkg diff --git a/nix/katana.nix b/nix/katana.nix index 1a4f2932..aec2e4e4 100644 --- a/nix/katana.nix +++ b/nix/katana.nix @@ -15,5 +15,6 @@ let pkg = ]; nativeBuildInputs = [ doxygen ]; pythonImportsCheck = [ "Katana" ]; + meta.license = lib.licenses.gpl2Plus; }; in generic pkg diff --git a/nix/kite.nix b/nix/kite.nix index 62b0a141..54c4a87a 100644 --- a/nix/kite.nix +++ b/nix/kite.nix @@ -14,5 +14,6 @@ let pkg = ]; nativeBuildInputs = [ doxygen ]; pythonImportsCheck = [ "Kite" ]; + meta.license = lib.licenses.gpl2Plus; }; in generic pkg diff --git a/nix/knik.nix b/nix/knik.nix index 73aee664..5a0ca26f 100644 --- a/nix/knik.nix +++ b/nix/knik.nix @@ -18,5 +18,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ninja ]; - inherit version meta; + inherit version; + + meta = meta // { license = lib.licenses.gpl2Plus; }; } diff --git a/nix/mauka.nix b/nix/mauka.nix index 3663c3be..d2b16f3e 100644 --- a/nix/mauka.nix +++ b/nix/mauka.nix @@ -20,5 +20,5 @@ stdenv.mkDerivation { inherit version; - meta = meta // { broken = true; }; + meta = meta // { broken = true; license = lib.licenses.gpl2Plus; }; } diff --git a/nix/metis.nix b/nix/metis.nix index 1871dc00..45cdc558 100644 --- a/nix/metis.nix +++ b/nix/metis.nix @@ -19,5 +19,5 @@ stdenv.mkDerivation { inherit version; - meta = meta // { broken = true; }; + meta = meta // { broken = true; license = lib.licenses.gpl2Plus; }; } diff --git a/nix/nimbus.nix b/nix/nimbus.nix index a05e6ed5..bc2b4c74 100644 --- a/nix/nimbus.nix +++ b/nix/nimbus.nix @@ -19,5 +19,5 @@ stdenv.mkDerivation { inherit version; - meta = meta // { broken = true; }; + meta = meta // { broken = true; license = lib.licenses.gpl2Plus; }; } diff --git a/nix/solstice.nix b/nix/solstice.nix index 0fe42350..f33433b0 100644 --- a/nix/solstice.nix +++ b/nix/solstice.nix @@ -18,5 +18,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ninja ]; - inherit version meta; + inherit version; + + meta = meta // { license = lib.licenses.gpl2Plus; }; } diff --git a/nix/tutorial.nix b/nix/tutorial.nix index 416e3839..199e875f 100644 --- a/nix/tutorial.nix +++ b/nix/tutorial.nix @@ -14,5 +14,6 @@ let pkg = ]; nativeBuildInputs = [ doxygen ]; pythonImportsCheck = [ "Tutorial" ]; + meta.license = lib.licenses.gpl2Plus; }; in generic pkg diff --git a/nix/unicorn.nix b/nix/unicorn.nix index 9bec4808..422db62a 100644 --- a/nix/unicorn.nix +++ b/nix/unicorn.nix @@ -24,5 +24,7 @@ let pkg = postFixup = '' wrapPythonPrograms ''; + + meta.license = lib.licenses.gpl2Plus; }; in generic pkg diff --git a/nix/vlsisapd.nix b/nix/vlsisapd.nix index 78ec412e..f5e940e5 100644 --- a/nix/vlsisapd.nix +++ b/nix/vlsisapd.nix @@ -7,5 +7,7 @@ let pkg = buildInputs = [ libxml2 qt4 ]; nativeBuildInputs = [ bison flex doxygen ]; pythonImportsCheck = [ "SPICE" "LIBERTY" "DTR" "Cfg" "CIF" "AGDS" ]; + + meta.license = lib.licenses.gpl2Plus; }; in generic pkg