From 561a1df912a96f59785491e939e0baf5741a24e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Wed, 27 Dec 2023 12:30:08 -0500 Subject: [PATCH 01/47] maintainers: add jcelerier After discussion on nixpkgs-audio matrix channel (@minijackson) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 58e31f454f06..f6f6c226f78d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9393,6 +9393,12 @@ github = "jceb"; githubId = 101593; }; + jcelerier = { + name = "Jean-Michaël Celerier"; + email = "jeanmichael.celerier@gmail.com"; + github = "jcelerier"; + githubId = 2772730; + }; jchw = { email = "johnwchadwick@gmail.com"; github = "jchv"; From e80ea5fa3420e00526cbf20c385ea6a9b45471ba Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 10 Jun 2024 02:24:14 -0400 Subject: [PATCH 02/47] decibels: init at 46.0 --- pkgs/by-name/de/decibels/package.nix | 73 ++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pkgs/by-name/de/decibels/package.nix diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix new file mode 100644 index 000000000000..2921c1897356 --- /dev/null +++ b/pkgs/by-name/de/decibels/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchFromGitLab, + appstream, + blueprint-compiler, + desktop-file-utils, + gjs, + gst_all_1, + libadwaita, + meson, + ninja, + pkg-config, + typescript, + wrapGAppsHook4, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "decibels"; + version = "46.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "GNOME"; + owner = "Incubator"; + repo = "decibels"; + rev = version; + hash = "sha256-3LQQcrpmWrTfk8A8GR+KnxJEB1HGozgEsM+j5ECK8kc="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + appstream + blueprint-compiler + desktop-file-utils + meson + ninja + pkg-config + typescript + wrapGAppsHook4 + ]; + + buildInputs = [ + gjs + gst_all_1.gstreamer + gst_all_1.gst-plugins-base # for GstVideo + gst_all_1.gst-plugins-bad # for GstPlay + gst_all_1.gst-plugins-good # for scaletempo + libadwaita + ]; + + # NOTE: this is applied after install to ensure `tsc` doesn't + # mess with us + # + # gjs uses the invocation name to add gresource files + # to get around this, we set the entry point name manually + preFixup = '' + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'org.gnome.Decibels';" $out/bin/org.gnome.Decibels + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Play audio files"; + homepage = "https://gitlab.gnome.org/GNOME/Incubator/decibels"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "org.gnome.Decibels"; + platforms = lib.platforms.linux; + }; +} From 32398b6f13cb002306b9ff75e25eb69e95c8edec Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 10 Jun 2024 01:58:57 -0400 Subject: [PATCH 03/47] commit: init at 4.1 --- .../by-name/co/commit/command-from-path.patch | 30 ++++++++ pkgs/by-name/co/commit/package.nix | 75 +++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 pkgs/by-name/co/commit/command-from-path.patch create mode 100644 pkgs/by-name/co/commit/package.nix diff --git a/pkgs/by-name/co/commit/command-from-path.patch b/pkgs/by-name/co/commit/command-from-path.patch new file mode 100644 index 000000000000..214c83d99545 --- /dev/null +++ b/pkgs/by-name/co/commit/command-from-path.patch @@ -0,0 +1,30 @@ +diff --git a/src/welcome.js b/src/welcome.js +index 27cc7dc..c6772c3 100644 +--- a/src/welcome.js ++++ b/src/welcome.js +@@ -55,24 +55,7 @@ export default function Welcome({ application }) { + } + + function getCommand() { +- const FLATPAK_ID = GLib.getenv("FLATPAK_ID"); +- +- if (FLATPAK_ID) { +- return `flatpak run ${FLATPAK_ID}`; +- } +- +- const { programInvocationName } = system; +- // re.sonny.Commit +- if (programInvocationName === GLib.path_get_basename(programInvocationName)) { +- return programInvocationName; +- } +- +- // ./re.sonny.commit +- // /home/sonny/re.sonny.Commit +- return GLib.canonicalize_filename( +- programInvocationName, +- GLib.get_current_dir(), +- ); ++ return "re.sonny.Commit"; + } + + function getRange(key) { diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix new file mode 100644 index 000000000000..c213ef37962d --- /dev/null +++ b/pkgs/by-name/co/commit/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + appstream-glib, + blueprint-compiler, + desktop-file-utils, + gjs, + gtksourceview5, + libadwaita, + libspelling, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "commit"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "sonnyp"; + repo = "Commit"; + rev = "v${version}"; + hash = "sha256-HhyoQ4wrc8dHvVU+MylJgaKu9HwSw+/f6UDTIM2YRNk="; + fetchSubmodules = true; + }; + + patches = [ + # Instead of using the absolute path in command snippets, + # assume `re.sonny.Commit` is already in PATH. This prevents + # configurations from breaking when our store path changes + ./command-from-path.patch + ]; + + # gjs uses the invocation name to add gresource files + # to get around this, we set the entry point name manually + # + # `/usr/bin/env` is also used quite a bit + postPatch = '' + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 're.sonny.Commit';" src/bin.js + patchShebangs {,.}* + ''; + + nativeBuildInputs = [ + appstream-glib + blueprint-compiler + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + libspelling + gtksourceview5 + gjs + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Commit message editor"; + homepage = "https://github.com/sonnyp/Commit"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "re.sonny.Commit"; + platforms = lib.platforms.linux; + }; +} From d97160f3acba8b2bd34f0e3dfce7dff989487d17 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 8 Jun 2024 02:57:02 -0400 Subject: [PATCH 04/47] morphosis: init at 1.3 --- pkgs/by-name/mo/morphosis/package.nix | 62 +++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/mo/morphosis/package.nix diff --git a/pkgs/by-name/mo/morphosis/package.nix b/pkgs/by-name/mo/morphosis/package.nix new file mode 100644 index 000000000000..fc611305df08 --- /dev/null +++ b/pkgs/by-name/mo/morphosis/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3Packages, + fetchFromGitLab, + appstream, + blueprint-compiler, + desktop-file-utils, + gobject-introspection, + libadwaita, + meson, + ninja, + pandoc, + pkg-config, + webkitgtk_6_0, + wrapGAppsHook4, +}: +python3Packages.buildPythonApplication rec { + pname = "morphosis"; + version = "1.3"; + pyproject = false; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "morphosis"; + rev = "v${version}"; + hash = "sha256-JEZFgON4QkxHDbWSZbDNLpIFctt8mDHdGVVu3Q+WH4U="; + }; + + nativeBuildInputs = [ + appstream + blueprint-compiler + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + webkitgtk_6_0 + ]; + + dependencies = with python3Packages; [ pygobject3 ]; + + dontWrapGApps = true; + makeWrapperArgs = [ + ''''${gappsWrapperArgs[@]}'' + "--prefix PATH : ${lib.makeBinPath [ pandoc ]}" + ]; + + meta = { + description = "Convert your documents"; + homepage = "https://gitlab.gnome.org/Monster/morphosis"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "morphosis"; + platforms = lib.platforms.linux; + }; +} From 92e2e96fecddcb69f0bde2558f4c08b8ee6d9ff5 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:23:24 -0400 Subject: [PATCH 05/47] contrast: migrate to by-name --- .../contrast/default.nix => by-name/co/contrast/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/accessibility/contrast/default.nix => by-name/co/contrast/package.nix} (100%) diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/by-name/co/contrast/package.nix similarity index 100% rename from pkgs/applications/accessibility/contrast/default.nix rename to pkgs/by-name/co/contrast/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b24e0955a7c5..a0093721bcea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4729,8 +4729,6 @@ with pkgs; clockify = callPackage ../applications/office/clockify { }; - contrast = callPackage ../applications/accessibility/contrast { }; - cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); cpulimit = callPackage ../tools/misc/cpulimit { }; From a654f48e02951ec8a7b5f4afd9e2683151adf116 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:23:47 -0400 Subject: [PATCH 06/47] contrast: format with nixfmt --- pkgs/by-name/co/contrast/package.nix | 35 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index cc8e21b92456..90455360a512 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -1,20 +1,21 @@ -{ stdenv -, lib -, fetchFromGitLab -, cairo -, cargo -, desktop-file-utils -, gettext -, glib -, gtk4 -, libadwaita -, meson -, ninja -, pango -, pkg-config -, rustPlatform -, rustc -, wrapGAppsHook4 +{ + stdenv, + lib, + fetchFromGitLab, + cairo, + cargo, + desktop-file-utils, + gettext, + glib, + gtk4, + libadwaita, + meson, + ninja, + pango, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, }: stdenv.mkDerivation rec { From 21e6566909e953ea8a199108c6b8ea8454d4653f Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:25:13 -0400 Subject: [PATCH 07/47] contrast: adopt --- pkgs/by-name/co/contrast/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index 90455360a512..2554c190e6ac 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Checks whether the contrast between two colors meet the WCAG requirements"; homepage = "https://gitlab.gnome.org/World/design/contrast"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ getchoo ]; platforms = platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; From bd506051b9ba9847ace5e8f5d82a552112d805bd Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:25:47 -0400 Subject: [PATCH 08/47] contrast: don't overuse `with lib;` https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/co/contrast/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index 2554c190e6ac..3817f130996b 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -57,12 +57,12 @@ stdenv.mkDerivation rec { pango ]; - meta = with lib; { + meta = { description = "Checks whether the contrast between two colors meet the WCAG requirements"; homepage = "https://gitlab.gnome.org/World/design/contrast"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ getchoo ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; + platforms = lib.platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; mainProgram = "contrast"; From 6942f9d107afd9b18b2ba9a7c283acc75958cd72 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:27:19 -0400 Subject: [PATCH 09/47] contrast: restrict platforms to linux the upstream meson project installing files and running checks specific to linux without accounting for other platforms, so it seems to be the only supported platform --- pkgs/by-name/co/contrast/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index 3817f130996b..17b9abadbf2b 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -62,9 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/World/design/contrast"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ getchoo ]; - platforms = lib.platforms.unix; - # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; mainProgram = "contrast"; + platforms = lib.platforms.linux; }; } From 5759dfddf24bf1deaf6f4cce2c9bccd0b7d835f5 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:30:20 -0400 Subject: [PATCH 10/47] contrast: add updateScript --- pkgs/by-name/co/contrast/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index 17b9abadbf2b..12dbc1c637a8 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -11,6 +11,7 @@ libadwaita, meson, ninja, + nix-update-script, pango, pkg-config, rustPlatform, @@ -57,6 +58,10 @@ stdenv.mkDerivation rec { pango ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Checks whether the contrast between two colors meet the WCAG requirements"; homepage = "https://gitlab.gnome.org/World/design/contrast"; From a7d82e802363df539cb7fdd9fe1df7f902eb6aa2 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:51:44 -0400 Subject: [PATCH 11/47] identity: migrate to by-name --- pkgs/{applications/graphics => by-name/id}/identity/Cargo.lock | 0 .../identity/default.nix => by-name/id/identity/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/graphics => by-name/id}/identity/Cargo.lock (100%) rename pkgs/{applications/graphics/identity/default.nix => by-name/id/identity/package.nix} (100%) diff --git a/pkgs/applications/graphics/identity/Cargo.lock b/pkgs/by-name/id/identity/Cargo.lock similarity index 100% rename from pkgs/applications/graphics/identity/Cargo.lock rename to pkgs/by-name/id/identity/Cargo.lock diff --git a/pkgs/applications/graphics/identity/default.nix b/pkgs/by-name/id/identity/package.nix similarity index 100% rename from pkgs/applications/graphics/identity/default.nix rename to pkgs/by-name/id/identity/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b24e0955a7c5..4a34337939db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31646,8 +31646,6 @@ with pkgs; id3v2 = callPackage ../applications/audio/id3v2 { }; - identity = callPackage ../applications/graphics/identity { }; - ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { From cc4f9ca3a1e626833b4093808b9d6429af922bcf Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:52:02 -0400 Subject: [PATCH 12/47] identity: format with nixfmt --- pkgs/by-name/id/identity/package.nix | 39 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index debc7e2f423b..033eb5496cc1 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -1,24 +1,25 @@ -{ lib -, stdenv -, fetchFromGitLab -, rustPlatform -, nix-update-script +{ + lib, + stdenv, + fetchFromGitLab, + rustPlatform, + nix-update-script, -, appstream -, blueprint-compiler -, cargo -, desktop-file-utils -, meson -, ninja -, pkg-config -, rustc -, wrapGAppsHook4 + appstream, + blueprint-compiler, + cargo, + desktop-file-utils, + meson, + ninja, + pkg-config, + rustc, + wrapGAppsHook4, -, dav1d -, gst_all_1 -, gtk4 -, libadwaita -, libwebp + dav1d, + gst_all_1, + gtk4, + libadwaita, + libwebp, }: stdenv.mkDerivation rec { From dee472c6e5864792464d7f7d51d59c73956f1416 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:52:53 -0400 Subject: [PATCH 13/47] identity: adopt --- pkgs/by-name/id/identity/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index 033eb5496cc1..bbae67e2a50a 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/YaLTeR/identity"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ getchoo ]; }; } From 5c06a476139cf47f465303c56a427735322c3953 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:54:16 -0400 Subject: [PATCH 14/47] identity: don't overuse `with lib;` https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/id/identity/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index bbae67e2a50a..d76b6da6a11b 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -68,12 +68,12 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Program for comparing multiple versions of an image or video"; - mainProgram = "identity"; homepage = "https://gitlab.gnome.org/YaLTeR/identity"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ getchoo ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "identity"; + platforms = lib.platforms.linux; }; } From 5fbc32975cabd096820b37b0c46a7f10e6969f27 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:55:47 -0400 Subject: [PATCH 15/47] identity: reorganize arguments --- pkgs/by-name/id/identity/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index d76b6da6a11b..55731e045e10 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -3,23 +3,21 @@ stdenv, fetchFromGitLab, rustPlatform, - nix-update-script, - + cargo, + rustc, appstream, blueprint-compiler, - cargo, - desktop-file-utils, - meson, - ninja, - pkg-config, - rustc, - wrapGAppsHook4, - dav1d, + desktop-file-utils, gst_all_1, gtk4, libadwaita, libwebp, + meson, + ninja, + pkg-config, + nix-update-script, + wrapGAppsHook4, }: stdenv.mkDerivation rec { From 6fc7779cf3e5f538902f6238c54a50270c015751 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 26 Jun 2024 14:01:40 +0200 Subject: [PATCH 16/47] audit.tests.musl: init This would have caught the build regression introduced by c01ada8c551f ("audit: 3.1.2 -> 4.0") and fixed by 8fbb95ca8dea ("pkgsMusl.audit: fix build"). --- pkgs/os-specific/linux/audit/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 846d21c56d83..00afda1c605d 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -8,6 +8,7 @@ , linuxHeaders , python3 , swig +, pkgsCross # Enabling python support while cross compiling would be possible, but the # configure script tries executing python to gather info instead of relying on @@ -74,6 +75,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + passthru.tests = { + musl = pkgsCross.musl64.audit; + }; + meta = { homepage = "https://people.redhat.com/sgrubb/audit/"; description = "Audit Library"; From da5f6bea42eabaf3951b257bad11aea5c6020c0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jun 2024 03:17:31 +0000 Subject: [PATCH 17/47] nwg-drawer: 0.4.8 -> 0.4.9 --- pkgs/by-name/nw/nwg-drawer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 000d86b4baf4..103ba6431541 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -12,13 +12,13 @@ let pname = "nwg-drawer"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-ZfWl9DfU8h300WbvFNOCs7QGp11NB49ShPRxY5hpNFE="; + hash = "sha256-KhgALKJNS7Y+u5pAfpvTup0W1+Vi6r1uaVFQZRiv4Dk="; }; vendorHash = "sha256-J7r3YyfV5lRZbjKo7ZNHQrOqR1GNbUB7GxRMlXuuw/c="; From a271dcc6762a0c105084f5ea136a9b7ba8842740 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:23:24 +0200 Subject: [PATCH 18/47] linuxPackages_latest.prl-tools: 19.4.0-54962 -> 19.4.1-54985 --- pkgs/os-specific/linux/prl-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 3a3016d14b4b..664e499cd1d4 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.4.0-54962"; + version = "19.4.1-54985"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-c/MrWUvwY/Z38uOBbetJSVkZlwkdzFhw6wpk1L0BuQs="; + hash = "sha256-VBHCsxaMI6mfmc/iQ4hJW/592rKck9HilTX2Hq7Hb5s="; }; hardeningDisable = [ "pic" "format" ]; From fcd81d08436cb20475d834cb3cf54cdb4f55c3a0 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:52:45 +0530 Subject: [PATCH 19/47] gnome-clocks: rec -> finalAttrs, nixfmt-rfc-style --- .../gnome/apps/gnome-clocks/default.nix | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 5bdbe12f705a..205c5db75c01 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -1,34 +1,35 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, gettext -, pkg-config -, wrapGAppsHook4 -, itstool -, desktop-file-utils -, vala -, libxml2 -, gtk4 -, glib -, sound-theme-freedesktop -, gsettings-desktop-schemas -, gnome-desktop -, geocode-glib_2 -, gnome -, gdk-pixbuf -, geoclue2 -, libgweather -, libadwaita +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + gettext, + pkg-config, + wrapGAppsHook4, + itstool, + desktop-file-utils, + vala, + libxml2, + gtk4, + glib, + sound-theme-freedesktop, + gsettings-desktop-schemas, + gnome-desktop, + geocode-glib_2, + gnome, + gdk-pixbuf, + geoclue2, + libgweather, + libadwaita, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-clocks"; version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz"; hash = "sha256-6qPFeM3O+XVOZotWJnCbc/NSZxAjX0tyB20v9JpPmcc="; }; @@ -72,12 +73,12 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { homepage = "https://apps.gnome.org/Clocks/"; description = "Clock application designed for GNOME 3"; mainProgram = "gnome-clocks"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.unix; + maintainers = lib.teams.gnome.members; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; -} +}) From 379dd4aec6adb74bbf5d83e664aad8b255adf529 Mon Sep 17 00:00:00 2001 From: Redyf Date: Thu, 4 Jul 2024 16:38:19 -0300 Subject: [PATCH 20/47] affine: 0.14.9 -> 0.15.2 --- pkgs/by-name/af/affine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 0ca723e85af3..1717de9bc934 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -18,10 +18,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let }; in { pname = "affine"; - version = "0.14.9"; + version = "0.15.2"; src = fetchurl { url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-JGWkmvcdgkvWDAffInzf2lUFHVjkU/a4m25f8BtQqZc="; + hash = "sha256-Nu5s/0sP4exRtfjd058tD5jzDezPHnHjm5CJxOLJvVE="; }; nativeBuildInputs = [ copyDesktopItems From 01831dd339c6f76aec740d68280c15b273fb95c2 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 5 Jul 2024 13:10:17 +0800 Subject: [PATCH 21/47] soundconverter: format with nixfmt-rfc-style --- .../audio/soundconverter/default.nix | 64 ++++++++++++------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index 27238e36d088..e495ef18391f 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -1,9 +1,19 @@ -{ lib, fetchurl -# Optional due to unfree license. -, faacSupport ? false -, glib, python3Packages, gtk3, wrapGAppsHook3 -, gsettings-desktop-schemas, intltool, xvfb-run -, gobject-introspection, gst_all_1, fdk-aac-encoder }: +{ + lib, + fetchurl, + # Optional due to unfree license. + faacSupport ? false, + glib, + python3Packages, + gtk3, + wrapGAppsHook3, + gsettings-desktop-schemas, + intltool, + xvfb-run, + gobject-introspection, + gst_all_1, + fdk-aac-encoder, +}: python3Packages.buildPythonApplication rec { pname = "soundconverter"; @@ -37,9 +47,7 @@ python3Packages.buildPythonApplication rec { python3Packages.pygobject3 ]; - nativeCheckInputs = [ - xvfb-run - ]; + nativeCheckInputs = [ xvfb-run ]; postPatch = '' substituteInPlace bin/soundconverter --replace \ @@ -47,19 +55,31 @@ python3Packages.buildPythonApplication rec { "DATA_PATH = '$out/share/soundconverter'" ''; - preCheck = let - self = { outPath = "$out"; name = "${pname}-${version}"; }; - xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath; - in '' - export HOME=$TMPDIR - export XDG_DATA_DIRS=$XDG_DATA_DIRS:${xdgPaths [gtk3 gsettings-desktop-schemas self]} - # FIXME: Fails due to weird Gio.file_parse_name() behavior. - sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py - '' + lib.optionalString (!faacSupport) '' - substituteInPlace tests/testcases/integration.py --replace \ - "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ - "for encoder in ['fdkaacenc', 'avenc_aac']:" - ''; + preCheck = + let + self = { + outPath = "$out"; + name = "${pname}-${version}"; + }; + xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath; + in + '' + export HOME=$TMPDIR + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${ + xdgPaths [ + gtk3 + gsettings-desktop-schemas + self + ] + } + # FIXME: Fails due to weird Gio.file_parse_name() behavior. + sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py + '' + + lib.optionalString (!faacSupport) '' + substituteInPlace tests/testcases/integration.py --replace \ + "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ + "for encoder in ['fdkaacenc', 'avenc_aac']:" + ''; checkPhase = '' runHook preCheck From af33ff24a8c2dc1847a3c9657f5d60d13188e699 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 5 Jul 2024 13:22:42 +0800 Subject: [PATCH 22/47] soundconverter: 4.0.3 -> 4.0.5 --- .../audio/soundconverter/default.nix | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index e495ef18391f..0c1ac2e2476f 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -1,8 +1,8 @@ { lib, - fetchurl, # Optional due to unfree license. faacSupport ? false, + fetchFromGitHub, glib, python3Packages, gtk3, @@ -17,11 +17,13 @@ python3Packages.buildPythonApplication rec { pname = "soundconverter"; - version = "4.0.3"; + version = "4.0.5"; - src = fetchurl { - url = "https://launchpad.net/soundconverter/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "sha256-hzIG/4LD3705erPYvXb7uoRwF9LtKKIKB3jrhpYMsZ0="; + src = fetchFromGitHub { + owner = "kassoulet"; + repo = "soundconverter"; + rev = version; + hash = "sha256-sno5EOh8HHfBTIE67VA8mheYp5wUMFRCbcS2EtKES3c="; }; buildInputs = [ @@ -40,11 +42,11 @@ python3Packages.buildPythonApplication rec { gobject-introspection ]; - propagatedBuildInputs = [ - python3Packages.gst-python - python3Packages.distutils-extra - python3Packages.setuptools - python3Packages.pygobject3 + dependencies = with python3Packages; [ + gst-python + distutils-extra + setuptools + pygobject3 ]; nativeCheckInputs = [ xvfb-run ]; @@ -76,7 +78,7 @@ python3Packages.buildPythonApplication rec { sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py '' + lib.optionalString (!faacSupport) '' - substituteInPlace tests/testcases/integration.py --replace \ + substituteInPlace tests/testcases/gui_integration.py --replace \ "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ "for encoder in ['fdkaacenc', 'avenc_aac']:" ''; @@ -90,7 +92,13 @@ python3Packages.buildPythonApplication rec { # Necessary to set GDK_PIXBUF_MODULE_FILE. strictDeps = false; - meta = with lib; { + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { homepage = "https://soundconverter.org/"; description = "Leading audio file converter for the GNOME Desktop"; mainProgram = "soundconverter"; @@ -99,8 +107,8 @@ python3Packages.buildPythonApplication rec { and writes WAV, FLAC, MP3, AAC and Ogg Vorbis files. Uses Python and GTK+ GUI toolkit, and runs on X Window System. ''; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ jakubgs ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jakubgs ]; }; } From 14cb110d94705710029d1a660ca0b26a402a43cb Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 5 Jul 2024 13:27:05 +0800 Subject: [PATCH 23/47] soundconverter: add aleksana to maintainers --- pkgs/applications/audio/soundconverter/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index 0c1ac2e2476f..5e5303bb1da3 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -109,6 +109,9 @@ python3Packages.buildPythonApplication rec { ''; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jakubgs ]; + maintainers = with lib.maintainers; [ + jakubgs + aleksana + ]; }; } From 5afaa83ee023870a1ced8914341ea01400d2f092 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 5 Jul 2024 12:04:41 +0200 Subject: [PATCH 24/47] python312Packages.unicurses: 3.0.0 -> 3.1.2 --- pkgs/development/python-modules/unicurses/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/unicurses/default.nix b/pkgs/development/python-modules/unicurses/default.nix index 273fc56d4b81..bdb2a33f8109 100644 --- a/pkgs/development/python-modules/unicurses/default.nix +++ b/pkgs/development/python-modules/unicurses/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "unicurses"; - version = "3.0.0"; + version = "3.1.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "Uni-Curses"; - hash = "sha256-ZJUKWxu2cQlFGN1RNtyDacwSOtBiUKzk9SIDD0IQiuU="; + hash = "sha256-M4mjdmy2NSf5KiTVYznPy86bVgZB5u1vDi6GIH1Frc4="; }; propagatedBuildInputs = [ x256 ]; @@ -22,8 +22,8 @@ buildPythonPackage rec { # Necessary because ctypes.util.find_library does not find the ncurses libraries postPatch = '' substituteInPlace './unicurses/__init__.py' \ - --replace "find_library('ncursesw')" '"${ncurses}/lib/libncursesw.so.6"' \ - --replace "find_library('panelw')" '"${ncurses}/lib/libpanelw.so.6"' + --replace-fail "find_library('ncursesw')" '"${ncurses}/lib/libncursesw.so.6"' \ + --replace-fail "find_library('panelw')" '"${ncurses}/lib/libpanelw.so.6"' ''; pythonImportsCheck = [ "unicurses" ]; From 65bab2dcdb7567dbbe832530d461ebab53de1519 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 26 May 2022 23:15:46 +0200 Subject: [PATCH 25/47] ossia-score: init at 3.2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sandro Co-authored-by: Jean-Michaël Celerier Co-authored-by: Rémi NICOLE --- pkgs/by-name/os/ossia-score/package.nix | 159 ++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 pkgs/by-name/os/ossia-score/package.nix diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix new file mode 100644 index 000000000000..9dca52e18195 --- /dev/null +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -0,0 +1,159 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, ninja +, clangStdenv +, pkg-config +, alsa-lib +, avahi +, avahi-compat +, bluez +, boost185 +, fmt +, ffmpeg +, fftw +, flac +, git +, gnutls +, lame +, libcoap +, libjack2 +, libopus +, libsamplerate +, libsndfile +, libvorbis +, lilv +, lv2 +, mpg123 +, pipewire +, portaudio +, qt6 +, rapidfuzz-cpp +, re2 +, rubberband +, snappy +, SDL2 +, spdlog +, suil +, udev +}: + +# TODO: figure out LLVM jit +# assert lib.versionAtLeast llvm.version "15"; + +stdenv.mkDerivation (finalAttrs: { + pname = "ossia-score"; + version = "3.2.3-3"; + + src = fetchFromGitHub { + owner = "ossia"; + repo = "score"; + rev = "v3.2.3-3"; + hash = "sha256-xRqsMKwuejbl+5ljYMFhQv/j1MfnFH5MGIn9rCQG/ro="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ninja git pkg-config qt6.qttools qt6.wrapQtAppsHook ]; + + buildInputs = [ + alsa-lib + boost185 + avahi + avahi-compat + bluez + ffmpeg + fftw + flac + fmt + gnutls + lame + libcoap + libjack2 + libopus + libsamplerate + libsndfile + libvorbis + lilv + lv2 + mpg123 + pipewire + portaudio + qt6.qtbase + qt6.qtdeclarative + qt6.qtserialport + qt6.qtscxml + qt6.qtshadertools + qt6.qtsvg + qt6.qtwayland + qt6.qtwebsockets + rapidfuzz-cpp + re2 + rubberband + snappy + SDL2 + spdlog + suil + udev + ]; + + cmakeFlags = [ + "-Wno-dev" + + "-DSCORE_DEPLOYMENT_BUILD=1" + "-DSCORE_STATIC_PLUGINS=1" + "-DSCORE_FHS_BUILD=1" + "-DCMAKE_UNITY_BUILD=1" + "-DCMAKE_SKIP_RPATH=ON" + "-DOSSIA_USE_SYSTEM_LIBRARIES=1" + "-DSCORE_USE_SYSTEM_LIBRARIES=1" + + "-DLilv_INCLUDE_DIR=${lilv.dev}/include/lilv-0" + "-DSuil_INCLUDE_DIR=${suil}/include/suil-0" + ]; + + # Needed for libraries that get dlopen'd + env.NIX_LDFLAGS = toString [ + "-lasound" + "-llilv-0" + "-lsuil-0" + "-lsndfile" + "-lpipewire-0.3" + "-lfftw3" + "-lfftw3_threads" + "-ludev" + ]; + + runtimeDependencies = [ + alsa-lib + avahi + avahi-compat + bluez + fftw + lilv + suil + pipewire + udev + ]; + + installPhase = '' + runHook preInstall + + cmake -DCMAKE_INSTALL_DO_STRIP=1 -DCOMPONENT=OssiaScore -P cmake_install.cmake + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://ossia.io/score/about.html"; + description = "Sequencer for audio-visual artists"; + longDescription = '' + ossia score is a sequencer for audio-visual artists, designed to enable + the creation of interactive shows, museum installations, intermedia + digital artworks, interactive music and more in an intuitive user interface. + ''; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jcelerier minijackson ]; + }; +}) From 703ed7b56a55b154bfa2175b97a488059c56f5a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jul 2024 15:44:53 +0000 Subject: [PATCH 26/47] python311Packages.molecule: 24.6.0 -> 24.6.1 --- pkgs/development/python-modules/molecule/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 84cbbf48157b..e2861df3571f 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.6.0"; + version = "24.6.1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-jey0xoT8r7hae08DjaEl7UJb3RDbdr8M20E/m4TkG1g="; + hash = "sha256-QcGQOllyl8JgK9BZ4Qe17y4yydokeX3LeP+Yc8ZhXuY="; }; nativeBuildInputs = [ From c1b45f60b04ec307c2b4a23e4ded36cc5efde351 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Fri, 5 Jul 2024 12:29:37 -0400 Subject: [PATCH 27/47] maintainers: update gracicot --- maintainers/maintainer-list.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6d3fd131861d..457838e3130c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7536,7 +7536,8 @@ name = "Yacine Hmito"; }; gracicot = { - email = "gracicot42@gmail.com"; + email = "dev@gracicot.com"; + matrix = "@gracicot-59e8f173d73408ce4f7ac803:gitter.im"; github = "gracicot"; githubId = 2906673; name = "Guillaume Racicot"; From 0c00ad14acbef5f64476b473e9ba035ad504d3a1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 5 Jul 2024 21:54:07 +0300 Subject: [PATCH 28/47] defaultCrateOverrides: fix some gtk dependencies - gobject-sys and gio-sys need pkg-config - add gtkx11-sys - add javascriptcore-rs-sys - add soup3-sys - add webkit2gtk-sys --- .../rust/default-crate-overrides.nix | 115 +++++++++++------- 1 file changed, 74 insertions(+), 41 deletions(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d8f1bfaf4447..f974ff3adc33 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,46 +1,48 @@ { lib , stdenv -, atk -, pkg-config -, curl -, darwin -, libgit2 -, gtk3 -, libssh2 -, openssl -, sqlite -, zlib -, dbus -, dbus-glib -, gdk-pixbuf -, cairo -, python3 -, libsodium -, postgresql -, gmp -, gobject-introspection -, foundationdb -, capnproto -, nettle -, gtk4 -, clang -, llvmPackages -, linux-pam -, pango -, cmake -, glib -, freetype -, fontconfig -, rdkafka -, udev -, libevdev , alsa-lib -, graphene -, protobuf +, atk , autoconf , automake +, cairo +, capnproto +, clang +, cmake +, curl +, darwin +, dbus +, dbus-glib +, fontconfig +, foundationdb +, freetype +, gdk-pixbuf +, glib +, gmp +, gobject-introspection +, graphene +, gtk3 +, gtk4 +, libevdev +, libgit2 +, libsodium +, libsoup_3 +, libssh2 , libtool +, linux-pam +, llvmPackages +, nettle +, openssl +, pango +, pkg-config +, postgresql +, protobuf +, python3 +, rdkafka , seatd # =libseat +, sqlite +, udev +, webkitgtk_4_1 +, zlib , ... }: @@ -93,7 +95,10 @@ in nativeBuildInputs = [ pkg-config ] ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [ - python3 autoconf automake libtool + python3 + autoconf + automake + libtool ]; buildInputs = [ libevdev ]; @@ -132,21 +137,34 @@ in }; gobject-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus-glib ]; }; gio-sys = attrs: { - buildInputs = [ dbus-glib ]; - }; - - gdk-pixbuf-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus-glib ]; }; gdk-pixbuf = attrs: { + buildInputs = [ dbus-glib gdk-pixbuf ]; + }; + + gdk-pixbuf-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdk-pixbuf ]; }; + gdk-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; # libgdk-3 + }; + + gdkx11-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; + }; + gtk-sys = attrs: { buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkg-config ]; @@ -203,6 +221,11 @@ in buildInputs = [ graphene ]; }; + javascriptcore-rs-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ webkitgtk_4_1 ]; + }; + nettle-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle clang ]; @@ -302,6 +325,11 @@ in buildInputs = [ freetype fontconfig ]; }; + soup3-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libsoup_3 ]; + }; + thrussh-libsodium = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium ]; @@ -311,6 +339,11 @@ in nativeBuildInputs = [ protobuf ]; }; + webkit2gtk-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ webkitgtk_4_1 ]; + }; + xcb = attrs: { buildInputs = [ python3 ]; }; From a958eba9df42492d3f4e262e83062e7f2303401d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 5 Jul 2024 23:06:15 +0200 Subject: [PATCH 29/47] python311Packages.shimmy: disable failing test --- pkgs/development/python-modules/shimmy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/shimmy/default.nix b/pkgs/development/python-modules/shimmy/default.nix index f1db250e1de2..b50135e517bf 100644 --- a/pkgs/development/python-modules/shimmy/default.nix +++ b/pkgs/development/python-modules/shimmy/default.nix @@ -53,6 +53,9 @@ buildPythonPackage rec { ]; disabledTestPaths = [ + # Requires unpackaged labmaze + "tests/test_dm_control_multi_agent.py" + # Requires unpackaged pyspiel "tests/test_openspiel.py" From d785d89506713d739f285f80a8411eb5ff90a9b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jul 2024 21:45:32 +0000 Subject: [PATCH 30/47] cargo-show-asm: 0.2.37 -> 0.2.38 --- pkgs/development/tools/rust/cargo-show-asm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 1278a60cf213..02823914e15a 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.37"; + version = "0.2.38"; src = fetchCrate { inherit pname version; - hash = "sha256-doN4oL7ZRuORgVsPFMY57zRFwz4m2BqgEgNvnf4t5cU="; + hash = "sha256-CYnW6wv4aL/Qs6IwPaRi9w8/iNMo5to0J3z4zTdgHaE="; }; - cargoHash = "sha256-QWMsDUBJZgXXd20FYDpJYXxofhT7YohTV0hiHePww1o="; + cargoHash = "sha256-jRsxP4b1URTDcnp8VsZvSTaPNOBBwq570eCn2jfQSGg="; nativeBuildInputs = [ installShellFiles From a96a6ef5bea9260ccc121b3268e441e2b084ab23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jul 2024 23:04:01 +0000 Subject: [PATCH 31/47] pyright: 1.1.369 -> 1.1.370 --- pkgs/by-name/py/pyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 6ab92197c131..8d53e6cd0a38 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.369"; + version = "1.1.370"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-YAv+2QiArHoZrLNisCFaBNhqQm5uHJdtil0w4xtLl4k="; + hash = "sha256-IYQ6HUEaT3KjMcFeWal4Ru2A/Kxf7sAMZ1p48l9RQ2o="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-xnS7guT8E/wHk3d2ESve4HgMPfH/NuP5TsnsGlvQtUI="; + npmDepsHash = "sha256-P57+FEyjsHXwZ3A91bfecCuXvkrrwqsRHMjV3oGt1Nw="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-ijG0thy0YPPrgMYCJrRqIXkexuHVKcXX7PxPpCJbsg8="; + npmDepsHash = "sha256-tLRSGuJMKAKvTsmERI7SyQXamAJPi/h4P/wQEo4HdtY="; postPatch = '' chmod +w ../../ From f2bcf7aa6a962619070a697a0c15134862647033 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 25 May 2024 11:21:22 +0200 Subject: [PATCH 32/47] stu: init at 0.4.2 --- pkgs/by-name/st/stu/package.nix | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/st/stu/package.nix diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix new file mode 100644 index 000000000000..a772e7a8d802 --- /dev/null +++ b/pkgs/by-name/st/stu/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + darwin, + stu, + testers, +}: +let + version = "0.4.2"; +in +rustPlatform.buildRustPackage { + pname = "stu"; + inherit version; + + src = fetchFromGitHub { + owner = "lusingander"; + repo = "stu"; + rev = "v${version}"; + hash = "sha256-T5b3aCepUj8COrKReEaK4JeUbR7Sv7022xSCW8k8Iow="; + }; + + cargoHash = "sha256-DFG/9bnckqLezbitceLtM3CSnKAcQcZlv39VfbkyM/w="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreGraphics + ]; + + passthru.tests.version = testers.testVersion { package = stu; }; + + meta = { + description = "Terminal file explorer for S3 buckets"; + changelog = "https://github.com/lusingander/stu/releases/tag/v${version}"; + homepage = "https://lusingander.github.io/stu/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Nebucatnetzer ]; + mainProgram = "stu"; + }; +} From a318fec1da6609e3d454090c6f31852e59c99aa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 00:27:21 +0000 Subject: [PATCH 33/47] cargo-run-bin: 1.7.2 -> 1.7.3 --- pkgs/development/tools/rust/cargo-run-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix index a12ebb8caf9b..e72f5d074273 100644 --- a/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ b/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-run-bin"; - version = "1.7.2"; + version = "1.7.3"; src = fetchCrate { inherit pname version; - hash = "sha256-VhDCOTabj/HHc6bYdAUOErvxXOzyY3+e7GccZcb1cSQ="; + hash = "sha256-VMlia5EEnNiNkOzwdTZwoaKtAxHz5xAxxnGlGoSbD80="; }; - cargoHash = "sha256-riWWxv3FsBrgzVUWGtKvV4WjhgsXImLpiS9EJ40kCn8="; + cargoHash = "sha256-DFsDUoYq+TE8ifwQIl5YfoeUl8udIf1z35rFmLe/4To="; # multiple impurities in tests doCheck = false; From da09cb8621e0b80cefd05d486c2e84144ca870fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 00:45:36 +0000 Subject: [PATCH 34/47] broot: 1.39.0 -> 1.39.1 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5fda81cf80b4..10c87dde327b 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.39.0"; + version = "1.39.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-OmkO7qZ8l9HvSJFGNgTeCo/gS17fF0edfOc8wvf29/I="; + hash = "sha256-cKCIKyXYtDfW3UTTr6QL7Gh/bfb9aZAFRptaP2zdcxc="; }; - cargoHash = "sha256-lfFv8NF5nID96tCcLB7bXnDfAyrjoXhnBa2QDHz3nY4="; + cargoHash = "sha256-JsMgToSzvf3JcVLz5a6kygtxhrU8YSYrHrwbMRhQ1uw="; nativeBuildInputs = [ installShellFiles From 2d875a16aa73e0c38461a861688b9ec356c0d2e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 00:57:48 +0000 Subject: [PATCH 35/47] gabutdm: 2.2.8 -> 2.5.0 --- pkgs/by-name/ga/gabutdm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gabutdm/package.nix b/pkgs/by-name/ga/gabutdm/package.nix index 4458efcce5f4..32da32be0361 100644 --- a/pkgs/by-name/ga/gabutdm/package.nix +++ b/pkgs/by-name/ga/gabutdm/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gabutdm"; - version = "2.2.8"; + version = "2.5.0"; src = fetchFromGitHub { owner = "gabutakut"; repo = "gabutdm"; rev = version; - hash = "sha256-HF+zBDkA9fYauLUYsvJJxcRggHu+5qH4rm0IM/tL9Hc="; + hash = "sha256-0PBNKacgKT5xcd0mnn0y9ltmxEAbP+S7MLtt/Zau8vs="; }; nativeBuildInputs = [ From 0e73d1b03bf6dfe17dcef357821fbf0910dfb0e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 03:12:30 +0000 Subject: [PATCH 36/47] intel-gmmlib: 22.4.0 -> 22.4.1 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 155fca30b00b..f685a571de0c 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.4.0"; + version = "22.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-8Tjc7rm38pgRE/8ZXRLOqazZHmj5jQJFooSe31Chpww="; + sha256 = "sha256-z8FPSqWlSubtt+gurntWnkeKsdO2B+KZXTv2Y+TL7t4="; }; nativeBuildInputs = [ cmake ]; From 01c1caa8a7f86b596f983ba55a8ff13c86bed575 Mon Sep 17 00:00:00 2001 From: Wulfsta Date: Sat, 6 Jul 2024 00:04:01 -0400 Subject: [PATCH 37/47] gerbolyze: 3.1.8 -> 3.1.9 --- pkgs/by-name/ge/gerbolyze/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix index cdd489da8b5f..963f578dfe51 100644 --- a/pkgs/by-name/ge/gerbolyze/package.nix +++ b/pkgs/by-name/ge/gerbolyze/package.nix @@ -7,12 +7,12 @@ }: let - version = "3.1.8"; + version = "3.1.9"; src = fetchFromGitHub { owner = "jaseg"; repo = "gerbolyze"; rev = "v${version}"; - hash = "sha256-uF06aU9zT7LjYHreQ8aFQKn/wAesS31LvzHBgD50LfQ="; + hash = "sha256-bisLln3Y239HuJt0MkrCU+6vLLbEDxfTjEJMkcbE/wE="; fetchSubmodules = true; }; From 01f7c8a1a317171a5a1b84086e955e0c28900523 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 2 Jul 2024 23:22:46 -0300 Subject: [PATCH 38/47] nv-codec-headers: recreate under by-name This commit merely deletes the old directory, creates the new files in the new location and rewrite the overrides. The whole change needs to be made "atomically", since it is not pratical to create intermediate steps that compile cleanly. --- pkgs/by-name/nv/nv-codec-headers/package.nix | 38 +++++++++++++++++ pkgs/by-name/nv/nv-codec-headers/sources.nix | 42 +++++++++++++++++++ .../libraries/nv-codec-headers/default.nix | 32 -------------- .../make-nv-codec-headers.nix | 32 -------------- pkgs/top-level/all-packages.nix | 14 ++----- 5 files changed, 84 insertions(+), 74 deletions(-) create mode 100644 pkgs/by-name/nv/nv-codec-headers/package.nix create mode 100644 pkgs/by-name/nv/nv-codec-headers/sources.nix delete mode 100644 pkgs/development/libraries/nv-codec-headers/default.nix delete mode 100644 pkgs/development/libraries/nv-codec-headers/make-nv-codec-headers.nix diff --git a/pkgs/by-name/nv/nv-codec-headers/package.nix b/pkgs/by-name/nv/nv-codec-headers/package.nix new file mode 100644 index 000000000000..cb0c222434ce --- /dev/null +++ b/pkgs/by-name/nv/nv-codec-headers/package.nix @@ -0,0 +1,38 @@ +{ + lib, + callPackage, + stdenvNoCC, + # Configurable options + sources ? callPackage ./sources.nix { }, + majorVersion ? "9", +}: + +let + pick = { + "8" = sources.nv-codec-headers-8; + "9" = sources.nv-codec-headers-9; + "10" = sources.nv-codec-headers-10; + "11" = sources.nv-codec-headers-11; + "12" = sources.nv-codec-headers-12; + }.${majorVersion}; +in +stdenvNoCC.mkDerivation { + inherit (pick) pname version src; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + passthru = { + inherit sources; + }; + + meta = { + description = "FFmpeg version of headers for NVENC - version ${pick.version}"; + homepage = "https://ffmpeg.org/"; + downloadPage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/nv/nv-codec-headers/sources.nix b/pkgs/by-name/nv/nv-codec-headers/sources.nix new file mode 100644 index 000000000000..cc3d1bce5a61 --- /dev/null +++ b/pkgs/by-name/nv/nv-codec-headers/sources.nix @@ -0,0 +1,42 @@ +{ + fetchgit, +}: + +let + nv-codec-headers-template = + { + version, + hash, + }: + { + pname = "nv-codec-headers"; + inherit version; + src = fetchgit { + url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; + rev = "n${version}"; + inherit hash; + }; + }; +in +{ + nv-codec-headers-8 = nv-codec-headers-template { + version = "8.2.15.2"; + hash = "sha256-TKYT8vXqnUpq+M0grDeOR37n/ffqSWDYTrXIbl++BG4="; + }; + nv-codec-headers-9 = nv-codec-headers-template { + version = "9.1.23.1"; + hash = "sha256-kF5tv8Nh6I9x3hvSAdKLakeBVEcIiXFY6o6bD+tY2/U="; + }; + nv-codec-headers-10 = nv-codec-headers-template { + version = "10.0.26.2"; + hash = "sha256-BfW+fmPp8U22+HK0ZZY6fKUjqigWvOBi6DmW7SSnslg="; + }; + nv-codec-headers-11 = nv-codec-headers-template { + version = "11.1.5.2"; + hash = "sha256-KzaqwpzISHB7tSTruynEOJmSlJnAFK2h7/cRI/zkNPk="; + }; + nv-codec-headers-12 = nv-codec-headers-template { + version = "12.1.14.0"; + hash = "sha256-WJYuFmMGSW+B32LwE7oXv/IeTln6TNEeXSkquHh85Go="; + }; +} diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix deleted file mode 100644 index b582548d79f5..000000000000 --- a/pkgs/development/libraries/nv-codec-headers/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, fetchgit -, stdenvNoCC -}: - -let - make-nv-codec-headers = (import ./make-nv-codec-headers.nix) { - inherit lib fetchgit stdenvNoCC; - }; -in -{ - nv-codec-headers-8 = make-nv-codec-headers { - version = "8.2.15.2"; - hash = "sha256-TKYT8vXqnUpq+M0grDeOR37n/ffqSWDYTrXIbl++BG4="; - }; - nv-codec-headers-9 = make-nv-codec-headers { - version = "9.1.23.1"; - hash = "sha256-kF5tv8Nh6I9x3hvSAdKLakeBVEcIiXFY6o6bD+tY2/U="; - }; - nv-codec-headers-10 = make-nv-codec-headers { - version = "10.0.26.2"; - hash = "sha256-BfW+fmPp8U22+HK0ZZY6fKUjqigWvOBi6DmW7SSnslg="; - }; - nv-codec-headers-11 = make-nv-codec-headers { - version = "11.1.5.2"; - hash = "sha256-KzaqwpzISHB7tSTruynEOJmSlJnAFK2h7/cRI/zkNPk="; - }; - nv-codec-headers-12 = make-nv-codec-headers { - version = "12.1.14.0"; - hash = "sha256-WJYuFmMGSW+B32LwE7oXv/IeTln6TNEeXSkquHh85Go="; - }; -} diff --git a/pkgs/development/libraries/nv-codec-headers/make-nv-codec-headers.nix b/pkgs/development/libraries/nv-codec-headers/make-nv-codec-headers.nix deleted file mode 100644 index b6bdc6dd58d7..000000000000 --- a/pkgs/development/libraries/nv-codec-headers/make-nv-codec-headers.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, stdenvNoCC -, fetchgit -}: - -{ pname ? "nv-codec-headers" -, version -, hash -}: - -stdenvNoCC.mkDerivation { - inherit pname version; - - src = fetchgit { - url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; - rev = "n${version}"; - inherit hash; - }; - - makeFlags = [ - "PREFIX=$(out)" - ]; - - meta = { - description = "FFmpeg version of headers for NVENC"; - homepage = "https://ffmpeg.org/"; - downloadPage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c89f81fca4e2..40d992c624dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23353,16 +23353,10 @@ with pkgs; nuspell = callPackage ../development/libraries/nuspell { }; nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; - # splicing magic - nv-codec-headers-versions = callPackages ../development/libraries/nv-codec-headers { }; - inherit (nv-codec-headers-versions) - nv-codec-headers-9 - nv-codec-headers-10 - nv-codec-headers-11 - nv-codec-headers-12 - ; - # A default nv-codec-headers to make people happy - nv-codec-headers = nv-codec-headers-versions.nv-codec-headers-9; + nv-codec-headers-9 = nv-codec-headers.override { majorVersion = "9"; }; + nv-codec-headers-10 = nv-codec-headers.override { majorVersion = "10"; }; + nv-codec-headers-11 = nv-codec-headers.override { majorVersion = "11"; }; + nv-codec-headers-12 = nv-codec-headers.override { majorVersion = "12"; }; nvidiaCtkPackages = callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix From ea6879f611816fb69dd77301cdb31c046e028705 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:39:02 +0530 Subject: [PATCH 39/47] gnome-clocks: update description not a GNOME 3 app anymore --- pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 205c5db75c01..ae7a6fb5091a 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -75,7 +75,16 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://apps.gnome.org/Clocks/"; - description = "Clock application designed for GNOME 3"; + description = "A simple and elegant clock application for GNOME"; + longDescription = '' + A simple and elegant clock application. It includes world clocks, alarms, + a stopwatch, and timers. + + - Show the time in different cities around the world + - Set alarms to wake you up + - Measure elapsed time with an accurate stopwatch + - Set timers to properly cook your food + ''; mainProgram = "gnome-clocks"; maintainers = lib.teams.gnome.members; license = lib.licenses.gpl2Plus; From fe3921b7e00594b4326595b97b38ce0a311e715a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 05:32:08 +0000 Subject: [PATCH 40/47] nezha-agent: 0.17.2 -> 0.17.3 --- pkgs/by-name/ne/nezha-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index f96b06f2e927..0c50dc4ecef2 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "refs/tags/v${version}"; - hash = "sha256-PUBomSo11URCCJB/qFeSHSS3pw/vvcgDBo9Kc0lJQLE="; + hash = "sha256-dnmoGf9z7R14Fen7maQyk/H600Hgkx7esGWvjddLDMc="; }; - vendorHash = "sha256-wVZWP8yvazxs8sG47MTOlWzKwjsZO/b7PN987fwWEaY="; + vendorHash = "sha256-SLF5Oq++VzKzy6mfqJuRlAJMBXyb1EHWN+qoyCw9kv4="; ldflags = [ "-s" From d61ae81374e634293a2cc23345b2fa8233a92fa6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jul 2024 02:50:43 +0000 Subject: [PATCH 41/47] grafana-loki: 3.0.0 -> 3.1.0 --- pkgs/servers/monitoring/loki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 0cf35895ca6c..e0036633399a 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -10,14 +10,14 @@ }: buildGoModule rec { - version = "3.0.0"; + version = "3.1.0"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-2+OST6bKIjuhrXJKA+8vUERKT1/min7tN8oFxKn3L74="; + hash = "sha256-HISDW6qxpfJpOFweUQo6T+8aV5mvB3o3jnx8CZxweJo="; }; vendorHash = null; From de49883a28ed843fc802d8c8b4b9d9a6a5dd7a5d Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 6 Jul 2024 11:02:54 +0530 Subject: [PATCH 42/47] grafana-loki: add new subpackage --- pkgs/servers/monitoring/loki/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index e0036633399a..febeccee760c 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -28,6 +28,7 @@ buildGoModule rec { "cmd/loki-canary" "clients/cmd/promtail" "cmd/logcli" + "cmd/lokitool" ]; tags = ["promtail_journal_enabled"]; From 5041afcd2b075aad48f4336668b129cd318edc8b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 5 Jul 2024 11:00:47 +0200 Subject: [PATCH 43/47] crosvm: 125.0 -> 126.0 The musl test fails on x86_64 at the moment because mesa doesn't build for x86_64-unknown-linux-musl from x86_64-unknown-linux-gnu, but I've checked that crosvm builds for musl on x86_64 with a native build. --- .../virtualization/crosvm/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index d2fda361660e..cc6b7f269c69 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchgit, fetchpatch +{ lib, rustPlatform, fetchgit , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols , pkgsCross @@ -6,27 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "125.0"; + version = "126.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "6a7ff1ecb7fad6820d3bbfe8b11e65854059aba5"; - hash = "sha256-y/vHU8i9YNbzSHla853z/2w914mVMFOryyaHE1uxlvM="; + rev = "5533201f3ff3230d121e06100557d369c055e6dc"; + hash = "sha256-Ufi8dIhNgXvD53PWLG2uj7CD37UZIegrqAQz3wTKTvE="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "musl.patch"; - url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/128e591037c0be0362ed814d0b5583aa65ff09e1%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-p5VzHRb0l0vCJNe48cRl/uBYHwTQMEykMcBOMzL3yaY="; - }) - ]; - separateDebugInfo = true; - cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE="; + cargoHash = "sha256-E2lyBgptQs+/5JS2WJc4ietguXdK16DFEVzqylmX+Pk="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner From 6ce62cbe08aafb6c3b09c240a0e6bd13290459f4 Mon Sep 17 00:00:00 2001 From: Marcel Date: Mon, 15 Jan 2024 14:14:01 +0100 Subject: [PATCH 44/47] maintainers: add marcel --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4eadf6503a8a..09a56d7d2364 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12261,6 +12261,12 @@ githubId = 30078229; name = "marble"; }; + marcel = { + email = "me@m4rc3l.de"; + github = "MarcelCoding"; + githubId = 34819524; + name = "Marcel"; + }; marcovergueira = { email = "vergueira.marco@gmail.com"; github = "marcovergueira"; From adea7527ccf355b6485e6fa3f781bc58ef1a1c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 27 Feb 2024 12:34:02 -0800 Subject: [PATCH 45/47] typescript-language-server: use fetchYarnDeps --- .../ty/typescript-language-server/package.nix | 85 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 17 ---- pkgs/development/node-packages/overrides.nix | 7 -- 6 files changed, 86 insertions(+), 26 deletions(-) create mode 100644 pkgs/by-name/ty/typescript-language-server/package.nix diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix new file mode 100644 index 000000000000..053f665ce7eb --- /dev/null +++ b/pkgs/by-name/ty/typescript-language-server/package.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, fixup-yarn-lock +, makeWrapper +, nodejs +, prefetch-yarn-deps +, yarn +, testers +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "typescript-language-server"; + version = "4.3.3"; + + src = fetchFromGitHub { + owner = "typescript-language-server"; + repo = "typescript-language-server"; + rev = "v${finalAttrs.version}"; + hash = "sha256-FCv0+tA7AuCdGeG6FEiMyRAHcl0WbezhNYLL7xp5FWU="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-nSMhPfbWD93sGIKehBBE/bh4RzHXFtGAjeyG20m/LWQ="; + }; + + nativeBuildInputs = [ + fixup-yarn-lock + makeWrapper + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/typescript-language-server" + cp -r lib node_modules package.json "$out/lib/node_modules/typescript-language-server" + + makeWrapper "${nodejs}/bin/node" "$out/bin/typescript-language-server" \ + --add-flags "$out/lib/node_modules/typescript-language-server/lib/cli.mjs" + + runHook postInstall + ''; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + + meta = { + changelog = "https://github.com/typescript-language-server/typescript-language-server/releases/tag/v${finalAttrs.version}"; + description = "Language Server Protocol implementation for TypeScript using tsserver"; + homepage = "https://github.com/typescript-language-server/typescript-language-server"; + license = with lib.licenses; [ asl20 mit ]; + mainProgram = "typescript-language-server"; + maintainers = with lib.maintainers; [ marcel ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 95a43ea90109..42615e7ded61 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -171,6 +171,7 @@ mapAliases { inherit (pkgs) titanium; # added 2023-08-17 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 + inherit (pkgs) typescript-language-server; # added 2024-02-27 inherit (pkgs) uglify-js; # added 2024-06-15 inherit (pkgs) undollar; # added 2024-06-29 inherit (pkgs) ungit; # added 2023-08-20 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 969d6be972df..5983d3d099df 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -51,7 +51,6 @@ pscid = "pscid"; remod-cli = "remod"; teck-programmer = "teck-firmware-upgrade"; - typescript-language-server = "typescript-language-server"; vscode-json-languageserver = "vscode-json-languageserver"; webtorrent-cli = "webtorrent"; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index abd5be19fe4c..0c5ef44b7bfe 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -248,7 +248,6 @@ , "tsun" , "ts-node" , "ttf2eot" -, "typescript-language-server" , "unified-language-server" , "vega-cli" , "vega-lite" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 0d73348130f5..48aeba1d6673 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -90157,23 +90157,6 @@ in bypassCache = true; reconstructLock = true; }; - typescript-language-server = nodeEnv.buildNodePackage { - name = "typescript-language-server"; - packageName = "typescript-language-server"; - version = "4.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.3.3.tgz"; - sha512 = "3QLj57Ru9S6zv10sa4z1pA3TIR1Rdkd04Ke0EszbO4fx5PLdlYhlC/PMxwlyxls9wrZs7wPCME1Ru0s1Gabz4Q=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; unified-language-server = nodeEnv.buildNodePackage { name = "unified-language-server"; packageName = "unified-language-server"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index c725197bddb6..03a9111d0bce 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -389,13 +389,6 @@ final: prev: { ''; }; - typescript-language-server = prev.typescript-language-server.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - ${pkgs.xorg.lndir}/bin/lndir ${pkgs.typescript} $out - ''; - }; - uppy-companion = prev."@uppy/companion".override { name = "uppy-companion"; }; From b0f1cfaf46513d3b255d920faf828b4f4c4d75b7 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:59:36 +0530 Subject: [PATCH 46/47] gnome-clocks: add missing gstreamer dependency needed for alarms --- .../gnome/apps/gnome-clocks/default.nix | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index ae7a6fb5091a..9332e8516189 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -20,6 +20,7 @@ gnome, gdk-pixbuf, geoclue2, + gst_all_1, libgweather, libadwaita, }: @@ -45,17 +46,24 @@ stdenv.mkDerivation (finalAttrs: { libxml2 ]; - buildInputs = [ - gtk4 - glib - gsettings-desktop-schemas - gdk-pixbuf - gnome-desktop - geocode-glib_2 - geoclue2 - libgweather - libadwaita - ]; + buildInputs = + [ + gtk4 + glib + gsettings-desktop-schemas + gdk-pixbuf + gnome-desktop + geocode-glib_2 + geoclue2 + libgweather + libadwaita + ] + ++ (with gst_all_1; [ + # GStreamer plugins needed for Alarms + gstreamer + gst-plugins-base + gst-plugins-good + ]); preFixup = '' gappsWrapperArgs+=( From 1f9ac8af5891f95102a4e5cdc91b1d1bf9e96b90 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 6 Jul 2024 10:02:40 +0530 Subject: [PATCH 47/47] gnome-clocks: remove unnecessary sound theme plays a hardcoded ogg file now --- pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 9332e8516189..6a9eb730ec41 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -13,7 +13,6 @@ libxml2, gtk4, glib, - sound-theme-freedesktop, gsettings-desktop-schemas, gnome-desktop, geocode-glib_2, @@ -65,13 +64,6 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-good ]); - preFixup = '' - gappsWrapperArgs+=( - # Fallback sound theme - --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" - ) - ''; - doCheck = true; passthru = {