mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-31 01:02:20 +00:00
m1n1: 1.6.1 -> 2.0.0
Version 2.0.0 is purely a relicense to GPL-2-or-later, it has nothing
else when compared to 1.9.9, so I only link to those changelog/diffs here
Diff: https://github.com/AsahiLinux/m1n1/compare/v1.6.1...v1.9.9
Changelog: https://github.com/AsahiLinux/m1n1/releases/tag/v1.9.9
(cherry picked from commit 94d56ff94b)
This commit is contained in:
committed by
github-actions[bot]
parent
14330ea63a
commit
8aef3f29bc
@@ -31,20 +31,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "m1n1";
|
||||
version = "1.6.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AsahiLinux";
|
||||
repo = "m1n1";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4Wps/hNIBH6qWr2sX683WyLIPQJmih4ADwQKqqjitDk=";
|
||||
hash = "sha256-h+gRa1Msdbb7CCYWo2Wo5Q1MwPfIXBBBpdAGWLbRDdk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version;
|
||||
src = "${finalAttrs.src}/rust";
|
||||
sourceRoot = "rust";
|
||||
hash = "sha256-/2JQ31pMHbNjZsIu2RLCWzNul/qzL1O2+XB3qdOEb2U=";
|
||||
hash = "sha256-7G9aTQEiQ8ocsY0gSoBg9A2cusfqR4a1nhFikpWMXAA=";
|
||||
};
|
||||
cargoRoot = "rust";
|
||||
|
||||
@@ -130,8 +130,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# m1n1 embeds several libraries, all of which cannot be
|
||||
# unvendored easily.
|
||||
|
||||
# m1n1, minlzma, musl-libc
|
||||
mit
|
||||
# m1n1
|
||||
gpl2Plus
|
||||
# minlzma: MIT
|
||||
# musl-libc: MIT
|
||||
# libfdt: dual BSD2 and GPL-2-or-later
|
||||
# tinf: zlib
|
||||
# arm-trusted-firmware: BSD3
|
||||
@@ -139,11 +141,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# PDCLib: CC0
|
||||
# Source Code Pro: OFL1.1
|
||||
# dwc3: BSD3 and GPL-2-or-later
|
||||
mit
|
||||
cc0
|
||||
ofl
|
||||
zlib
|
||||
bsd2
|
||||
gpl2Plus
|
||||
bsd3
|
||||
asl20
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user