From 634ceb1fbc230ea1561a617bce5e4251f0a8fdf1 Mon Sep 17 00:00:00 2001 From: nix Date: Mon, 16 Oct 2023 20:33:04 -0400 Subject: [PATCH 01/43] rosie: 1.3.0 -> 1.4.0 https://gitlab.com/rosie-pattern-language/rosie/-/blob/master/CHANGELOG --- pkgs/tools/text/rosie/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix index 190fd4944d15..9b6cdef575fd 100644 --- a/pkgs/tools/text/rosie/default.nix +++ b/pkgs/tools/text/rosie/default.nix @@ -3,16 +3,16 @@ , fetchgit , libbsd , readline +, }: - stdenv.mkDerivation rec { pname = "rosie"; - version = "1.3.0"; + version = "1.4.0"; src = fetchgit { url = "https://gitlab.com/rosie-pattern-language/rosie"; - rev = "9303e04ae2cffabdda6ccc4e2a351a47218615ff"; - sha256 = "1smh760baf43hr56p6rh4khz3shyzda5lqva4ffxwchl7yy7r82j"; + rev = "79605830e32dff33544f9ebe7d7be752c29424b5"; + sha256 = "sha256-n7Tem/4ZjizfCPT21teYK2wZ/gVpgjHUim9s7soEwbM="; fetchSubmodules = true; }; From c336215d593891f72364b2746c673b5297bfb250 Mon Sep 17 00:00:00 2001 From: John Hollowell Date: Mon, 5 Aug 2024 04:12:11 +0000 Subject: [PATCH 02/43] maintainers: add jhollowe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60e8041c62ab..39c2072f1065 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8824,6 +8824,12 @@ githubId = 2502736; name = "James Hillyerd"; }; + jhollowe = { + email = "jhollowe@johnhollowell.com"; + github = "jhollowe"; + githubId = 2881268; + name = "John Hollowell"; + }; j-hui = { email = "j-hui@cs.columbia.edu"; github = "j-hui"; From 28819016efe604ef8d93fddcdf49a4630ac84b9d Mon Sep 17 00:00:00 2001 From: John Hollowell Date: Mon, 5 Aug 2024 04:15:34 +0000 Subject: [PATCH 03/43] hamrs: init at 1.0.7 --- pkgs/by-name/ha/hamrs/package.nix | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/ha/hamrs/package.nix diff --git a/pkgs/by-name/ha/hamrs/package.nix b/pkgs/by-name/ha/hamrs/package.nix new file mode 100644 index 000000000000..45937658d4bb --- /dev/null +++ b/pkgs/by-name/ha/hamrs/package.nix @@ -0,0 +1,56 @@ +{ + appimageTools, + lib, + fetchurl, + stdenv, +}: + +let + suffix = + { + aarch64-linux = "linux-armv7l"; + x86_64-linux = "linux-x86_64"; + i686-linux = "linux-i386"; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +appimageTools.wrapType2 rec { + pname = "hamrs"; + version = "1.0.7"; + + src = fetchurl { + url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${version}/hamrs-${version}-${suffix}.AppImage"; + hash = + { + aarch64-linux = "sha256-nBW8q7LVWQz93LkTc+c36H+2ymLLwLKfxePUwEm3D2E="; + x86_64-linux = "sha256-tplp7TADvbxkk5qBb4c4zm4mrzrVtW/WVUjiolBBJHc="; + i686-linux = "sha256-PllxLMBsPCedKU7OUN0nqi4qtQ57l2Z+huLfkfaBfT4="; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + extraInstallCommands = + let + contents = appimageTools.extract { inherit pname version src; }; + in + '' + install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=${pname}' + cp -r ${contents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A simple, portable logger tailored for activities like Parks on the Air, Field Day, and more."; + homepage = "https://hamrs.app/"; + license = licenses.unfree; + maintainers = [ maintainers.jhollowe ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + "i686-linux" + ]; + mainProgram = "hamrs"; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; + }; +} From 8da82625e7b1d618c94cce34e965d45dbe35a1f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 10:28:53 +0000 Subject: [PATCH 04/43] amarok: 3.0.1 -> 3.1.0 --- pkgs/applications/audio/amarok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 38cee35313fd..69ae6a41c78a 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "amarok"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-S+zyrp3cvoYRA+ZCFDaireIvU4yxw2ANTmZ/cb6ljys="; + sha256 = "sha256-yXuZZ/qPFbjp9N+2YYTKxqfsncZloQW8UWjY5yD+Fus="; }; outputs = [ "out" "doc" ]; From 4529bd57273eafaa1dd78db0a8666f12b2ceca28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 17:50:12 +0000 Subject: [PATCH 05/43] seq66: 0.99.12 -> 0.99.13 --- pkgs/applications/audio/seq66/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 51d40f962a88..898373cb1320 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "seq66"; - version = "0.99.12"; + version = "0.99.13"; src = fetchFromGitHub { owner = "ahlstromcj"; repo = "seq66"; rev = version; - hash = "sha256-+EU0UdmZaDnhN142yR/r0tK1FKBbuFPmde6iSS26Tjo="; + hash = "sha256-hR8kEt3tKnH96JmmkMuY0WWxxp9YTcSvsJvICKNjvyQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ]; From ec6b205b5ae905e487967604028381bc822076cc Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Tue, 6 Aug 2024 22:15:53 +0200 Subject: [PATCH 06/43] usbguard: 1.1.2 -> 1.1.3 Drop patch, because it is included in the new release. --- pkgs/os-specific/linux/usbguard/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 755ea603e2a5..dfa31dd3a97c 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , installShellFiles , nixosTests @@ -22,27 +21,17 @@ }: stdenv.mkDerivation rec { - version = "1.1.2"; + version = "1.1.3"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = pname; rev = "usbguard-${version}"; - hash = "sha256-uwNoKczmVOMpkU4KcKTOtbcTHiYVGXjk/rVbqMl5pGk="; + hash = "sha256-8y8zaKJfoIXc9AvG1wi3EzZA7BR2wVFLuOyD+zpBY0s="; fetchSubmodules = true; }; - patches = [ - # Pull upstream fix for gcc-13: - # https://github.com/USBGuard/usbguard/pull/586 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/USBGuard/usbguard/commit/22b1e0897af977cc96af926c730ff948bd120bb5.patch"; - hash = "sha256-yw0ZHcn6naHcsfsqdBB/aTgCwvEHecew/6HDmjyY2ZA="; - }) - ]; - nativeBuildInputs = [ autoreconfHook installShellFiles @@ -94,6 +83,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://usbguard.github.io/"; license = licenses.gpl2Plus; + platforms = platforms.linux; maintainers = [ maintainers.tnias ]; }; } From 63ac89e63a8a6ec2607680aed33adc9aca699386 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Thu, 8 Aug 2024 11:24:33 +0200 Subject: [PATCH 07/43] ardugotools: 0.6.0 -> 0.6.1 --- pkgs/by-name/ar/ardugotools/package.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/ardugotools/package.nix b/pkgs/by-name/ar/ardugotools/package.nix index 833984c9408d..16191343ab64 100644 --- a/pkgs/by-name/ar/ardugotools/package.nix +++ b/pkgs/by-name/ar/ardugotools/package.nix @@ -5,7 +5,7 @@ ... }: let - version = "0.6.0"; + version = "0.6.1"; in buildGoModule { pname = "ardugotools"; @@ -14,12 +14,23 @@ buildGoModule { src = fetchFromGitHub { owner = "randomouscrap98"; repo = "ardugotools"; - rev = "refs/tags/v${version}"; - hash = "sha256-lYpUb+AiQrcrBGBvnOwzDC4aX1F8o21DUnad56qb7zo="; + rev = "v${version}"; + hash = "sha256-SqeUcYa8XscwaJaCSIoZ9lEtRJ0hN01XJDyCJFX2dTc="; }; vendorHash = "sha256-Z9ObsS+GwVsz6ZlXCgN0WlShHzbmx4WLa/1/XLSSAAs="; + checkFlags = + let + # Skip tests referencing a non-existing file + skippedTests = [ + "TestRunLuaFlashcartGenerator_CategoriesOnly" + "TestRunLuaFlashcartGenerator_FullCart" + "TestRunLuaFlashcartGenerator_MakeCart" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + meta = { description = "CLI toolset for Arduboy"; changelog = "https://github.com/randomouscrap98/ardugotools/releases/tag/v${version}"; From 167c21d3906a5e715732e821ebd31d993a8a7281 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 05:18:32 +0000 Subject: [PATCH 08/43] vivaldi: 6.8.3381.48 -> 6.8.3381.53 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 33ef7b519618..5e4f1f9a774a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.8.3381.48"; + version = "6.8.3381.53"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-VLX2nWcpwWqI5QtBFyXRieaO+kLXMeeyWwFIVgz8XIo="; - x86_64-linux = "sha256-ZlrL4eOQnQjIBzOiLLDHZFjf6nr9KiyapZmqJFkDqX8="; + aarch64-linux = "sha256-wcfEaUcl/FUhhrp977/xg5+dE+93vy8wn5x6m8qX1EU="; + x86_64-linux = "sha256-6WLGvd9Kp6fRG1HxMOjK4MhK4eoYjwEgYGJROI7lM2Y="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 826006153a2098c5b3e0fd0557ca6a63f578148a Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Mon, 12 Aug 2024 13:40:25 +0530 Subject: [PATCH 09/43] ubootNanoPCT6: include the SPI binary --- pkgs/misc/uboot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8c2fcb2eba53..295cb525a646 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -303,7 +303,7 @@ in { extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; ROCKCHIP_TPL = rkbin.TPL_RK3588; - filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ]; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; }; ubootNovena = buildUBoot { From 1eb9a41b76e6c7b72d7d8088b5d62ebcaa662251 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 03:28:19 +0000 Subject: [PATCH 10/43] python312Packages.db-dtypes: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/db-dtypes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 4f7eff5b9a73..efd3e6f7bb76 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "db-dtypes"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-db-dtypes-pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-FVRqh30mYVfC8zuhPteuvqGYGTp3PW+pi1bquUjYFAg="; + hash = "sha256-DjLgzJ/OivrhHJQGBkIiRNJyi5xWLFp9nBEetD8H0YY="; }; nativeBuildInputs = [ setuptools ]; From 3aee854b9f1129100640861ed78e76fb02f252b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Aug 2024 08:27:20 +0200 Subject: [PATCH 11/43] python312Packages.db-dtypes: refactor --- pkgs/development/python-modules/db-dtypes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index efd3e6f7bb76..c082433f9f3c 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -25,9 +25,9 @@ buildPythonPackage rec { hash = "sha256-DjLgzJ/OivrhHJQGBkIiRNJyi5xWLFp9nBEetD8H0YY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging pandas From a2e091225efa65785aa833bf67cda7516909635e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 21:56:41 +0000 Subject: [PATCH 12/43] python312Packages.gtts: 2.5.2 -> 2.5.3 --- pkgs/development/python-modules/gtts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index a2533376cc5f..d4d724c4b8c5 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - hash = "sha256-4GIrj5pIk27euo2gzSKpRQaXNyI6aH0E6HNAivJthCE="; + hash = "sha256-8FPKAMVXqw/4X050tAnOAx/wGboZPPJs72VwwaOEamE="; }; build-system = [ setuptools ]; From 9e4a67563057cea69cb2d00d90ed51ce72ce8ec2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 03:40:27 +0000 Subject: [PATCH 13/43] python312Packages.pulumi-aws: 6.48.0 -> 6.49.0 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index c8c0a4240260..c87063d78192 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.48.0"; + version = "6.49.0"; pyproject = true; build-system = [ setuptools ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-Q4peAFlwH1th/WZawg0QF5SdKHJkytJoy9aMw0b9Ak4="; + hash = "sha256-xsQVPJgO4c42GXgVGkCnZT1Jhve1InEXrt1Fpwc4UX4="; }; sourceRoot = "${src.name}/sdk/python"; From 18a3efa4dda58e9292a91b9c111afd35c99aa829 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 18:44:40 +0000 Subject: [PATCH 14/43] uxn: 1.0-unstable-2024-08-05 -> 1.0-unstable-2024-08-12 --- pkgs/by-name/ux/uxn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 19be29bf14f1..12d0ce05bca7 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-08-05"; + version = "1.0-unstable-2024-08-12"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "a9d7ff23a533ee354fcbc5a1260296a6b0ecfefa"; - hash = "sha256-VPIgS127ewX5yTZEZZgUZYAXqbCfSa+AMtFMufdQMWo="; + rev = "3a901ed0beeaf5e3268a40779f2944ef99f93774"; + hash = "sha256-JlDNiKcaZG2OYeiVlIovEIDN/h7ET5d0M83vlHMQQK4="; }; outputs = [ "out" "projects" ]; From b7e9d5d6fd95789ce35e2970413ced5a118f1ffe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 02:46:31 +0000 Subject: [PATCH 15/43] python312Packages.i-pi: 2.6.1 -> 3.0 --- pkgs/development/python-modules/i-pi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 03e1f5dd4613..41a9ba22fd46 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "i-pi"; - version = "2.6.1"; + version = "3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "i-pi"; repo = "i-pi"; rev = "refs/tags/v${version}"; - sha256 = "sha256-c1bs8ZI/dfDwKx5Df8ndtsDxESQrdbMkvrjfI6b9JTg="; + sha256 = "sha256-SJ0qTwwdIOR1nXs9MV6O1oxJPR6/6H86wscDy/sLc/g="; }; nativeBuildInputs = [ From c8f2aa25e89d5f79a9cfd39c7412879bc400380f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 12:06:11 +0000 Subject: [PATCH 16/43] circt: 1.80.1 -> 1.81.1 --- pkgs/development/compilers/circt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 2cf630ceae19..e8be6989a771 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.80.1"; + version = "1.81.1"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-Vqucix0hil9isi4/+DLC4tq8XLVeiFUEMBeJfkZMEpI="; + hash = "sha256-MDmCsDXc4ohqz+btqbWhhq0PoTNqE6MfVpzrjIoS4rU="; fetchSubmodules = true; }; From 7b23656d42c7c7bfe77a8bba605a0ae9fc716e58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 17:37:49 +0000 Subject: [PATCH 17/43] python312Packages.pyttsx3: 2.90 -> 2.91 --- pkgs/development/python-modules/pyttsx3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyttsx3/default.nix b/pkgs/development/python-modules/pyttsx3/default.nix index 8650e0c54fe4..df854d4073f8 100644 --- a/pkgs/development/python-modules/pyttsx3/default.nix +++ b/pkgs/development/python-modules/pyttsx3/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyttsx3"; - version = "2.90"; + version = "2.91"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "a585b6d8cffc19bd92db1e0ccbd8aa9c6528dd2baa5a47045d6fed542a44aa19"; + sha256 = "sha256-jxkhfE1lpGhw4LgvLn6xVw7CssqAUX++7gleVPdvc+I="; dist = "py3"; python = "py3"; }; From ec04af5ffb2b9a887eeeeed516c31fe1b883f8b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 21:24:45 +0000 Subject: [PATCH 18/43] python312Packages.mkdocs-material: 9.5.30 -> 9.5.31 --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index b5f17fbe9cd4..01801998bcff 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.30"; + version = "9.5.31"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-VgOPmOwPAwTqCCDxtiQ3dReTdjfXYL7/1CdSqTgw+uo="; + hash = "sha256-fzTyQ4YFBa5mm8bUKWR50d0qoGJoNIVbFobnVpK1FZg="; }; nativeBuildInputs = [ From e01163e1ddcf90ecd57a5ea271979c6a68890d61 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Fri, 16 Aug 2024 03:21:07 +0000 Subject: [PATCH 19/43] cemu: move glslang to buildInputs fix build perhaps after change 9b7f1a3913168bc9b9c070dbc9720dad1d06b49c --- pkgs/by-name/ce/cemu/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index ad70bc9c79f9..a9808577c9c0 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -69,7 +69,6 @@ in stdenv.mkDerivation (finalAttrs: { addDriverRunpath wrapGAppsHook3 cmake - glslang nasm ninja pkg-config @@ -83,6 +82,7 @@ in stdenv.mkDerivation (finalAttrs: { curl fmt_9 glm + glslang gtk3 hidapi imgui' From afee1d56ad8488296afb2785b4b0b9590de686cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 04:19:27 +0000 Subject: [PATCH 20/43] xlsxgrep: 0.0.23 -> 0.0.29 --- pkgs/applications/search/xlsxgrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/xlsxgrep/default.nix b/pkgs/applications/search/xlsxgrep/default.nix index 454e9210db6a..5c6ea6c54d60 100644 --- a/pkgs/applications/search/xlsxgrep/default.nix +++ b/pkgs/applications/search/xlsxgrep/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "xlsxgrep"; - version = "0.0.23"; + version = "0.0.29"; src = fetchPypi { inherit pname version; - sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm"; + sha256 = "sha256-vgHNu7MVDjULoBiTkk74W8ZLJ02eds60XshTX3iLJGI="; }; pythonPath = with python3Packages; [ xlrd ]; From b08afbf6e820550e86a66677cc42a52bb83def7b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 17 Aug 2024 23:33:42 +0900 Subject: [PATCH 21/43] python312Packages.i-pi: adopt pypa build --- pkgs/development/python-modules/i-pi/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 41a9ba22fd46..1cb4cca97b19 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, gfortran, makeWrapper, + setuptools, numpy, pytest, mock, @@ -13,21 +14,23 @@ buildPythonPackage rec { pname = "i-pi"; version = "3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "i-pi"; repo = "i-pi"; rev = "refs/tags/v${version}"; - sha256 = "sha256-SJ0qTwwdIOR1nXs9MV6O1oxJPR6/6H86wscDy/sLc/g="; + hash = "sha256-SJ0qTwwdIOR1nXs9MV6O1oxJPR6/6H86wscDy/sLc/g="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ gfortran makeWrapper ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytest From 64f4dfaf9ae9f5d42970db62c1243823936a4d9a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 17 Aug 2024 23:51:31 +0900 Subject: [PATCH 22/43] python312Packages.i-pi: enable tests --- pkgs/development/python-modules/i-pi/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 1cb4cca97b19..8f62f52f6536 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -6,9 +6,11 @@ makeWrapper, setuptools, numpy, - pytest, + distutils, + pytestCheckHook, mock, pytest-mock, + pythonAtLeast, }: buildPythonPackage rec { @@ -33,10 +35,12 @@ buildPythonPackage rec { dependencies = [ numpy ]; nativeCheckInputs = [ - pytest + pytestCheckHook mock pytest-mock - ]; + ] ++ lib.optional (pythonAtLeast "3.12") distutils; + + pytestFlagsArray = [ "ipi_tests/unit_tests" ]; postFixup = '' wrapProgram $out/bin/i-pi \ From f4c87544cb4beb00b84e3c4db42e4f4aa7823c81 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 17 Aug 2024 23:57:52 +0900 Subject: [PATCH 23/43] python312Packages.langsmith: 0.1.85 -> 0.1.99 Diff: https://github.com/langchain-ai/langsmith-sdk/compare/refs/tags/v0.1.85...v0.1.99 Changelog: https://github.com/langchain-ai/langsmith-sdk/releases/tag/v0.1.99 --- pkgs/development/python-modules/langsmith/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 8c68c36105ef..16e3b19f71b3 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.85"; + version = "0.1.99"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-IPbamCfaurikFAqKnvMp8+x5ULCeQ61d5oZFO9+s4SQ="; + hash = "sha256-aN5HiQAXX7ZlVBzkit4DAw+7KQHI3ck1DLvBPDSKVhM="; }; sourceRoot = "${src.name}/python"; @@ -78,6 +78,7 @@ buildPythonPackage rec { disabledTestPaths = [ # due to circular import "tests/integration_tests/test_client.py" + "tests/integration_tests/test_prompts.py" "tests/unit_tests/test_client.py" # Tests require a Langsmith API key "tests/evaluation/test_evaluation.py" From 42e92b1d77d6c0d28b8ac8bcf6b22f47ebb5dfc2 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 00:34:31 +0800 Subject: [PATCH 24/43] emacsPackages.session-management-for-emacs: mkDerivation -> melpaBuild --- .../session-management-for-emacs/package.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix index 0238bb6127bd..ab2dfb7212c3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchurl, emacs, lib }: +{ melpaBuild, fetchzip, lib }: -stdenv.mkDerivation rec { +melpaBuild rec { pname = "session-management-for-emacs"; + ename = "session"; version = "2.2a"; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz"; - sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; + hash = "sha256-lc6NIX+lx97qCs5JqG7x0iVE6ki09Gy7DEQuPW2c+7s="; }; - buildInputs = [ emacs ]; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp lisp/*.el "$out/share/emacs/site-lisp/" - ''; - meta = with lib; { /* installation: add to your ~/.emacs (require 'session) From 60d07073580b24f289369f0b8f5eb0cf8e377826 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 00:35:53 +0800 Subject: [PATCH 25/43] emacsPackages.session-management-for-emacs: format with nixfmt-rfc-style --- .../session-management-for-emacs/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix index ab2dfb7212c3..5d6b413434dc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -1,4 +1,8 @@ -{ melpaBuild, fetchzip, lib }: +{ + melpaBuild, + fetchzip, + lib, +}: melpaBuild rec { pname = "session-management-for-emacs"; @@ -11,7 +15,8 @@ melpaBuild rec { }; meta = with lib; { - /* installation: add to your ~/.emacs + /* + installation: add to your ~/.emacs (require 'session) (add-hook 'after-init-hook 'session-initialize) */ From 3e784edeed34c0b3467737d9520b7fcfbfec4440 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 00:46:15 +0800 Subject: [PATCH 26/43] emacsPackages.session-management-for-emacs: clean - remove with lib; - remove empty meta.maintainers --- .../manual-packages/session-management-for-emacs/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix index 5d6b413434dc..b020d158f3e3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -14,7 +14,7 @@ melpaBuild rec { hash = "sha256-lc6NIX+lx97qCs5JqG7x0iVE6ki09Gy7DEQuPW2c+7s="; }; - meta = with lib; { + meta = { /* installation: add to your ~/.emacs (require 'session) @@ -22,7 +22,6 @@ melpaBuild rec { */ description = "Small session management for emacs"; homepage = "https://emacs-session.sourceforge.net/"; - license = licenses.gpl2; - maintainers = [ ]; + license = lib.licenses.gpl2; }; } From b48a3a89fad3674dfe4f0264fd6d72ff1e953da0 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 00:10:58 +0800 Subject: [PATCH 27/43] emacsPackages.consult-gh: use the correct gh There is also a MELPA package called gh. --- .../editors/emacs/elisp-packages/manual-packages.nix | 4 ++++ .../manual-packages/consult-gh/{package.nix => default.nix} | 0 2 files changed, 4 insertions(+) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/{package.nix => default.nix} (100%) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 34469eb19628..b6ac04e44502 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -15,6 +15,10 @@ lib.packagesFromDirectoryRecursive { inherit (pkgs) codeium; }; + consult-gh = callPackage ./manual-packages/consult-gh { + inherit (pkgs) gh; + }; + lsp-bridge = callPackage ./manual-packages/lsp-bridge { inherit (pkgs) basedpyright git go gopls python3; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix From 759bbdca01176f59025e689447a597320f1cc509 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 20:19:23 +0000 Subject: [PATCH 28/43] simdutf: 5.3.4 -> 5.3.7 --- pkgs/by-name/si/simdutf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 8e5c0cf9efb4..e64b70155a8e 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "5.3.4"; + version = "5.3.7"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-zttqfzTF9P1czM2+HECcDC2j2XPfsJn0r+qpnNDfLWw="; + hash = "sha256-n99lt0OYK6OyLArdgPRabQ80ohQgHklpt9saDzKhvJw="; }; # Fix build on darwin From 94727cdb4084563f672198407db62c2089a27fbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 20:26:37 +0000 Subject: [PATCH 29/43] grype: 0.79.5 -> 0.79.6 --- pkgs/by-name/gr/grype/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 835fbeedca72..2f3b81b2ad3d 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.79.5"; + version = "0.79.6"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-JgCEiMETervYPI1XI25kAmleOMEs+w3atxKrwuGPxKc="; + hash = "sha256-4DvtZDDr1m+2kd0uEEQwW2KrTXa7ShF4jRFjSNMjJiM="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From 104d3f214c1ccb128af746150474464dadeef588 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 04:49:48 +0800 Subject: [PATCH 30/43] emacsPackages.lspce: simplify module renaming Actually, there is only one module on darwin systems. So the loop is removed. In addition, the bash magic is replaced with nix's stdenv.hostPlatform.extensions.sharedLibrary. --- .../elisp-packages/manual-packages/lspce/module.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix index 1a1f8612f64e..198f1d9b69af 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix @@ -2,8 +2,12 @@ lib, fetchFromGitHub, rustPlatform, + stdenv, }: +let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; +in rustPlatform.buildRustPackage { pname = "lspce-module"; version = "1.1.0-unstable-2024-07-14"; @@ -22,13 +26,8 @@ rustPlatform.buildRustPackage { "--skip=msg::tests::serialize_request_with_null_params" ]; - # rename module without changing either suffix or location - # use for loop because there seems to be two modules on darwin systems - # https://github.com/zbelial/lspce/issues/7#issue-1783708570 postInstall = '' - for f in $out/lib/*; do - mv --verbose $f $out/lib/lspce-module.''${f##*.} - done + mv --verbose $out/lib/liblspce_module${libExt} $out/lib/lspce-module${libExt} ''; meta = { From aae95f64662c70f9fa4c7bcf9809dc6953db3bcc Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:11:51 +0800 Subject: [PATCH 31/43] emacsPackages.ada-mode: respect old nativeBuildInputs and buildInputs --- .../editors/emacs/elisp-packages/elpa-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 8bffb346dedd..3a1a5c97a94f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -72,14 +72,14 @@ self: let sourceRoot = "ada-mode-${self.ada-mode.version}"; - nativeBuildInputs = [ + nativeBuildInputs = old.nativeBuildInputs ++ [ buildPackages.gnat buildPackages.gprbuild buildPackages.dos2unix buildPackages.re2c ]; - buildInputs = [ + buildInputs = old.buildInputs ++ [ pkgs.gnatPackages.gnatcoll-xref ]; From 4810747bb97c35b6c74686a419695d8b8cd319c6 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:13:39 +0800 Subject: [PATCH 32/43] emacsPackages.telega: respect old nativeBuildInputs Fixes https://hydra.nixos.org/build/269115773 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 25dd378f03f6..0a2e620c1833 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -545,7 +545,7 @@ let # Telega has a server portion for it's network protocol telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; - nativeBuildInputs = [ pkgs.pkg-config ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; postPatch = '' substituteInPlace telega-customize.el \ From f56dd545bb2ce3ae2234ec7c4e9b049e0b0687ce Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:14:19 +0800 Subject: [PATCH 33/43] emacsPackages.zmq: respect old nativeBuildInputs Fixes https://hydra.nixos.org/build/268777545 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0a2e620c1833..871402905ee5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -601,7 +601,7 @@ let export EZMQ_LIBDIR=$(mktemp -d) make ''; - nativeBuildInputs = [ + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoconf pkgs.automake pkgs.pkg-config From dda19805c2ece3d2f9b487c39dc21456f4f7e9e9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:15:17 +0800 Subject: [PATCH 34/43] emacsPackages.vterm: respect old nativeBuildInputs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 871402905ee5..8f5f1dc45a26 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -687,7 +687,7 @@ let }; vterm = super.vterm.overrideAttrs (old: { - nativeBuildInputs = [ pkgs.cmake ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ]; buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" From 3eea10fdb7b1a8f925cd167defdf059e5cc371eb Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:17:49 +0800 Subject: [PATCH 35/43] emacsPackages.irony: respect old nativeBuildInputs and buildInputs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 8f5f1dc45a26..3c697763a5ff 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -322,8 +322,8 @@ let dontUseCmakeBuildDir = true; doCheck = pkgs.stdenv.isLinux; packageRequires = [ self.emacs ]; - buildInputs = [ pkgs.llvmPackages.libclang self.emacs ]; - nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm ]; + buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang self.emacs ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; }); # tries to write a log file to $HOME From 1717bb5e36eedb28c4e36749b1cb24926c935a2b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:18:15 +0800 Subject: [PATCH 36/43] emacsPackages.irony: remove unneeded emacs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 3c697763a5ff..42234dd93c0a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -321,8 +321,7 @@ let ''; dontUseCmakeBuildDir = true; doCheck = pkgs.stdenv.isLinux; - packageRequires = [ self.emacs ]; - buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang self.emacs ]; + buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; }); From 062f810112efede2b678b846910d22b458dab756 Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 17 Aug 2024 23:25:43 +0200 Subject: [PATCH 37/43] ungoogled-chromium: 127.0.6533.119-1 -> 127.0.6533.119-2 --- .../networking/browsers/chromium/upstream-info.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 7f7fe28096f4..ddf2331132ee 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,8 +27,8 @@ version = "2024-06-06"; }; ungoogled-patches = { - hash = "sha256-m1H/7JsSF7Akm5eBlPB/F4mAdFjUPtOQIUoXup09w40="; - rev = "127.0.6533.119-1"; + hash = "sha256-m7x7tPrJfddPER9uiSp983xGn3YSH+Bq01l14vOlwrU="; + rev = "127.0.6533.119-2"; }; }; hash = "sha256-LuUDEpYCJLR/X+zjsF26aum4/Wfu2MNowofPu8iRVxI="; From 5ae45fd67603e947a8d86b9ba411fc68a12e5385 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:59:33 +0800 Subject: [PATCH 38/43] emacsPackages.emacsql-sqlite: fix override for new versions Since "20240808.2016"[1], emacsql-sqlite is just a stub so there is no need to override it. Fixes https://hydra.nix-community.org/build/490589 [1]: https://github.com/magit/emacsql/blob/c786ea159facf5892e9c4e5b7bdda44da95cd62e/emacsql-sqlite.el#L13 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 25dd378f03f6..51d554992558 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -199,7 +199,7 @@ let stripDebugList = [ "share" ]; }); - emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: { + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: lib.optionalAttrs (lib.versionOlder old.version "20240808.2016") { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; postBuild = '' From 8f295e4d422130d9beba34564f37d42e33e93811 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 06:39:22 +0800 Subject: [PATCH 39/43] emacsPackages.p4-16-mode: fix build https://hydra.nixos.org/build/269588786 --- .../elisp-packages/nongnu-devel-packages.nix | 18 +++++++++++++++++- .../emacs/elisp-packages/nongnu-packages.nix | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix index 01bca0ff1f8a..7b156aeaaa49 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix @@ -35,7 +35,23 @@ let super = imported; - overrides = { }; + overrides = { + p4-16-mode = super.p4-16-mode.overrideAttrs { + # workaround https://github.com/NixOS/nixpkgs/issues/301795 + prePatch = '' + mkdir tmp-untar-dir + pushd tmp-untar-dir + + tar --extract --verbose --file=$src + content_directory=$(echo p4-16-mode-*) + cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + + popd + ''; + }; + }; in super // overrides diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index cd32a8bd3975..ce13179ca1ea 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -30,6 +30,21 @@ self: let super = imported; overrides = { + p4-16-mode = super.p4-16-mode.overrideAttrs { + # workaround https://github.com/NixOS/nixpkgs/issues/301795 + prePatch = '' + mkdir tmp-untar-dir + pushd tmp-untar-dir + + tar --extract --verbose --file=$src + content_directory=$(echo p4-16-mode-*) + cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + + popd + ''; + }; }; in super // overrides); From be32c3603e91efee7234efc301460422aee2511b Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sat, 17 Aug 2024 11:49:48 +0200 Subject: [PATCH 40/43] microfetch: 0.3.3 -> 0.4.0 https://github.com/NotAShelf/microfetch/compare/v0.3.3...v0.4.0 --- pkgs/by-name/mi/microfetch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 6f7695073c5c..20115dca3697 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "microfetch"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "NotAShelf"; repo = "microfetch"; rev = "refs/tags/v${version}"; - hash = "sha256-iBfnui7xrx31euYnQxoJf1xXFYFiJnDMadLRAiRCN04="; + hash = "sha256-bRN16Iq9m6HaeT+KWCpeukTu1tnMOvtM6lDHO5OiIS4="; }; - cargoHash = "sha256-J+S6XIMUcWj4jXABQinEDx6dRG5Byc2UxJoKj2y1tQU="; + cargoHash = "sha256-dGlAiPrOWFI8ogo/1S2ZK/ZPBtKGCyA72B+6B4bp5Mg="; meta = { description = "Microscopic fetch script in Rust, for NixOS systems"; From f4e5df01cce6349e6037918ed5053dcff5e7061d Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sat, 17 Aug 2024 11:50:16 +0200 Subject: [PATCH 41/43] microfetch: add update script --- pkgs/by-name/mi/microfetch/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 20115dca3697..32f3b142c319 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -17,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dGlAiPrOWFI8ogo/1S2ZK/ZPBtKGCyA72B+6B4bp5Mg="; + passthru.updateScript = nix-update-script { }; + meta = { description = "Microscopic fetch script in Rust, for NixOS systems"; homepage = "https://github.com/NotAShelf/microfetch"; From 6d0458f91678ea5bf5faa1c10de8809635dbc50e Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sat, 17 Aug 2024 11:50:28 +0200 Subject: [PATCH 42/43] microfetch: add notashelf as maintainer --- pkgs/by-name/mi/microfetch/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 32f3b142c319..18e8e2546d93 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -24,7 +24,10 @@ rustPlatform.buildRustPackage rec { description = "Microscopic fetch script in Rust, for NixOS systems"; homepage = "https://github.com/NotAShelf/microfetch"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ nydragon ]; + maintainers = with lib.maintainers; [ + nydragon + NotAShelf + ]; mainProgram = "microfetch"; platforms = lib.platforms.linux; }; From 33a0e1e2bc9401c6a9dc254564d78ce77e8354ad Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 18 Aug 2024 08:25:31 +0300 Subject: [PATCH 43/43] path-of-building.data: 2.48.1 -> 2.48.2 Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.48.1...v2.48.2 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 5663dc50e85e..0fcd79b4b956 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -17,13 +17,13 @@ let data = stdenv.mkDerivation (finalAttrs: { pname = "path-of-building-data"; - version = "2.48.1"; + version = "2.48.2"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-b6tHBlMFJqm0FaXj+5gY+ltd3J3N3IM9QZGd0i1iXLk="; + hash = "sha256-KMj+aS+xd96pt1NhqL3CBKj83ZfiX2npmJtwUFa00qU="; }; nativeBuildInputs = [ unzip ];