Update dependencies
This commit is contained in:
Charlotte Van Petegem
parent
e54be96ad4
commit
c311cd1aaa
4 changed files with 87 additions and 142 deletions
|
|
@ -1,54 +0,0 @@
|
|||
From 24506e9141888a548de2cb84fbe95ae0299ba9f4 Mon Sep 17 00:00:00 2001
|
||||
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
|
||||
Date: Tue, 10 May 2022 09:55:17 +0200
|
||||
Subject: [PATCH] uni: init at 2.5.1
|
||||
|
||||
---
|
||||
pkgs/applications/misc/uni/default.nix | 24 ++++++++++++++++++++++++
|
||||
pkgs/top-level/all-packages.nix | 2 ++
|
||||
2 files changed, 26 insertions(+)
|
||||
create mode 100644 pkgs/applications/misc/uni/default.nix
|
||||
|
||||
diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/applications/misc/uni/default.nix
|
||||
new file mode 100644
|
||||
index 0000000000000..7ccbf3c953d3c
|
||||
--- /dev/null
|
||||
+++ b/pkgs/applications/misc/uni/default.nix
|
||||
@@ -0,0 +1,24 @@
|
||||
+{ lib, buildGoModule, fetchFromGitHub }:
|
||||
+
|
||||
+buildGoModule rec {
|
||||
+ pname = "uni";
|
||||
+ version = "2.5.1";
|
||||
+
|
||||
+ src = fetchFromGitHub {
|
||||
+ owner = "arp242";
|
||||
+ repo = "uni";
|
||||
+ rev = "v${version}";
|
||||
+ sha256 = "kWiglMuJdcD7z2MDfz1MbItB8r9BJ7LUqfPfJa8QkLA=";
|
||||
+ };
|
||||
+
|
||||
+ vendorSha256 = "6HNFCUSJA6oduCx/SCUQQeCHGS7ohaWRunixdwMurBw=";
|
||||
+
|
||||
+ ldflags = [ "-X main.version=${version}" ];
|
||||
+
|
||||
+ meta = with lib; {
|
||||
+ homepage = "https://github.com/arp242/uni";
|
||||
+ description = "Query the Unicode database from the commandline, with good support for emojis";
|
||||
+ license = licenses.mit;
|
||||
+ maintainers = with maintainers; [ chvp ];
|
||||
+ };
|
||||
+}
|
||||
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
||||
index bf0e839a16c87..15fc5df2a543d 100644
|
||||
--- a/pkgs/top-level/all-packages.nix
|
||||
+++ b/pkgs/top-level/all-packages.nix
|
||||
@@ -29906,6 +29906,8 @@ with pkgs;
|
||||
channel = "ungoogled-chromium";
|
||||
});
|
||||
|
||||
+ uni = callPackage ../applications/misc/uni { };
|
||||
+
|
||||
unigine-valley = callPackage ../applications/graphics/unigine-valley { };
|
||||
|
||||
unigine-heaven = callPackage ../applications/graphics/unigine-heaven { };
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
From 36684377024b22c0cab2690623b408077f6db83a Mon Sep 17 00:00:00 2001
|
||||
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
|
||||
Date: Tue, 17 May 2022 09:59:17 +0200
|
||||
Subject: [PATCH 1/2] mautrix-whatsapp: 0.3.1 -> 0.4.0
|
||||
|
||||
https://github.com/mautrix/whatsapp/releases/tag/v0.4.0
|
||||
---
|
||||
pkgs/servers/mautrix-whatsapp/default.nix | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
|
||||
index b20bd236c85d9..764100ca51f16 100644
|
||||
--- a/pkgs/servers/mautrix-whatsapp/default.nix
|
||||
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
|
||||
@@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
- version = "0.3.1";
|
||||
+ version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
- sha256 = "adsGPVG/EwpzOqhFJvn3anjTXwGY27a7Bc4NNkBeqJk=";
|
||||
+ sha256 = "2F0smK2L9Xj3/65j7vwwGT1OLxcTqkImpn16wB5rWDw=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
- vendorSha256 = "WT8oDtmUFrqfNK/RnEv8+jpGuQEGt+ppjtmcfUGYZv0=";
|
||||
+ vendorSha256 = "Xv+3dJLOHnOjTp5vDbejmkO/NoDQlWxl0KaMx1C3ch0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
From 9d4a9f13969c93d30744c23221da0e5229253ff4 Mon Sep 17 00:00:00 2001
|
||||
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
|
||||
Date: Tue, 17 May 2022 09:59:52 +0200
|
||||
Subject: [PATCH 2/2] mautrix-whatsapp: add myself as a maintainer
|
||||
|
||||
---
|
||||
pkgs/servers/mautrix-whatsapp/default.nix | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
|
||||
index 764100ca51f16..35006f79782ae 100644
|
||||
--- a/pkgs/servers/mautrix-whatsapp/default.nix
|
||||
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
|
||||
@@ -21,6 +21,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/tulir/mautrix-whatsapp";
|
||||
description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
|
||||
license = licenses.agpl3Plus;
|
||||
- maintainers = with maintainers; [ vskilet ma27 ];
|
||||
+ maintainers = with maintainers; [ vskilet ma27 chvp ];
|
||||
};
|
||||
}
|
||||
57
patches/174178.patch
Normal file
57
patches/174178.patch
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
From b4e4982e6ce36281159e2256a936f302bda1eb5c Mon Sep 17 00:00:00 2001
|
||||
From: Tad Fisher <tadfisher@gmail.com>
|
||||
Date: Mon, 23 May 2022 12:52:17 -0700
|
||||
Subject: [PATCH] emacsPackages.melpaBuild: Update package-build, avoid
|
||||
monkey-patch
|
||||
|
||||
---
|
||||
pkgs/build-support/emacs/melpa.nix | 4 ++--
|
||||
pkgs/build-support/emacs/melpa2nix.el | 18 ++++++++++++++----
|
||||
2 files changed, 16 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
|
||||
index 408448f26a0e7..924e6d95f14a8 100644
|
||||
--- a/pkgs/build-support/emacs/melpa.nix
|
||||
+++ b/pkgs/build-support/emacs/melpa.nix
|
||||
@@ -38,8 +38,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
|
||||
packageBuild = fetchFromGitHub {
|
||||
owner = "melpa";
|
||||
repo = "package-build";
|
||||
- rev = "047801d301a73d4932f33f768d94a8ed26b8d524";
|
||||
- sha256 = "0ygzkpg7xc3mjjbxg1kcyz6fwbkb0prvca499f0ffmhfaiv28h59";
|
||||
+ rev = "35017a2d87376c70c3239f48bdbac7efca85aa10";
|
||||
+ sha256 = "07hdmam85452v4r2vaabj1qfyami1hgbh0jgj9dcwbkpr0y1gvqj";
|
||||
};
|
||||
|
||||
elpa2nix = ./elpa2nix.el;
|
||||
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
|
||||
index 383423af08189..72667dea652c1 100644
|
||||
--- a/pkgs/build-support/emacs/melpa2nix.el
|
||||
+++ b/pkgs/build-support/emacs/melpa2nix.el
|
||||
@@ -11,12 +11,22 @@
|
||||
;; Allow installing package tarfiles larger than 10MB
|
||||
(setq large-file-warning-threshold nil)
|
||||
|
||||
+(defun melpa2nix-build-package-1 (rcp version commit)
|
||||
+ (let ((source-dir (package-recipe--working-tree rcp)))
|
||||
+ (unwind-protect
|
||||
+ (let ((files (package-build-expand-files-spec rcp t)))
|
||||
+ (cond
|
||||
+ ((= (length files) 1)
|
||||
+ (package-build--build-single-file-package
|
||||
+ rcp version commit files source-dir))
|
||||
+ ((> (length files) 1)
|
||||
+ (package-build--build-multi-file-package
|
||||
+ rcp version commit files source-dir))
|
||||
+ (t (error "Unable to find files matching recipe patterns")))))))
|
||||
+
|
||||
(defun melpa2nix-build-package ()
|
||||
(if (not noninteractive)
|
||||
(error "`melpa2nix-build-package' is to be used only with -batch"))
|
||||
(pcase command-line-args-left
|
||||
(`(,package ,version ,commit)
|
||||
- ;; Monkey-patch package-build so it doesn't shell out to git/hg.
|
||||
- (defun package-build--get-commit (&rest _)
|
||||
- commit)
|
||||
- (package-build--package (package-recipe-lookup package) version))))
|
||||
+ (melpa2nix-build-package-1 (package-recipe-lookup package) version commit))))
|
||||
Loading…
Add table
Add a link
Reference in a new issue