From aa915382e9bf8564b75de46079b4c94907de6445 Mon Sep 17 00:00:00 2001 From: Grace Lovelace Date: Wed, 29 May 2024 14:29:31 -0700 Subject: [PATCH 01/22] (ponysay): Add missing pre and post install hooks Noticed my postInstall overrides weren't working, so I added them. --- pkgs/tools/misc/ponysay/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 2fb48f05850e..0b374e1efba1 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { inherit python3; installPhase = '' + runHook preInstall + find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g" substituteInPlace setup.py --replace \ "fileout.write(('#!/usr/bin/env %s\n' % env).encode('utf-8'))" \ @@ -24,6 +26,8 @@ stdenv.mkDerivation rec { python3 setup.py --prefix=$out --freedom=partial install \ --with-shared-cache=$out/share/ponysay \ --with-bash + + runHook postInstall ''; meta = with lib; { From 9f51e9102db8af97b0d7cb030000df35db52be62 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sat, 22 Jun 2024 15:01:29 -0500 Subject: [PATCH 02/22] convmv: add Darwin support, reformat & migrate to pkgs/by-name Add support for Darwin to convmv. This required disabling the tests as APFS requires filenames to be valid UTF-8[^1]. This will also affect Linux if a filesystem that enforces valid UTF-8 is used (such as ZFS with `utf8only=on`). While we're here, make some changes to clean up the derivation: - Replace use of `rec` with `finalAttrs` pattern - Replace `fetchurl` with `fetchzip` - Added separate `man` output - Replace `preBuild` hook with explicit `makeFlags` initialization - Replace explicit `patchPhase` override with `prePatch` hook - Enable `strictDeps` - Disable redundant `patchShebangs` call (already done in `prePatch` hook) - Address lints from `nixpkgs-hammer` - Reformat with `nixfmt-rfc-style` - Migrate to pkgs/by-name [^1]: https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/APFS_Guide/FAQ/FAQ.html --- pkgs/by-name/co/convmv/package.nix | 60 ++++++++++++++++++++++++++++++ pkgs/tools/misc/convmv/default.nix | 33 ---------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 60 insertions(+), 35 deletions(-) create mode 100644 pkgs/by-name/co/convmv/package.nix delete mode 100644 pkgs/tools/misc/convmv/default.nix diff --git a/pkgs/by-name/co/convmv/package.nix b/pkgs/by-name/co/convmv/package.nix new file mode 100644 index 000000000000..b82edc118c77 --- /dev/null +++ b/pkgs/by-name/co/convmv/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchzip, + perl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "convmv"; + version = "2.05"; + + outputs = [ + "out" + "man" + ]; + + src = fetchzip { + url = "https://www.j3e.de/linux/convmv/convmv-${finalAttrs.version}.tar.gz"; + hash = "sha256-ts9xAPRGUoS0XBRTmpb+BlGW1hmGyUs+rQLyUEgiZ54="; + }; + + strictDeps = true; + + nativeBuildInputs = [ perl ]; + + buildInputs = [ perl ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "MANDIR=${placeholder "man"}/share/man" + ]; + + checkTarget = "test"; + + # testsuite.tar contains filenames that aren't valid UTF-8. Extraction of + # testsuite.tar will fail as APFS enforces that filenames are valid UTF-8. + doCheck = !stdenv.isDarwin; + + prePatch = + lib.optionalString finalAttrs.doCheck '' + tar -xf testsuite.tar + '' + + '' + patchShebangs --host . + ''; + + dontPatchShebangs = true; + + meta = with lib; { + description = "Converts filenames from one encoding to another"; + downloadPage = "https://www.j3e.de/linux/convmv/"; + license = with licenses; [ + gpl2Only + gpl3Only + ]; + maintainers = with maintainers; [ ]; + mainProgram = "convmv"; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix deleted file mode 100644 index 8d392f78f47f..000000000000 --- a/pkgs/tools/misc/convmv/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, perl }: - -stdenv.mkDerivation rec { - pname = "convmv"; - version = "2.05"; - - src = fetchurl { - url = "https://www.j3e.de/linux/convmv/convmv-${version}.tar.gz"; - sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk"; - }; - - preBuild='' - makeFlags="PREFIX=$out" - ''; - - patchPhase='' - tar -xf testsuite.tar - patchShebangs . - ''; - - doCheck = true; - checkTarget = "test"; - - buildInputs = [ perl ]; - - meta = with lib; { - description = "Converts filenames from one encoding to another"; - platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin; - maintainers = [ ]; - license = licenses.gpl2Plus; - mainProgram = "convmv"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28f987a534bc..44a7ab0b03ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6988,8 +6988,6 @@ with pkgs; convfont = callPackage ../tools/misc/convfont { }; - convmv = callPackage ../tools/misc/convmv { }; - cpcfs = callPackage ../tools/filesystems/cpcfs { }; coreutils = callPackage ../tools/misc/coreutils { }; From d44cc3b616862d6f1ac872bc447b110a55a0ea07 Mon Sep 17 00:00:00 2001 From: Alex James Date: Fri, 28 Jun 2024 17:53:18 -0500 Subject: [PATCH 03/22] convmv: add al3xtjames to maintainers --- pkgs/by-name/co/convmv/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/convmv/package.nix b/pkgs/by-name/co/convmv/package.nix index b82edc118c77..65fbd85e37d6 100644 --- a/pkgs/by-name/co/convmv/package.nix +++ b/pkgs/by-name/co/convmv/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { gpl2Only gpl3Only ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ al3xtjames ]; mainProgram = "convmv"; platforms = platforms.unix; }; From fc2b1fb8f6e7cf2c289d686d1a775b2c97a777d7 Mon Sep 17 00:00:00 2001 From: rcmlz Date: Wed, 10 Jul 2024 11:16:35 +0200 Subject: [PATCH 04/22] maintainers: add rcmlz --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b9daced0b17d..7e3e573b3fd6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16839,6 +16839,12 @@ githubId = 52847440; name = "Ryan Burns"; }; + rcmlz = { + email = "haguga-nixos@yahoo.com"; + github = "rcmlz"; + githubId = 19784049; + name = "rcmlz"; + }; rcoeurjoly = { email = "rolandcoeurjoly@gmail.com"; github = "RCoeurjoly"; From 79fea538ea5112e72210a6eea686b7c7e6429235 Mon Sep 17 00:00:00 2001 From: rcmlz Date: Wed, 10 Jul 2024 11:18:12 +0200 Subject: [PATCH 05/22] tigerjython: init at 2.39 --- pkgs/by-name/ti/tigerjython/package.nix | 99 +++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 pkgs/by-name/ti/tigerjython/package.nix diff --git a/pkgs/by-name/ti/tigerjython/package.nix b/pkgs/by-name/ti/tigerjython/package.nix new file mode 100644 index 000000000000..6d85a7c04f47 --- /dev/null +++ b/pkgs/by-name/ti/tigerjython/package.nix @@ -0,0 +1,99 @@ +{ + stdenvNoCC, + lib, + fetchurl, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + jre, +}: +let + icon = fetchurl { + # In case tigerjython/tjinstall becomes unavailable, use this url - see comment for src in MkDerivation + #url = "https://web.archive.org/web/20240623120114/https://raw.githubusercontent.com/tigerjython/tjinstall/master/tjlogo64.png"; + url = "https://raw.githubusercontent.com/tigerjython/tjinstall/611c56d4e765731883656a5c4b71209d72b5ab74/tjlogo64.png"; + hash = "sha256-tw3uDWLtcMHYmN6JGsEvVKLgI09v5DF27V2+OF9Z5tA="; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tigerjython"; + + # UPDATE instructions + # + # We cache potentially unstable upstream input (.tar.gz file) via https://web.archive.org - this is a common procedure in Nixpkgs. + # + # - Open https://tigerjython.ch/en/products/download and identify the new version string for "TigerJython IDE for Linux" + version = "2.39"; + + # - and copy download link (most likely https://tigerjython.ch/user/pages/download/TigerJython.tar.gz) to clipboard. + # - Open http://web.archive.org and paste download link from clipboard into "Save Page Now" field and hit the "Save Page" button. + # - Unselect "Save Error Pages" and hit "Save Page" again. + # - Wait for the archive link to be generated and copy it to the url field - adjust hash accordingly. + src = fetchurl { + url = "http://web.archive.org/web/20240119124245/https://tigerjython.ch/user/pages/download/TigerJython.tar.gz"; + hash = "sha256-PdoAOjr19aLmXYrLtMCq/tZ2Fqq7pINTuhFyMMiC0yM="; + }; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "TigerJython"; + desktopName = "TigerJython"; + comment = "The Python IDE for beginners"; + type = "Application"; + categories = [ "Education" ]; + terminal = false; + startupNotify = false; + exec = "tigerjython"; + icon = "tigerjython"; + mimeTypes = [ "text/x-python" ]; + }) + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + export CUSTOM_LIBS=$out/share/java + export JAR=$CUSTOM_LIBS/tigerjython2.jar + export EXAMPLES_DIR=$CUSTOM_LIBS/Examples + + install -Dm444 bin/tigerjython2.jar $JAR + install -Dm444 bin/Lib/* --target-directory=$CUSTOM_LIBS + install -Dm444 bin/TestSamples/* --target-directory=$EXAMPLES_DIR + + makeWrapper ${jre}/bin/java $out/bin/tigerjython \ + --add-flags "-Duser.dir=$CUSTOM_LIBS/" \ + --add-flags "-Xmx512M" \ + --add-flags "-jar $JAR" \ + --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=lcd' + + runHook postInstall + ''; + + postInstall = '' + install -Dm444 ${icon} $out/share/icons/hicolor/64x64/apps/tigerjython.png + ''; + + meta = { + homepage = "https://www.tigerjython.ch"; + downloadPage = "https://tigerjython.ch/en/products/download"; + description = "Simple development environment for programming in Python"; + longDescription = '' + Designing, coding, and amazing. TigerJython offers everything you need + to go from Python programming beginner to professional. + You will find a wide variety of tutorials and can get started right away + in programming environments specially developed for you. + ''; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ rcmlz ]; + platforms = lib.platforms.all; + mainProgram = "tigerjython"; + }; +}) From 64ba49b8e5b55c6ce224292adc4cd3c5c230c1cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 03:11:57 +0000 Subject: [PATCH 06/22] libjwt: 1.17.1 -> 1.17.2 --- pkgs/development/libraries/libjwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/development/libraries/libjwt/default.nix index 5643efb7079f..724e464cddda 100644 --- a/pkgs/development/libraries/libjwt/default.nix +++ b/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "sha256-yMnk4gfUa5c6Inppz9I1h6it41nuJ4By3eDO0YrdB2Y="; + sha256 = "sha256-y7QX6P0EScY9MMdbwc8nDUKCxtNQCqjh9wlbxVuT6lA="; }; buildInputs = [ jansson openssl ]; From f7ead05e978e616a5951e4ddd70a9de66a02a15e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 18:12:45 +0000 Subject: [PATCH 07/22] melange: 0.10.0 -> 0.11.2 --- pkgs/development/tools/melange/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index cd7ef00e8036..30cc14902e15 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-GSYsmXERdxSmd9IPfgkg2dEtFHnYQpAFXnCiZJ8CAM0="; + hash = "sha256-OHIpMVXfuX5ezkDGsJIaFgsh5+YolJyap+i9jcUQch0="; # 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; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-czsCvos9C6AwV+PiwkNHePWT6NvE8GhnvfiAbKKXQuU="; + vendorHash = "sha256-X4jyLZATJIbTeL4moRrrJQ4B36tlUEfpK6SjBhlJTHQ="; subPackages = [ "." ]; From 074ab2651a9aece7473413a793b525f2dd976a8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Aug 2024 07:45:06 +0000 Subject: [PATCH 08/22] vitess: 19.0.4 -> 20.0.1 --- pkgs/development/tools/database/vitess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index 6f21999ab5d8..09969c80c4e3 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "19.0.4"; + version = "20.0.1"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-rP2a/t+5FhGIj9T6CQodMp9YXYf3fL5oBdFpAn7e7hw="; + hash = "sha256-OkVBV/Fj2OKxkxjVBdTAyiGETuLw7OvV0KInp533iM8="; }; - vendorHash = "sha256-BlHd5GQJwdntmvVti+Jvfw65LrYM+hjwdvQ0duKk5d8="; + vendorHash = "sha256-ZDPDL7vJoPv5pIS5xhHAgLiZsiF2B85KNnqGQJPk1SQ="; buildInputs = [ sqlite ]; From 3ecdf25e37efb32ec0ebc72ee9e511028eb4816a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Aug 2024 17:01:50 +0000 Subject: [PATCH 09/22] pachyderm: 2.10.6 -> 2.11.0 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index e40e97c9d744..d705e9c733f2 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.10.6"; + version = "2.11.0"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-kn2vpc+KcIQXZgSbGf1aAANQ/OW807jhGpVZbfwcFMM="; + hash = "sha256-tr/1A3kOYvprybqE2Ma7AUr7gdDWZly1H38qKfPQVTk="; }; - vendorHash = "sha256-NShVyjNyG06cLmt8rd71lFLvkd8KRWQjj6xUCx7NgSk="; + vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc="; subPackages = [ "src/server/cmd/pachctl" ]; From bab27735f692d6de2d98a3d620b0956c698f05a6 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 17 Aug 2024 21:29:51 +0800 Subject: [PATCH 10/22] emacsPackages.prisma-mode: add missing dependency lsp-mode --- .../elisp-packages/manual-packages/prisma-mode/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix index 41ce7957e758..feab7350cad9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix @@ -3,13 +3,17 @@ fetchFromGitHub, melpaBuild, js2-mode, + lsp-mode, }: melpaBuild { pname = "prisma-mode"; version = "0-unstable-2021-12-07"; - packageRequires = [ js2-mode ]; + packageRequires = [ + js2-mode + lsp-mode + ]; src = fetchFromGitHub { owner = "pimeys"; From 43303ab4bde05c1e5ba15f87e3f36851b63e3f2e Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 17 Aug 2024 21:45:51 +0800 Subject: [PATCH 11/22] emacsPackages.voicemacs: add missing dependency el-patch --- .../emacs/elisp-packages/manual-packages/voicemacs/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix index dbbec44f9ccc..5107bd77f63a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix @@ -15,6 +15,7 @@ porthole, unstableGitUpdater, yasnippet, + el-patch, }: melpaBuild { @@ -45,6 +46,7 @@ melpaBuild { nav-flash porthole yasnippet + el-patch ]; passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; From b9073bef290c5e31b0513abba120b1fc5ad3613c Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 17 Aug 2024 21:56:14 +0800 Subject: [PATCH 12/22] emacs.pkgs.matrix-client: delete It is deprecated in favor of emacsPackages.ement and there is error in its native compilation. --- .../emacs/elisp-packages/manual-packages.nix | 5 +- .../manual-packages/matrix-client/default.nix | 65 ------------------- 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 34469eb19628..4a11b3654550 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -19,10 +19,6 @@ lib.packagesFromDirectoryRecursive { inherit (pkgs) basedpyright git go gopls python3; }; - matrix-client = callPackage ./manual-packages/matrix-client { - _map = self.map; - }; - structured-haskell-mode = self.shm; texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; }; @@ -44,5 +40,6 @@ lib.packagesFromDirectoryRecursive { ess-R-object-popup = throw "emacsPackages.ess-R-object-popup was deleted, since the upstream repo looks abandoned."; # Added 2024-07-15 ghc-mod = throw "emacsPackages.ghc-mod was deleted because it is deprecated, use haskell-language-server instead."; # Added 2024-07-17 haskell-unicode-input-method = throw "emacsPackages.haskell-unicode-input-method is contained in emacsPackages.haskell-mode, please use that instead."; # Added 2024-07-17 + matrix-client = throw "emacsPackages.matrix-client is deprecated in favor of emacsPackages.ement."; # Added 2024-08-17 perl-completion = throw "emacsPackages.perl-completion was removed, since it is broken."; # Added 2024-07-19 } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix deleted file mode 100644 index 59f4b8368139..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - melpaBuild, - fetchFromGitHub, - fetchpatch, - # Emacs packages - _map, - a, - anaphora, - cl-lib, - dash, - dash-functional, - esxml, - f, - frame-purpose, - ht, - ov, - rainbow-identifiers, - request, - s, - tracking, -}: - -melpaBuild { - pname = "matrix-client"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "alphapapa"; - repo = "matrix-client.el"; - rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; - hash = "sha256-GLM8oCbm6PdEZPsM0ogMtNJr8mWjCKoX6ed5AUrYjuk="; - }; - - patches = [ - # Fix: avatar loading when imagemagick support is not available - (fetchpatch { - url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch"; - hash = "sha256-dXUa/HKDe+UjaXYTvgwPdXDuDcHB2HLPGWHboE+Lex0="; - }) - ]; - - packageRequires = [ - _map - a - anaphora - cl-lib - dash - dash-functional - esxml - f - frame-purpose - ht - ov - rainbow-identifiers - request - s - tracking - ]; - - meta = { - description = "Chat client and API wrapper for Matrix.org"; - license = lib.licenses.gpl3Plus; - }; -} From 2421239d668e84349a94a72fe21c2eefba4c8121 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 17 Aug 2024 21:27:17 +0800 Subject: [PATCH 13/22] emacs: let nix build for manualPackages fail if native-comp fails This helps find packaging issues or issues in the package itself. --- .../elisp-packages/manual-packages/acm-terminal/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/acm/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/agda2-mode/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/codeium/default.nix | 2 ++ .../elisp-packages/manual-packages/control-lock/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/copilot/package.nix | 2 ++ .../elisp-packages/manual-packages/ebuild-mode/package.nix | 2 ++ .../elisp-packages/manual-packages/el-easydraw/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/elisp-ffi/package.nix | 2 ++ .../elisp-packages/manual-packages/emacs-conflict/package.nix | 2 ++ .../elisp-packages/manual-packages/evil-markdown/package.nix | 2 ++ .../elisp-packages/manual-packages/font-lock-plus/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/git-undo/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/grid/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/helm-words/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/hsc3-mode/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/icicles/package.nix | 2 ++ .../elisp-packages/manual-packages/idris2-mode/package.nix | 2 ++ .../elisp-packages/manual-packages/isearch-plus/package.nix | 2 ++ .../elisp-packages/manual-packages/isearch-prop/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/jam-mode/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/ligo-mode/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/llvm-mode/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/lsp-bridge/default.nix | 2 ++ .../emacs/elisp-packages/manual-packages/lspce/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/mu4e/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/notdeft/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/ott-mode/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/pod-mode/package.nix | 2 ++ .../elisp-packages/manual-packages/prisma-mode/package.nix | 2 ++ .../elisp-packages/manual-packages/prolog-mode/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/rect-mark/package.nix | 2 ++ .../manual-packages/sunrise-commander/package.nix | 2 ++ .../elisp-packages/manual-packages/sv-kalender/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/texpresso/default.nix | 2 ++ .../manual-packages/tree-sitter-langs/default.nix | 2 ++ .../emacs/elisp-packages/manual-packages/urweb-mode/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/voicemacs/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/wat-mode/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/yes-no/package.nix | 2 ++ .../emacs/elisp-packages/manual-packages/youtube-dl/package.nix | 2 ++ 41 files changed, 82 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix index 07e909b34a68..f24a1e6682b7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix @@ -23,6 +23,8 @@ melpaBuild { popon ]; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix index 1e411af1a871..8a37b99d8b1d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix @@ -15,6 +15,8 @@ melpaBuild { files = ''("acm/*.el" "acm/icons")''; + ignoreCompilationError = false; + meta = { description = "Asynchronous Completion Menu"; homepage = "https://github.com/manateelazycat/lsp-bridge"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix index 5eec518036ea..d02b2b29ce6a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix @@ -8,6 +8,8 @@ melpaBuild { files = ''("src/data/emacs-mode/*.el")''; + ignoreCompilationError = false; + meta = { inherit (Agda.meta) homepage license; description = "Agda2-mode for Emacs extracted from Agda package"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix index 59be7f543d1c..de7c69fd4dd6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix @@ -25,6 +25,8 @@ melpaBuild { }) ]; + ignoreCompilationError = false; + passthru.updateScript = gitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix index 5a352c5c3bc4..058aa722ef8a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix @@ -13,6 +13,8 @@ melpaBuild { hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4="; }; + ignoreCompilationError = false; + meta = { homepage = "https://www.emacswiki.org/emacs/control-lock.el"; description = "Like caps-lock, but for your control key"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index 2225dff0872d..37f8c81ce08e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -30,6 +30,8 @@ melpaBuild { propagatedUserEnvPkgs = [ nodejs ]; + ignoreCompilationError = false; + meta = { description = "Unofficial copilot plugin for Emacs"; homepage = "https://github.com/copilot-emacs/copilot.el"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index b6c53e26c5ed..d37153261edf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -13,6 +13,8 @@ melpaBuild rec { hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc="; }; + ignoreCompilationError = false; + meta = { homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/"; description = "Major modes for Gentoo package files"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index b69423e58331..fe4d9d33ee91 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -21,6 +21,8 @@ melpaBuild { files = ''(:defaults "msg")''; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix index 3bc5b686e548..59922d11a39e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix @@ -27,6 +27,8 @@ melpaBuild { make ''; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix index fea6905e6f31..aa5be89a9b3d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix index 57249b72fbb8..2140665296b6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix @@ -23,6 +23,8 @@ melpaBuild { markdown-mode ]; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix index 93d963a09e08..4c615d0e6cc8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix @@ -17,6 +17,8 @@ melpaBuild { hash = "sha256-er+knxqAejgKAtOnhqHfsGN286biHFdeMIUlbW7JyYw="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix index b1a490fb2c9b..66f6f8c59c7f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-xwVCAdxnIRHrFNWvtlM3u6CShsUiGgl1CiBTsp2x7IM="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix index 0b8b5108043c..cb81a81cc4a0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix index 8e99b427cb44..4a03ad5d97df 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix @@ -22,6 +22,8 @@ melpaBuild { helm ]; + ignoreCompilationError = false; + meta = { homepage = "https://github.com/emacsmirror/helm-words"; description = "Helm extension for looking up words in dictionaries and thesauri"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix index efa79b9ebb05..d44afbeaf3e6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix @@ -16,6 +16,8 @@ melpaBuild { packageRequires = [ haskell-mode ]; + ignoreCompilationError = false; + meta = { inherit (hsc3.meta) homepage license; description = "Emacs mode for hsc3"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix index 59b584d9f9c8..0228bd8f414a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix index 2a7b7b571d12..d9510a9c3e10 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix @@ -24,6 +24,8 @@ melpaBuild { prop-menu ]; + ignoreCompilationError = false; + passthru.updateScript = gitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix index 84dd7a194166..8bc3a667b109 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix @@ -17,6 +17,8 @@ melpaBuild { hash = "sha256-h/jkIWjkLFbtBp9F+lhA3CulYy2XaeloLmexR0CDm3E="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix index c97d3cc2d491..72f4141df79e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix index 418f201fa933..74e25b096b2b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix @@ -27,6 +27,8 @@ melpaBuild rec { mv tmp.el jam-mode.el ''; + ignoreCompilationError = false; + meta = { description = "Emacs major mode for editing Jam files"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix index 045d3f759761..f1055f50f3dd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix @@ -19,6 +19,8 @@ melpaBuild { files = ''("tools/emacs/ligo-mode.el")''; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix index 9fef79b3312d..befbf9df198b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix @@ -9,6 +9,8 @@ melpaBuild { "llvm/utils/emacs/README") ''; + ignoreCompilationError = false; + meta = { inherit (llvmPackages.llvm.meta) homepage license; description = "Major mode for the LLVM assembler language"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index a44a9d79529e..449cbf1099f6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -87,6 +87,8 @@ melpaBuild { __darwinAllowLocalNetworking = true; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix index 78325d90bf78..55a07cd66e68 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix @@ -24,6 +24,8 @@ melpaBuild { # to compile lspce.el, it needs lspce-module.so files = ''(:defaults "${lib.getLib lspce-module}/lib/lspce-module.*")''; + ignoreCompilationError = false; + passthru = { inherit lspce-module; updateScript = nix-update-script { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix index 430b8af291a4..99cd5c6aa9e3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix @@ -27,6 +27,8 @@ elpaBuild { popd ''; + ignoreCompilationError = false; + meta = mu.meta // { description = "Full-featured e-mail client"; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix index fbcd006d666b..f5e5f7cf9278 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix @@ -59,6 +59,8 @@ melpaBuild { install -D --target-directory=$out/bin source/notdeft-xapian ''; + ignoreCompilationError = false; + passthru = { updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix index ac208e29dbf4..94499d71521e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix @@ -15,6 +15,8 @@ melpaBuild { popd ''; + ignoreCompilationError = false; + meta = { description = "Emacs ott mode (from ott sources)"; inherit (ott.meta) homepage license; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix index 51c4fb1f8b1f..3a42b349c51c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix @@ -26,6 +26,8 @@ melpaBuild { install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ $sourceRoot/ChangeLog $sourceRoot/README ''; + ignoreCompilationError = false; + meta = { homepage = "https://metacpan.org/dist/pod-mode"; description = "Major mode for editing .pod-files"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix index feab7350cad9..c5e20aae5e22 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix @@ -22,6 +22,8 @@ melpaBuild { hash = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I="; }; + ignoreCompilationError = false; + meta = { description = "Major mode for Prisma Schema Language"; license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix index 41c9363fbf4a..817598551977 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix @@ -19,6 +19,8 @@ melpaBuild { --replace-fail ";; prolog.el ---" ";;; prolog.el ---" ''; + ignoreCompilationError = false; + meta = { homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix index aee5c8ba2dbf..b44b2281d59c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix @@ -19,6 +19,8 @@ melpaBuild { hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM="; }; + ignoreCompilationError = false; + passthru.updateScript = gitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix index 7cf5a63f4b6c..ee50bda060bf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix @@ -17,6 +17,8 @@ melpaBuild { hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix index 0227fcefc152..8454c581e24a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix @@ -13,6 +13,8 @@ melpaBuild { hash = "sha256-VXz3pO6N94XM8FzLSAoYrj3NEh4wp0UiuG6ad8M7nVU="; }; + ignoreCompilationError = false; + meta = { homepage = "https://www.emacswiki.org/emacs/sv-kalender.el"; description = "Swedish calendar for Emacs"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix index ca83eb04a336..f92bfed79c34 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix @@ -10,6 +10,8 @@ melpaBuild { files = ''("emacs/*.el")''; + ignoreCompilationError = false; + meta = { inherit (texpresso.meta) homepage license; description = "Emacs mode for TeXpresso"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix index 5f04332db117..a0e8969f466b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix @@ -44,6 +44,8 @@ melpaStablePackages.tree-sitter-langs.overrideAttrs(old: { fi '') plugins); + ignoreCompilationError = false; + passthru = old.passthru or {} // { inherit plugins; withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix index d5b597bdf47b..0d000a43d738 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix @@ -20,6 +20,8 @@ melpaBuild { dontConfigure = true; + ignoreCompilationError = false; + meta = { description = "Major mode for editing Ur/Web"; inherit (urweb.meta) license homepage; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix index 5107bd77f63a..94e3d17828f2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix @@ -49,6 +49,8 @@ melpaBuild { el-patch ]; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix index e4bb260d14b4..da9bde05eba9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-jV5V3TRY+D3cPSz3yFwVWn9yInhGOYIaUTPEhsOBxto="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix index 2981cb8f4711..41c0fcc1fdad 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix @@ -13,6 +13,8 @@ melpaBuild { hash = "sha256-ceCOBFfixmGVB3kaSvOv1YZThC2pleYnS8gXhLrjhA8="; }; + ignoreCompilationError = false; + meta = { homepage = "https://www.emacswiki.org/emacs/yes-no.el"; description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix index d3e5a5cfbbb3..b8bb5cd8dc33 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { From fecc6af462655f2f061957b2b12bf6fe62dd768f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 19 Aug 2024 11:42:16 +0200 Subject: [PATCH 14/22] miracle-wm: 0.3.0 -> 0.3.2, fix build --- pkgs/by-name/mi/miracle-wm/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index e29deb34f943..c93995188502 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, gitUpdater, nixosTests, boost, @@ -19,20 +20,30 @@ nlohmann_json, pcre2, pkg-config, + wayland, yaml-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mattkae"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ss93yI33e+XFjbKedbBjmYHkjPeWUWxEStwNTgTszA4="; + hash = "sha256-T5KDnUy/+wRL74v48i3D1OQrHuIoI1WUeybx9D7y+8Y="; }; + patches = [ + # Remove when https://github.com/mattkae/miracle-wm/pull/211 merged & in release + (fetchpatch { + name = "0001-miracle-wm-Dont-ignore-PKG_CONFIG_PATH.patch"; + url = "https://github.com/mattkae/miracle-wm/commit/a9fe6ed1e7dc605f72e18cdc2d19afb3c187be3a.patch"; + hash = "sha256-zzOwqUjyZGYIy/3BvOiedfCubrqaeglvsAzTXyq3wYU="; + }) + ]; + postPatch = '' substituteInPlace session/usr/local/share/wayland-sessions/miracle-wm.desktop.in \ @@ -66,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { mir nlohmann_json pcre2 + wayland yaml-cpp ]; From 9d01eec58488cc2ccf71fb6f8c03ea8773783749 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 00:09:08 +0000 Subject: [PATCH 15/22] uclibc: 1.0.49 -> 1.0.50 --- pkgs/by-name/uc/uclibc-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix index b4464ef3ba65..10d8c5bccac4 100644 --- a/pkgs/by-name/uc/uclibc-ng/package.nix +++ b/pkgs/by-name/uc/uclibc-ng/package.nix @@ -59,11 +59,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uclibc-ng"; - version = "1.0.49"; + version = "1.0.50"; src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz"; - hash = "sha256-NA+dXdEVnGnDOAZU455WfLswSvzT+d+i6YM/D6E/W74="; + hash = "sha256-rthnJR9II6dOpeOjmT06fBIygKvhXjjcIGdww5aPIc8="; }; # 'ftw' needed to build acl, a coreutils dependency From cf6b1924146e2b262186cb8fbfe17f1de6565b49 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 19 Aug 2024 21:32:51 -0300 Subject: [PATCH 16/22] labwc: 0.7.4 -> 0.8.0 --- pkgs/by-name/la/labwc/package.nix | 70 ++++++++++++++++--------------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 137097779a7b..594a255bb989 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -1,41 +1,46 @@ -{ lib -, cairo -, fetchFromGitHub -, gettext -, glib -, libdrm -, libinput -, libpng -, librsvg -, libxcb -, libxkbcommon -, libxml2 -, meson -, ninja -, pango -, pkg-config -, scdoc -, stdenv -, wayland -, wayland-protocols -, wayland-scanner -, wlroots -, xcbutilwm -, xwayland +{ + lib, + cairo, + fetchFromGitHub, + gettext, + glib, + libdrm, + libinput, + libpng, + librsvg, + libxcb, + libxkbcommon, + libxml2, + meson, + ninja, + pango, + pkg-config, + scdoc, + stdenv, + wayland, + wayland-protocols, + wayland-scanner, + wlroots_0_18, + xcbutilwm, + xwayland, }: stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; - rev = finalAttrs.version; - hash = "sha256-7MH1mMfyMkaTVwEBJWvI1Lt3M6kosXOwkowuBTZej3c="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-1PyPk6r/hXkC0EfOIeDqNGrrpvo616derD9u7i3XjkA="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "doc" + "man" + ]; nativeBuildInputs = [ gettext @@ -59,16 +64,14 @@ stdenv.mkDerivation (finalAttrs: { pango wayland wayland-protocols - wlroots + wlroots_0_18 xcbutilwm xwayland ]; - strictDeps = true; + mesonFlags = [ (lib.mesonEnable "xwayland" true) ]; - mesonFlags = [ - (lib.mesonEnable "xwayland" true) - ]; + strictDeps = true; passthru = { providedSessions = [ "labwc" ]; @@ -77,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/labwc/labwc"; description = "Wayland stacking compositor, inspired by Openbox"; - changelog = "https://github.com/labwc/labwc/blob/${finalAttrs.src.rev}/NEWS.md"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "labwc"; maintainers = with lib.maintainers; [ AndersonTorres ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9775674b0f0f..aa0b62ae4708 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31531,10 +31531,6 @@ with pkgs; lame = callPackage ../development/libraries/lame { }; - labwc = callPackage ../by-name/la/labwc/package.nix { - wlroots = wlroots_0_17; - }; - larswm = callPackage ../applications/window-managers/larswm { }; lash = callPackage ../applications/audio/lash { }; From 2b28845f003edc5ef2608f9989758aeb024abe62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 01:35:50 +0000 Subject: [PATCH 17/22] doublecmd: 1.1.16 -> 1.1.17 --- pkgs/by-name/do/doublecmd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 4f85c25244d7..fa15709d3c0a 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.16"; + version = "1.1.17"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-jVK4CKd4QkJp4bu9OrEo8oHxfVpEJd0saSbgc+aeKxU="; + hash = "sha256-TKlhPvfnq62XWTo2twKO8hEjBZW0mWkKruXWhwirtR4="; }; nativeBuildInputs = [ From 11a05813b6e133fb6740969f798ad564dd9f2e38 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 20 Aug 2024 23:43:31 +0300 Subject: [PATCH 18/22] nixos/tests/enlightenment: mark broken --- nixos/tests/enlightenment.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix index bce14c1ddd5c..b82f09a07ed8 100644 --- a/nixos/tests/enlightenment.nix +++ b/nixos/tests/enlightenment.nix @@ -4,6 +4,9 @@ import ./make-test-python.nix ({ pkgs, ...} : meta = with pkgs.lib.maintainers; { maintainers = [ romildo ]; + timeout = 600; + # OCR tests are flaky + broken = true; }; nodes.machine = { ... }: From 0682c789430744251b53b9d635d1abc331851464 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Wed, 21 Aug 2024 22:51:27 +0300 Subject: [PATCH 19/22] hyprland: include xcursor regardless of xwayland --- pkgs/by-name/hy/hyprland/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index e098f80cce7a..aa9c8acb2b4b 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -144,12 +144,12 @@ stdenv.mkDerivation (finalAttrs: { tomlplusplus wayland wayland-protocols + xorg.libXcursor ] ++ lib.optionals stdenv.hostPlatform.isBSD [ epoll-shim ] ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] ++ lib.optionals enableXWayland [ xorg.libxcb - xorg.libXcursor xorg.libXdmcp xorg.xcbutil xorg.xcbutilerrors From 4e845fd63a179328b462a9478fcb09dfdc988700 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 21 Aug 2024 22:28:54 +0100 Subject: [PATCH 20/22] fakeroot: unconditionally apply addendum-charset-conversion.patch (darwin fix) --- pkgs/tools/system/fakeroot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index bd04625d44f9..c386536e1f17 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158"; sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY="; }) + ] ++ [ (fetchpatch { name = "addendum-charset-conversion.patch"; url = "https://salsa.debian.org/clint/fakeroot/-/commit/b769fb19fd89d696a5e0fd70b974f833f6a0655a.patch"; From 3a1f88a19a9a39ccd21fa114e0145faec3db7586 Mon Sep 17 00:00:00 2001 From: Alex James Date: Wed, 21 Aug 2024 19:31:33 -0500 Subject: [PATCH 21/22] delta: update skipped tests on Darwin 0.18.0 replaced the `test_diff_same_non_empty_file` test with `test_diff_real_files`[^1], which similarly fails on Darwin when the sandbox is enabled.[^2]. Update `checkFlags` to skip the new test on Darwin. [^1]: https://github.com/dandavison/delta/commit/5c53c5e3d955c4f993503bfdd4dc82b436017d22#diff-46662042aa1e2ba8561f9c545e204a30c8fe4450296390453f3098263fdb402eL98 [^2]: https://gist.github.com/al3xtjames/fa1a2d5f6dd60cbea7031f4bb7014e12 --- pkgs/applications/version-management/delta/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 994af1db8d35..8e1bd0b2517d 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -50,7 +50,9 @@ rustPlatform.buildRustPackage rec { dontUseCargoParallelTests = true; checkFlags = lib.optionals stdenv.isDarwin [ - "--skip=test_diff_same_non_empty_file" + # This test tries to read /etc/passwd, which fails with the sandbox + # enabled on Darwin + "--skip=test_diff_real_files" ]; meta = with lib; { From 2f0af6ef700e136a2eaf2067abc4bc6c12c5d56e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Aug 2024 02:41:43 +0000 Subject: [PATCH 22/22] python312Packages.huawei-lte-api: 1.9.3 -> 1.10 --- pkgs/development/python-modules/huawei-lte-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index fd331c703670..232add95bf75 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.9.3"; + version = "1.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Salamek"; repo = "huawei-lte-api"; rev = "refs/tags/${version}"; - hash = "sha256-D3PABCFjy7ZhP4L02rUvmKttejDPUE5whxqQih0MvpU="; + hash = "sha256-L6xCX+NHASunB876N1R++xMOx55Z8zc77j5QwKqHsNY="; }; build-system = [ setuptools ];