Merge master into staging-next (400bb9a8) · Commits · nix / nixpkgs

ci/pinned.json

+6 −6

Original line number	Diff line number	Diff line
		@@ -9,9 +9,9 @@
		},
		"branch": "nixpkgs-unstable",
		"submodules": false,
		"revision": "8ca7ec685bbee55d6dcb326abe23945c0806c39e",
		"url": "https://github.com/NixOS/nixpkgs/archive/8ca7ec685bbee55d6dcb326abe23945c0806c39e.tar.gz",
		"hash": "1hkxm871m66mjsc4acdki32qqnpgk3n6vi3zrzns2bwlwp6ivcjx"
		"revision": "6afe187897bef7933475e6af374c893f4c84a293",
		"url": "https://github.com/NixOS/nixpkgs/archive/6afe187897bef7933475e6af374c893f4c84a293.tar.gz",
		"hash": "1x3yas2aingswrw7hpn43d9anlb08bpyk42dqg6v8f3p3yk83p1b"
		},
		"treefmt-nix": {
		"type": "Git",
		@@ -22,9 +22,9 @@
		},
		"branch": "main",
		"submodules": false,
		"revision": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
		"url": "https://github.com/numtide/treefmt-nix/archive/1f3f7b784643d488ba4bf315638b2b0a4c5fb007.tar.gz",
		"hash": "13qisjalw9qvd6lkd9g8225r46j5wdjrp3zw6jrs81q2vxwdz37m"
		"revision": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
		"url": "https://github.com/numtide/treefmt-nix/archive/a05be418a1af1198ca0f63facb13c985db4cb3c5.tar.gz",
		"hash": "1yadm9disc59an4a6c1zidq82530rd7i7idzzsirv6dlwirbqk3q"
		}
		},
		"version": 5

+2 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ in
		enable = true;
		settings.DefaultAction = "deny";
		settings.ProcMonitorMethod = m;
		settings.LogLevel = 0;
		};
		}
		) monitorMethods
		@@ -46,6 +47,7 @@ in
		enable = true;
		settings.DefaultAction = "deny";
		settings.ProcMonitorMethod = m;
		settings.LogLevel = 0;
		rules = {
		curl = {
		name = "curl";

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,13 +32,13 @@

		stdenv.mkDerivation rec {
		pname = "ddnet";
		version = "19.2";
		version = "19.2.1";

		src = fetchFromGitHub {
		owner = "ddnet";
		repo = "ddnet";
		tag = version;
		hash = "sha256-7moxTdoUTOpAHDT0LNNG6ccHeXKxd6ND+GRcgchWVSI=";
		hash = "sha256-0G0rVqkrIKjSGW7TF218TqakzJxiCzDipLGDzJvgdRg=";
		};

		cargoDeps = rustPlatform.fetchCargoVendor {

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,13 +9,13 @@

		stdenv.mkDerivation rec {
		pname = "easyrsa";
		version = "3.2.2";
		version = "3.2.3";

		src = fetchFromGitHub {
		owner = "OpenVPN";
		repo = "easy-rsa";
		rev = "v${version}";
		hash = "sha256-gNuVijMAHVKEHU0Z6INKUZt68qSg5ssxSaXOH/+MU1I=";
		hash = "sha256-TAJAwvcIkAB4YShK9NItw14UTvuxtNd/OxLDkO8p0d0=";
		};

		nativeBuildInputs = [ makeWrapper ];

+24 −14

Original line number	Diff line number	Diff line
		@@ -21,17 +21,22 @@
		libvorbis,
		libopus,
		nlohmann_json,
		expat,
		libGL,
		curl,
		webkitgtk_4_1,
		gtk3,
		}:

		stdenv.mkDerivation (finalAttrs: {
		pname = "giada";
		version = "1.0.0";
		version = "1.1.1";

		src = fetchFromGitHub {
		owner = "monocasual";
		repo = "giada";
		rev = finalAttrs.version;
		hash = "sha256-vTOUS9mI4B3yRNnM2dNCH7jgMuD3ztdhe1FMgXUIt58=";
		tag = finalAttrs.version;
		hash = "sha256-t24S8tmx9VFcpEwe5EzoMQ7xhX8dj92Mq43gaWc+C50=";
		fetchSubmodules = true;
		};

		@@ -51,22 +56,27 @@ stdenv.mkDerivation (finalAttrs: {

		buildInputs =
		[
		rtmidi
		alsa-lib
		curl
		expat
		flac
		fltk
		fmt
		libmpg123
		libsndfile
		libsamplerate
		nlohmann_json
		alsa-lib
		libXpm
		libpulseaudio
		gtk3
		jack2
		flac
		libGL
		libXpm
		libXrandr
		libogg
		libvorbis
		libopus
		libXrandr
		libpulseaudio
		libsamplerate
		libsndfile
		libvorbis
		libmpg123
		nlohmann_json
		rtmidi
		webkitgtk_4_1
		]
		++ lib.optionals (stdenv.hostPlatform.isLinux \|\| stdenv.hostPlatform.isFreeBSD) [
		fontconfig