From 1f53f25419144e941ca58a5af4ea7682bf4614a7 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 26 Aug 2020 12:59:48 +0200 Subject: [PATCH] Relicense as MIT --- .CC0-1.0.png | Bin 281 -> 0 bytes .reuse/dep5 | 8 ++ LICENSES/CC0-1.0.txt | 119 ------------------------ README.md | 27 +++--- apps/default.nix | 2 - apps/generate-manifest/default.nix | 2 - apps/hw-image/default.nix | 2 - apps/hw-iso/default.nix | 2 - apps/insert-config-rom.dhall | 1 - apps/linux-image/default.nix | 2 - apps/linux-image/script.dhall | 1 - apps/modules.as.dhall | 1 - apps/nova-image/default.nix | 2 - apps/nova-iso/default.nix | 2 - apps/render-init/default.nix | 2 - apps/render-rom.dhall | 1 - apps/to-rom.dhall | 1 - compositions/pc-drivers.dhall | 1 - flake.nix | 2 - lib/compile-boot.dhall | 1 - lib/default.nix | 5 +- lib/linux-script.dhall | 1 - nixos-modules/buildBootDescription.nix | 2 - nixos-modules/dhall/console.dhall | 2 - nixos-modules/dhall/fs-log.dhall | 1 - nixos-modules/dhall/graphical-log.dhall | 1 - nixos-modules/dhall/root.dhall | 1 - nixos-modules/dhall/show_input.dhall | 1 - nixos-modules/dhall/vbox-guest.dhall | 1 - nixos-modules/dhall/wm.dhall | 1 - overlay/default.nix | 2 - overlay/libc/default.nix | 2 - overlay/solo5-tools/default.nix | 2 - packages/NOVA/default.nix | 4 +- packages/bender/default.nix | 2 - packages/block_router/default.nix | 2 - packages/default.nix | 2 - packages/dhall/default.nix | 2 - packages/dhall/genode.nix | 2 - packages/genodelabs/default.nix | 2 - packages/nic_bus/default.nix | 2 - packages/rtc-dummy/default.nix | 2 - packages/show_input/default.nix | 2 - packages/solo5/default.nix | 2 - packages/sotest-producer/default.nix | 2 - packages/stdcxx/default.nix | 2 - tests/default.nix | 2 - tests/driver_manager.dhall | 1 - tests/log.dhall | 1 - tests/log.nix | 2 - tests/posix.dhall | 1 - tests/posix.nix | 2 - tests/solo5/blk.dhall | 1 - tests/solo5/default.nix | 2 - tests/solo5/net.dhall | 1 - tests/solo5/net_2if.dhall | 1 - tests/solo5/solo5.dhall | 1 - tests/solo5/ssp.dhall | 1 - tests/solo5/time.dhall | 1 - tests/test-wrapper.dhall | 2 +- tests/test.dhall | 1 + tests/vmm_arm.dhall | 1 - tests/vmm_arm.nix | 2 - tests/vmm_x86.dhall | 1 - tests/vmm_x86.nix | 2 - tests/x86.dhall | 1 - tests/x86.nix | 2 - 67 files changed, 26 insertions(+), 232 deletions(-) delete mode 100644 .CC0-1.0.png create mode 100644 .reuse/dep5 delete mode 100644 LICENSES/CC0-1.0.txt diff --git a/.CC0-1.0.png b/.CC0-1.0.png deleted file mode 100644 index 7d1a462362ca0777660a08bf7e93d2f52870fe73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmV+!0p|XRP)9NVsk;9873CooP5A zeC3$gjBuO$9ThkfUJe}0L`xs1#mjZMN{OzS~rvrwwjBlriY00000NkvXXu0mjf-tKWY diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..a2c9eaf --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,8 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Genodepkgs +Upstream-Contact: Emery Hemingway +Source: https://git.sr.ht/~ehmry/genodepkgs + +Files: * +Copyright: 2019-2020 Nixpkgs/NixOS contributors +License: MIT diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt deleted file mode 100644 index a343ccd..0000000 --- a/LICENSES/CC0-1.0.txt +++ /dev/null @@ -1,119 +0,0 @@ -Creative Commons Legal Code - -CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES -NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE -AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION -ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE -OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS -LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION -OR WORKS PROVIDED HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer exclusive -Copyright and Related Rights (defined below) upon the creator and subsequent -owner(s) (each and all, an "owner") of an original work of authorship and/or -a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for the -purpose of contributing to a commons of creative, cultural and scientific -works ("Commons") that the public can reliably and without fear of later claims -of infringement build upon, modify, incorporate in other works, reuse and -redistribute as freely as possible in any form whatsoever and for any purposes, -including without limitation commercial purposes. These owners may contribute -to the Commons to promote the ideal of a free culture and the further production -of creative, cultural and scientific works, or to gain reputation or greater -distribution for their Work in part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any expectation -of additional consideration or compensation, the person associating CC0 with -a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright -and Related Rights in the Work, voluntarily elects to apply CC0 to the Work -and publicly distribute the Work under its terms, with knowledge of his or -her Copyright and Related Rights in the Work and the meaning and intended -legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be protected -by copyright and related or neighboring rights ("Copyright and Related Rights"). -Copyright and Related Rights include, but are not limited to, the following: - -i. the right to reproduce, adapt, distribute, perform, display, communicate, -and translate a Work; - - ii. moral rights retained by the original author(s) and/or performer(s); - -iii. publicity and privacy rights pertaining to a person's image or likeness -depicted in a Work; - -iv. rights protecting against unfair competition in regards to a Work, subject -to the limitations in paragraph 4(a), below; - -v. rights protecting the extraction, dissemination, use and reuse of data -in a Work; - -vi. database rights (such as those arising under Directive 96/9/EC of the -European Parliament and of the Council of 11 March 1996 on the legal protection -of databases, and under any national implementation thereof, including any -amended or successor version of such directive); and - -vii. other similar, equivalent or corresponding rights throughout the world -based on applicable law or treaty, and any national implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention of, -applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and -unconditionally waives, abandons, and surrenders all of Affirmer's Copyright -and Related Rights and associated claims and causes of action, whether now -known or unknown (including existing as well as future claims and causes of -action), in the Work (i) in all territories worldwide, (ii) for the maximum -duration provided by applicable law or treaty (including future time extensions), -(iii) in any current or future medium and for any number of copies, and (iv) -for any purpose whatsoever, including without limitation commercial, advertising -or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the -benefit of each member of the public at large and to the detriment of Affirmer's -heirs and successors, fully intending that such Waiver shall not be subject -to revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason be -judged legally invalid or ineffective under applicable law, then the Waiver -shall be preserved to the maximum extent permitted taking into account Affirmer's -express Statement of Purpose. In addition, to the extent the Waiver is so -judged Affirmer hereby grants to each affected person a royalty-free, non -transferable, non sublicensable, non exclusive, irrevocable and unconditional -license to exercise Affirmer's Copyright and Related Rights in the Work (i) -in all territories worldwide, (ii) for the maximum duration provided by applicable -law or treaty (including future time extensions), (iii) in any current or -future medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional purposes -(the "License"). The License shall be deemed effective as of the date CC0 -was applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder of -the License, and in such case Affirmer hereby affirms that he or she will -not (i) exercise any of his or her remaining Copyright and Related Rights -in the Work or (ii) assert any associated claims and causes of action with -respect to the Work, in either case contrary to Affirmer's express Statement -of Purpose. - - 4. Limitations and Disclaimers. - -a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, -licensed or otherwise affected by this document. - -b. Affirmer offers the Work as-is and makes no representations or warranties -of any kind concerning the Work, express, implied, statutory or otherwise, -including without limitation warranties of title, merchantability, fitness -for a particular purpose, non infringement, or the absence of latent or other -defects, accuracy, or the present or absence of errors, whether or not discoverable, -all to the greatest extent permissible under applicable law. - -c. Affirmer disclaims responsibility for clearing rights of other persons -that may apply to the Work or any use thereof, including without limitation -any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims -responsibility for obtaining any necessary consents, permissions or other -rights required for any use of the Work. - -d. Affirmer understands and acknowledges that Creative Commons is not a party -to this document and has no duty or obligation with respect to this CC0 or -use of the Work. diff --git a/README.md b/README.md index 8923b16..4543a4a 100644 --- a/README.md +++ b/README.md @@ -11,19 +11,17 @@ [Nix](https://nixos.org/nix/) expressions related to the [Genode OS framework](https://genode.org). -**IRC:** irc://freenode.net/#nixos-exotic +=> irc://freenode.net/#nixos-exotic IRC -**Mailing List:** https://lists.sr.ht/~ehmry/genodepkgs +=> https://lists.sr.ht/~ehmry/genodepkgs Mailing list -**Hydra:** https://hydra7.hq.c3d2.de/project/genodepkgs - -**SoTest:** https://opensource.sotest.io/userName%3Demery/1 +=> https://opensource.sotest.io/userName%3Demery/1 SoTest # Current status -I (the singular maintainer) have paused my work here while I write a native -[Dhall evaluator](https://git.sr.ht/~ehmry/dhall-nim) for Genode. This will -allow for dynamic on-target reconfiguration. +Work here has slowed as effort is focused on a native [Dhall +evaluator](https://git.sr.ht/~ehmry/dhall-nim) for Genode. This will allow for +dynamic on-target reconfiguration. ## Repository layout @@ -401,10 +399,11 @@ Others are simply introduced as an aid to the reader: # Legal -This repository is for trivial packaging and metadata that exists only for the -sake of richer and more meaningful code in external repositories. All works -committed to this repository, unless otherwise noted, shall be implicitly -licensed under a [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/deed) -public domain dedication. +This repository is published under MIT licensing consistent with Nixpkgs. -![CC0 PUBLIC DOMAIN](.CC0-1.0.png) +> Note: MIT license does not apply to the packages built by Nixpkgs, +> merely to the files in this repository (the Nix expressions, build +> scripts, NixOS modules, etc.). It also might not apply to patches +> included in Nixpkgs, which may be derivative works of the packages to +> which they apply. The aforementioned artifacts are all covered by the +> licenses of the respective packages. diff --git a/apps/default.nix b/apps/default.nix index 726399f..2a08062 100644 --- a/apps/default.nix +++ b/apps/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { system, self, nixpkgs, nixpkgsLocal, packages }: let diff --git a/apps/generate-manifest/default.nix b/apps/generate-manifest/default.nix index f63c278..3d9db57 100644 --- a/apps/generate-manifest/default.nix +++ b/apps/generate-manifest/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, nixpkgs }: with nixpkgs.buildPackages; diff --git a/apps/hw-image/default.nix b/apps/hw-image/default.nix index 5a32650..4062b55 100644 --- a/apps/hw-image/default.nix +++ b/apps/hw-image/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, nixpkgs, apps, packages }: let inherit (packages) genodeSources base-hw-pc; diff --git a/apps/hw-iso/default.nix b/apps/hw-iso/default.nix index 759e39b..0d7dde6 100644 --- a/apps/hw-iso/default.nix +++ b/apps/hw-iso/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, nixpkgs, packages, hw-image }: nixpkgs.writeScriptBin "hw-iso" (with nixpkgs.buildPackages; diff --git a/apps/insert-config-rom.dhall b/apps/insert-config-rom.dhall index dca887d..17b66b4 100644 --- a/apps/insert-config-rom.dhall +++ b/apps/insert-config-rom.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/apps/linux-image/default.nix b/apps/linux-image/default.nix index f812fc4..a12c7ae 100644 --- a/apps/linux-image/default.nix +++ b/apps/linux-image/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { nixpkgs, apps, packages }: nixpkgs.writeScriptBin "linux-image" (with nixpkgs.buildPackages; '' diff --git a/apps/linux-image/script.dhall b/apps/linux-image/script.dhall index 4b5789d..597693d 100644 --- a/apps/linux-image/script.dhall +++ b/apps/linux-image/script.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/apps/modules.as.dhall b/apps/modules.as.dhall index ceafd02..cfb1782 100644 --- a/apps/modules.as.dhall +++ b/apps/modules.as.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/apps/nova-image/default.nix b/apps/nova-image/default.nix index 560ca9f..1d3bdc5 100644 --- a/apps/nova-image/default.nix +++ b/apps/nova-image/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, nixpkgs, apps, packages }: let inherit (packages) genodeSources base-nova; diff --git a/apps/nova-iso/default.nix b/apps/nova-iso/default.nix index 172b8fb..d19425e 100644 --- a/apps/nova-iso/default.nix +++ b/apps/nova-iso/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, nixpkgs, packages, nova-image }: nixpkgs.writeScriptBin "nova-iso" (with nixpkgs.buildPackages; diff --git a/apps/render-init/default.nix b/apps/render-init/default.nix index f78b8e1..52911da 100644 --- a/apps/render-init/default.nix +++ b/apps/render-init/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { nixpkgs, apps, packages }: nixpkgs.writeScriptBin "render-init" (with nixpkgs.buildPackages; '' diff --git a/apps/render-rom.dhall b/apps/render-rom.dhall index f30a60c..8ed1325 100644 --- a/apps/render-rom.dhall +++ b/apps/render-rom.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/apps/to-rom.dhall b/apps/to-rom.dhall index 9b938a3..ba4548d 100644 --- a/apps/to-rom.dhall +++ b/apps/to-rom.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/compositions/pc-drivers.dhall b/compositions/pc-drivers.dhall index d4e0636..d564726 100644 --- a/compositions/pc-drivers.dhall +++ b/compositions/pc-drivers.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/flake.nix b/flake.nix index c8a9523..d385c42 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { description = "Genode packages"; diff --git a/lib/compile-boot.dhall b/lib/compile-boot.dhall index aa11ffa..c339b3c 100644 --- a/lib/compile-boot.dhall +++ b/lib/compile-boot.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/lib/default.nix b/lib/default.nix index 133c21b..5eebd36 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { system, localSystem, crossSystem, genodepkgs, nixpkgs, apps }: let @@ -19,7 +17,8 @@ in rec { runDhallCommand = name: env: script: nixpkgs.runCommand name (env // { - nativeBuildInputs = [ buildPackages.dhall ] ++ env.nativeBuildInputs or [ ]; + nativeBuildInputs = [ buildPackages.dhall ] + ++ env.nativeBuildInputs or [ ]; }) '' ${dhallCachePrelude} ${script} diff --git a/lib/linux-script.dhall b/lib/linux-script.dhall index 9f6f418..5be34fc 100644 --- a/lib/linux-script.dhall +++ b/lib/linux-script.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/nixos-modules/buildBootDescription.nix b/nixos-modules/buildBootDescription.nix index 345d33c..d37a990 100644 --- a/nixos-modules/buildBootDescription.nix +++ b/nixos-modules/buildBootDescription.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - # Generate a total boot description by matching the binaries referred to by an init # configuration with a list of input packages. diff --git a/nixos-modules/dhall/console.dhall b/nixos-modules/dhall/console.dhall index 272b3c8..a3824f3 100644 --- a/nixos-modules/dhall/console.dhall +++ b/nixos-modules/dhall/console.dhall @@ -1,5 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 --- TODO: Move routes passed to toChild into the Init let Genode = env:DHALL_GENODE diff --git a/nixos-modules/dhall/fs-log.dhall b/nixos-modules/dhall/fs-log.dhall index 0671ae0..570541e 100644 --- a/nixos-modules/dhall/fs-log.dhall +++ b/nixos-modules/dhall/fs-log.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/nixos-modules/dhall/graphical-log.dhall b/nixos-modules/dhall/graphical-log.dhall index 30fee83..6f52aec 100644 --- a/nixos-modules/dhall/graphical-log.dhall +++ b/nixos-modules/dhall/graphical-log.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/nixos-modules/dhall/root.dhall b/nixos-modules/dhall/root.dhall index eb7fe6f..25c01f7 100644 --- a/nixos-modules/dhall/root.dhall +++ b/nixos-modules/dhall/root.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/nixos-modules/dhall/show_input.dhall b/nixos-modules/dhall/show_input.dhall index 3ad9699..e901af1 100644 --- a/nixos-modules/dhall/show_input.dhall +++ b/nixos-modules/dhall/show_input.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/nixos-modules/dhall/vbox-guest.dhall b/nixos-modules/dhall/vbox-guest.dhall index 00b2766..264c79e 100644 --- a/nixos-modules/dhall/vbox-guest.dhall +++ b/nixos-modules/dhall/vbox-guest.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/nixos-modules/dhall/wm.dhall b/nixos-modules/dhall/wm.dhall index 02aee6e..f6e8b51 100644 --- a/nixos-modules/dhall/wm.dhall +++ b/nixos-modules/dhall/wm.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/overlay/default.nix b/overlay/default.nix index 883806a..a14f8a0 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - final: prev: with prev; let diff --git a/overlay/libc/default.nix b/overlay/libc/default.nix index bf188eb..dbefc27 100644 --- a/overlay/libc/default.nix +++ b/overlay/libc/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { genodeSources, symlinkJoin }: symlinkJoin { diff --git a/overlay/solo5-tools/default.nix b/overlay/solo5-tools/default.nix index e24af3e..4f8757b 100644 --- a/overlay/solo5-tools/default.nix +++ b/overlay/solo5-tools/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, buildPackages, fetchurl }: # WARNING: recursive make ahead diff --git a/packages/NOVA/default.nix b/packages/NOVA/default.nix index deaa660..815eec8 100644 --- a/packages/NOVA/default.nix +++ b/packages/NOVA/default.nix @@ -1,6 +1,4 @@ -# SPDX-FileCopyrightText: Emery Hemingway -# -# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1 + { stdenv, buildPackages, fetchFromGitHub }: diff --git a/packages/bender/default.nix b/packages/bender/default.nix index f0dd0fc..11afac4 100644 --- a/packages/bender/default.nix +++ b/packages/bender/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { diff --git a/packages/block_router/default.nix b/packages/block_router/default.nix index 5ab4695..6f7bc26 100644 --- a/packages/block_router/default.nix +++ b/packages/block_router/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, fetchgit, tup }: stdenv.mkDerivation rec { diff --git a/packages/default.nix b/packages/default.nix index 3cc81fe..83146fe 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { nixpkgs }: let diff --git a/packages/dhall/default.nix b/packages/dhall/default.nix index 6d6e73c..38a3153 100644 --- a/packages/dhall/default.nix +++ b/packages/dhall/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { callPackage }: { diff --git a/packages/dhall/genode.nix b/packages/dhall/genode.nix index f6c4181..316eaab 100644 --- a/packages/dhall/genode.nix +++ b/packages/dhall/genode.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, fetchgit, dhallPackages }: dhallPackages.buildDhallPackage { diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix index 0348c2f..ce1ebb1 100644 --- a/packages/genodelabs/default.nix +++ b/packages/genodelabs/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { buildPackages, targetPackages }: let diff --git a/packages/nic_bus/default.nix b/packages/nic_bus/default.nix index 9ed1563..46700aa 100644 --- a/packages/nic_bus/default.nix +++ b/packages/nic_bus/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, fetchgit, tup }: stdenv.mkDerivation rec { pname = "nic_bus"; diff --git a/packages/rtc-dummy/default.nix b/packages/rtc-dummy/default.nix index 86cc96f..4e0aa0a 100644 --- a/packages/rtc-dummy/default.nix +++ b/packages/rtc-dummy/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, fetchgit, tup }: stdenv.mkDerivation rec { diff --git a/packages/show_input/default.nix b/packages/show_input/default.nix index eedc052..b166b16 100644 --- a/packages/show_input/default.nix +++ b/packages/show_input/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, fetchgit, tup }: stdenv.mkDerivation rec { pname = "show_input"; diff --git a/packages/solo5/default.nix b/packages/solo5/default.nix index a81dd39..e1c70b4 100644 --- a/packages/solo5/default.nix +++ b/packages/solo5/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, buildPackages, fetchurl, solo5-tools }: # WARNING: recursive make ahead diff --git a/packages/sotest-producer/default.nix b/packages/sotest-producer/default.nix index 0028c07..90d788e 100644 --- a/packages/sotest-producer/default.nix +++ b/packages/sotest-producer/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { stdenv, fetchgit, tup }: stdenv.mkDerivation rec { diff --git a/packages/stdcxx/default.nix b/packages/stdcxx/default.nix index 138fe7f..e84dd40 100644 --- a/packages/stdcxx/default.nix +++ b/packages/stdcxx/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { genodeSources }: let port = genodeSources.ports.stdcxx; diff --git a/tests/default.nix b/tests/default.nix index eda496f..1a49ee8 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { self, apps, localPackages, genodepkgs, lib, nixpkgs, legacyPackages }: let diff --git a/tests/driver_manager.dhall b/tests/driver_manager.dhall index 7c337b4..6242a21 100644 --- a/tests/driver_manager.dhall +++ b/tests/driver_manager.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Test = ./test.dhall ? env:DHALL_GENODE_TEST diff --git a/tests/log.dhall b/tests/log.dhall index 39afd56..1190809 100644 --- a/tests/log.dhall +++ b/tests/log.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Test = ./test.dhall ? env:DHALL_GENODE_TEST diff --git a/tests/log.nix b/tests/log.nix index a9a4d50..bd6f935 100644 --- a/tests/log.nix +++ b/tests/log.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { pkgs, ... }: with pkgs; diff --git a/tests/posix.dhall b/tests/posix.dhall index 5ede4bb..35c4ecf 100644 --- a/tests/posix.dhall +++ b/tests/posix.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Test = ./test.dhall ? env:DHALL_GENODE_TEST diff --git a/tests/posix.nix b/tests/posix.nix index 45a594d..5bc991e 100644 --- a/tests/posix.nix +++ b/tests/posix.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { pkgs, legacyPackages, ... }: with pkgs; diff --git a/tests/solo5/blk.dhall b/tests/solo5/blk.dhall index e9057fc..5331ae2 100644 --- a/tests/solo5/blk.dhall +++ b/tests/solo5/blk.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/tests/solo5/default.nix b/tests/solo5/default.nix index e8776c8..c0105e7 100644 --- a/tests/solo5/default.nix +++ b/tests/solo5/default.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { pkgs, ... }: with pkgs; diff --git a/tests/solo5/net.dhall b/tests/solo5/net.dhall index 78f4755..c8d434f 100644 --- a/tests/solo5/net.dhall +++ b/tests/solo5/net.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/tests/solo5/net_2if.dhall b/tests/solo5/net_2if.dhall index 9b5d1d8..a9536b6 100644 --- a/tests/solo5/net_2if.dhall +++ b/tests/solo5/net_2if.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/tests/solo5/solo5.dhall b/tests/solo5/solo5.dhall index 268a638..9464e50 100644 --- a/tests/solo5/solo5.dhall +++ b/tests/solo5/solo5.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Test = ../test.dhall ? env:DHALL_GENODE_TEST diff --git a/tests/solo5/ssp.dhall b/tests/solo5/ssp.dhall index 00fa501..45c6d49 100644 --- a/tests/solo5/ssp.dhall +++ b/tests/solo5/ssp.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Test = ../test.dhall ? env:DHALL_GENODE_TEST diff --git a/tests/solo5/time.dhall b/tests/solo5/time.dhall index 57a6688..f8d738d 100644 --- a/tests/solo5/time.dhall +++ b/tests/solo5/time.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Genode = env:DHALL_GENODE diff --git a/tests/test-wrapper.dhall b/tests/test-wrapper.dhall index 27b76f8..61a4418 100644 --- a/tests/test-wrapper.dhall +++ b/tests/test-wrapper.dhall @@ -1,4 +1,4 @@ --- SPDX-License-Identifier: CC0-1.0 + let Test = ./test.dhall ? env:DHALL_GENODE_TEST let Genode = Test.Genode diff --git a/tests/test.dhall b/tests/test.dhall index 7114da4..12fead4 100644 --- a/tests/test.dhall +++ b/tests/test.dhall @@ -1,3 +1,4 @@ + let Genode = env:DHALL_GENODE let Prelude = Genode.Prelude diff --git a/tests/vmm_arm.dhall b/tests/vmm_arm.dhall index 1495962..0b356b5 100644 --- a/tests/vmm_arm.dhall +++ b/tests/vmm_arm.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Test = ./test.dhall ? env:DHALL_GENODE_TEST diff --git a/tests/vmm_arm.nix b/tests/vmm_arm.nix index 0e81377..c20e841 100644 --- a/tests/vmm_arm.nix +++ b/tests/vmm_arm.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { pkgs, localPackages, ... }: { diff --git a/tests/vmm_x86.dhall b/tests/vmm_x86.dhall index 1dab801..1c1b539 100644 --- a/tests/vmm_x86.dhall +++ b/tests/vmm_x86.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Test = ./test.dhall ? env:DHALL_GENODE_TEST diff --git a/tests/vmm_x86.nix b/tests/vmm_x86.nix index eee6af7..405e7ee 100644 --- a/tests/vmm_x86.nix +++ b/tests/vmm_x86.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { pkgs, ... }: { diff --git a/tests/x86.dhall b/tests/x86.dhall index 7516273..b6088da 100644 --- a/tests/x86.dhall +++ b/tests/x86.dhall @@ -1,4 +1,3 @@ --- SPDX-License-Identifier: CC0-1.0 let Test = ./test.dhall ? env:DHALL_GENODE_TEST diff --git a/tests/x86.nix b/tests/x86.nix index 1c4501b..c4f4051 100644 --- a/tests/x86.nix +++ b/tests/x86.nix @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: CC0-1.0 - { pkgs, ... }: { name = "x86"; constraints = builtins.any (spec: spec == "x86");