Merge master into staging-next (6e6944db) · Commits · nix / nixpkgs

lib/licenses.nix

+15 −0

Original line number	Diff line number	Diff line
		@@ -599,6 +599,11 @@ in mkLicense lset) ({
		url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception";
		};

		giftware = {
		spdxId = "Giftware";
		fullName = "Giftware License";
		};

		hpnd = {
		spdxId = "HPND";
		fullName = "Historic Permission Notice and Disclaimer";
		@@ -609,6 +614,11 @@ in mkLicense lset) ({
		spdxId = "HPND-sell-variant";
		};

		hpndUc = {
		spdxId = "HPND-UC";
		fullName = "Historical Permission Notice and Disclaimer - University of California variant";
		};

		# Intel's license, seems free
		iasl = {
		spdxId = "Intel-ACPI";
		@@ -894,6 +904,11 @@ in mkLicense lset) ({
		url = "https://raw.githubusercontent.com/netdata/netdata/master/web/gui/v2/LICENSE.md";
		};

		nistSoftware = {
		spdxId = "NIST-Software";
		fullName = "NIST Software License";
		};

		nlpl = {
		spdxId = "NLPL";
		fullName = "No Limit Public License";

+12 −1

Original line number	Diff line number	Diff line
		@@ -2941,6 +2941,12 @@
		githubId = 37375448;
		name = "Buildit";
		};
		bwc9876 = {
		email = "bwc9876@gmail.com";
		github = "Bwc9876";
		githubId = 25644444;
		name = "Ben C";
		};
		bwlang = {
		email = "brad@langhorst.com";
		github = "bwlang";
		@@ -3433,7 +3439,7 @@
		name = "Philipp Dargel";
		};
		chito = {
		email = "iamchito@protonmail.com";
		email = "chitochi@proton.me";
		github = "chitochi";
		githubId = 153365419;
		matrix = "@chito:nichijou.dev";
		@@ -18403,6 +18409,11 @@
		githubId = 950799;
		name = "Tomasz Czyż";
		};
		spoonbaker = {
		github = "Spoonbaker";
		githubId = 47164123;
		name = "Spoonbaker";
		};
		sprock = {
		email = "rmason@mun.ca";
		github = "sprock";

+4 −4

Original line number	Diff line number	Diff line
		@@ -10,16 +10,16 @@ let
		inherit tiling_wm;
		};
		stableVersion = {
		version = "2023.2.1.23"; # "Android Studio Iguana \| 2023.2.1"
		sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM=";
		version = "2023.2.1.24"; # "Android Studio Iguana \| 2023.2.1 Patch 1"
		sha256Hash = "sha256-ACZCdXKEnJy7DJTW+XGOoIvDRdzP47NytUEAqV//mbU=";
		};
		betaVersion = {
		version = "2023.2.1.23"; # "Android Studio Iguana \| 2023.2.1"
		sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM=";
		};
		latestVersion = {
		version = "2023.3.1.12"; # "Android Studio Jellyfish \| 2023.3.1 Canary 12"
		sha256Hash = "sha256-yg84WBLHfb6q+OlHuh5SJ5P4Fuc8yqO9eZ8iecOhZj4=";
		version = "2023.3.2.1"; # "Android Studio Jellyfish \| 2023.3.2 Canary 1"
		sha256Hash = "sha256-99EWGh3+3HV8yO29ANg1pwoo/1ktI2aCwKrdIqlcgVs=";
		};
		in {
		# Attributes are named by their corresponding release channels

+6 −15

Original line number	Diff line number	Diff line
		{ stdenv
		, lib
		, fetchFromGitHub
		, fetchpatch
		, gitUpdater
		, cmake
		, pkg-config
		@@ -17,26 +16,17 @@
		, wrapQtAppsHook
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "punes";
		version = "0.110";
		version = "0.111";

		src = fetchFromGitHub {
		owner = "punesemu";
		repo = "puNES";
		rev = "v${version}";
		sha256 = "sha256-+hL168r40aYUjyLbWFXWk9G2srrrG1TH1gLYMliHftU=";
		rev = "v${finalAttrs.version}";
		hash = "sha256-TIXjYkInWV3yVnvXrdHcmeWYeps5TcvkG2Xjg4roIds=";
		};

		patches = [
		# Fixes compilation on aarch64
		# Remove when version > 0.110
		(fetchpatch {
		url = "https://github.com/punesemu/puNES/commit/90dd5bc90412bbd199c2716f67a24aa88b24d80f.patch";
		hash = "sha256-/KNpTds4qjwyaTUebWWPlVXfuxVh6M4zOInxUfYztJg=";
		})
		];

		nativeBuildInputs = [
		cmake
		pkg-config
		@@ -73,8 +63,9 @@ stdenv.mkDerivation rec {
		description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player";
		mainProgram = "punes";
		homepage = "https://github.com/punesemu/puNES";
		changelog = "https://github.com/punesemu/puNES/blob/v${finalAttrs.version}/ChangeLog";
		license = licenses.gpl2Plus;
		maintainers = with maintainers; [ OPNA2608 ];
		platforms = with platforms; linux ++ freebsd ++ openbsd ++ windows;
		};
		}
		})

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@

		stdenv.mkDerivation rec {
		pname = "structorizer";
		version = "3.32-17";
		version = "3.32-18";

		desktopItems = [
		(makeDesktopItem {
		@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
		owner = "fesch";
		repo = "Structorizer.Desktop";
		rev = version;
		hash = "sha256-yJPF4N402wzc4kNWgcu7quhQ9QaERMfqHdQrf1IGwrQ=";
		hash = "sha256-CA87j11TFUd0nmuPc1qyqdITkTPE/jauf31cO2iBQVg=";
		};

		patches = [ ./makeStructorizer.patch ./makeBigJar.patch ];