Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Apache licence and add licence section to readme. #3

Merged
merged 2 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
202 changes: 0 additions & 202 deletions LICENSE-APACHE

This file was deleted.

8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,11 @@

This repository contains [Nix](https://nixos.org/) packages and environments used by [lowRISC](https://lowrisc.org).
These packages and environments are *not supported* by lowRISC or recommended to be used outside of lowRISC.

## License

This package repository is licensed under the [MIT License](LICENSE).

The following important clarification made in the [`nixpkgs`](https://github.com/NixOS/nixpkgs/blob/master/README.md#license) repository applies to this repository as well:
> 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.
5 changes: 2 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright lowRISC Contributors.
# Licensed under both the MIT License and the Apache License, Version 2.
# See LICENSE-MIT and LICENSE-APACHE for details.
# SPDX-License-Identifier: MIT OR Apache-2.0
# Licensed under the MIT License, see LICENSE for details.
# SPDX-License-Identifier: MIT
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
Expand Down
5 changes: 2 additions & 3 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright lowRISC Contributors.
# Licensed under both the MIT License and the Apache License, Version 2.
# See LICENSE-MIT and LICENSE-APACHE for details.
# SPDX-License-Identifier: MIT OR Apache-2.0
# Licensed under the MIT License, see LICENSE for details.
# SPDX-License-Identifier: MIT
{
pkgs,
inputs,
Expand Down
5 changes: 2 additions & 3 deletions pkgs/python_ot/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright lowRISC Contributors.
# Licensed under both the MIT License and the Apache License, Version 2.
# See LICENSE-MIT and LICENSE-APACHE for details.
# SPDX-License-Identifier: MIT OR Apache-2.0
# Licensed under the MIT License, see LICENSE for details.
# SPDX-License-Identifier: MIT
{
inputs,
pkgs,
Expand Down
5 changes: 2 additions & 3 deletions pkgs/python_ot/python.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright lowRISC Contributors.
# Licensed under both the MIT License and the Apache License, Version 2.
# See LICENSE-MIT and LICENSE-APACHE for details.
# SPDX-License-Identifier: MIT OR Apache-2.0
# Licensed under the MIT License, see LICENSE for details.
# SPDX-License-Identifier: MIT
#
# Hack, see https://github.com/charlottia/hdx/pull/1
{...} @ inputs: let
Expand Down
5 changes: 2 additions & 3 deletions pkgs/python_ot/sitecustomize.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright lowRISC Contributors
# Copyright Nixpkgs/NixOS Contributors
# Licensed under both the MIT License and the Apache License, Version 2.
# See LICENSE-MIT and LICENSE-APACHE for details.
# SPDX-License-Identifier: MIT OR Apache-2.0
# Licensed under the MIT License, see LICENSE for details.
# SPDX-License-Identifier: MIT

"""
This is a Nix-specific module for discovering modules built with Nix.
Expand Down
5 changes: 2 additions & 3 deletions pkgs/verilator/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright lowRISC Contributors.
# Licensed under both the MIT License and the Apache License, Version 2.
# See LICENSE-MIT and LICENSE-APACHE for details.
# SPDX-License-Identifier: MIT OR Apache-2.0
# Licensed under the MIT License, see LICENSE for details.
# SPDX-License-Identifier: MIT
{pkgs, ...}:
pkgs.verilator.overrideAttrs rec {
version = "4.210";
Expand Down