From c311cd1aaa1dd6ded7c69da7bf126e76624a42eb Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 26 May 2022 11:45:12 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 60 ++++++++++++++++++++++---------------------- patches/172302.patch | 54 --------------------------------------- patches/173363.patch | 58 ------------------------------------------ patches/174178.patch | 57 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 142 deletions(-) delete mode 100644 patches/172302.patch delete mode 100644 patches/173363.patch create mode 100644 patches/174178.patch diff --git a/flake.lock b/flake.lock index fb9f1d26..597f31b4 100644 --- a/flake.lock +++ b/flake.lock @@ -15,11 +15,11 @@ "web": "web" }, "locked": { - "lastModified": 1653209588, - "narHash": "sha256-k5cqM5bCiYLha4XaEGUlRrMXxvxmU9Wak0KW3TbiS2E=", + "lastModified": 1653533940, + "narHash": "sha256-t0kPt1yD55v09Z9GY5biYuRoMO4N9vMdIMOL8eeQFmA=", "owner": "accentor", "repo": "flake", - "rev": "c30663514a5f8a519d788b2c6a2a0188ef7822bd", + "rev": "05f5c086a639dd0ddaf218052d36779b7e6bbf08", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1653209266, - "narHash": "sha256-KEG6JxbbII7ftaOCbC6wPvv9jNRukqm+SL+Y6//dupU=", + "lastModified": 1653541405, + "narHash": "sha256-3mEPUiXWXcuQC1XeNDO0ffK78LtSnXbHTvp7ZpC0j6M=", "owner": "accentor", "repo": "api", - "rev": "dfa2c95af1e3e08f00549bd191eab1e88e1a45f8", + "rev": "ebcf0a1a0b6d78a5744c08697026631794336906", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1653208380, - "narHash": "sha256-x4kR+fRI3eIfe2gRYcX8v+2tf1BgTlUscAy/+33vr2o=", + "lastModified": 1653533139, + "narHash": "sha256-okzc59Z+erTyi5CyBxct44SfhKpsYbLqb/Nz8rPKiv8=", "owner": "accentor", "repo": "web", - "rev": "02d2654cadbcc06e944b9c2997568ba4cbbbcdf3", + "rev": "fddf8b08ad41a93b7fc27a35bba4232faa2ba547", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1652959711, - "narHash": "sha256-wpQhlE/NocxlU3jLiMoF1KYHOEFD5MEFJZkyXXVVef8=", + "lastModified": 1653308769, + "narHash": "sha256-9bylbRkrmaUiYYjcVLd0JyvqpKveOUw5q2mBf2+pR0c=", "owner": "numtide", "repo": "devshell", - "rev": "a5327cd01e58d2848c73062f2661278ad615748f", + "rev": "a00abaeb902ff568f9542d4b6f335e3a4db5c548", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1653219729, - "narHash": "sha256-1ES4JeKpJCZYxCb4h4aoeliSpeYBHEIJaozPAW4Rj44=", + "lastModified": 1653538752, + "narHash": "sha256-3Dl/HeDcvwwS/SbAa9/2+r9x0c2vFog2h5aVk4mOppc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "99235a10c3b3ddd0b3e5fef006c394a4ffba3c37", + "rev": "6945be48fc2c2592de4876c0bc8cfdc8c5227cb3", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1653153149, - "narHash": "sha256-8B/tWWZziFq4DqnAm9uO7M4Z4PNfllYg5+teX1e5yDQ=", + "lastModified": 1653518057, + "narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=", "owner": "nix-community", "repo": "home-manager", - "rev": "94780dd888881bf35165dfdd334a57ef6b14ead8", + "rev": "64831f938bd413cefde0b0cf871febc494afaa4f", "type": "github" }, "original": { @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1652050932, - "narHash": "sha256-1lOa33Z2sC6CmNdqkCtplVHlMUWVZl4FLT6MYOM+WJQ=", + "lastModified": 1653423337, + "narHash": "sha256-TLNyDhwhQWimt5QWzFf/3B7lKk5isdICNRTwiCAhiB0=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "4396125ebbbaecbaba0f8e0afb25e492b3be5795", + "rev": "15cf252a0dfffb2420a60fbd6be3467c11026142", "type": "gitlab" }, "original": { @@ -266,11 +266,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653060744, - "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", + "lastModified": 1653407748, + "narHash": "sha256-g9puJaILRTb9ttlLQ7IehpV7Wcy0n+vs8LOFu6ylQcM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dfd82985c273aac6eced03625f454b334daae2e8", + "rev": "5ce6597eca7d7b518c03ecda57d45f9404b5e060", "type": "github" }, "original": { @@ -282,11 +282,11 @@ }, "nur": { "locked": { - "lastModified": 1653223919, - "narHash": "sha256-SLYdVyoqnQ8rwowMtDrYg/qvg5I3+ZVHZcGSHVFWbh0=", + "lastModified": 1653538104, + "narHash": "sha256-bJhXliehRtnpT9PGltEK3sLbRUmipW+Jl8RlPgH4hZk=", "owner": "nix-community", "repo": "NUR", - "rev": "6c88211931940d3f5362749a52dc1960cf29f6f4", + "rev": "0432735abb9c7ae6211222e91f347d95cb1d1108", "type": "github" }, "original": { @@ -325,11 +325,11 @@ ] }, "locked": { - "lastModified": 1653209026, - "narHash": "sha256-A+zctKZ4e6gwipdQ1aPigooa35TnWmEuto98TnD5BH8=", + "lastModified": 1653532749, + "narHash": "sha256-WcOwIWhfVOoWGgMzeNKX04pPnUEhEDhBpQKhscnBy8Y=", "owner": "chvp", "repo": "tetris", - "rev": "a84f9acf80d4d7a408bb6f9cd076d99693e6ce1c", + "rev": "8c0ba08fd7dc23fcff05794553984f49b579c005", "type": "github" }, "original": { diff --git a/patches/172302.patch b/patches/172302.patch deleted file mode 100644 index d198fbdf..00000000 --- a/patches/172302.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 24506e9141888a548de2cb84fbe95ae0299ba9f4 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -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 { }; diff --git a/patches/173363.patch b/patches/173363.patch deleted file mode 100644 index 95a9183b..00000000 --- a/patches/173363.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 36684377024b22c0cab2690623b408077f6db83a Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -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 -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 ]; - }; - } diff --git a/patches/174178.patch b/patches/174178.patch new file mode 100644 index 00000000..41c79026 --- /dev/null +++ b/patches/174178.patch @@ -0,0 +1,57 @@ +From b4e4982e6ce36281159e2256a936f302bda1eb5c Mon Sep 17 00:00:00 2001 +From: Tad Fisher +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))))