Update dependencies
This commit is contained in:
Charlotte Van Petegem
parent
031c0d209a
commit
099eb9ecc4
2 changed files with 21 additions and 78 deletions
42
flake.lock
generated
42
flake.lock
generated
|
|
@ -15,11 +15,11 @@
|
||||||
"web": "web"
|
"web": "web"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653533940,
|
"lastModified": 1653731433,
|
||||||
"narHash": "sha256-t0kPt1yD55v09Z9GY5biYuRoMO4N9vMdIMOL8eeQFmA=",
|
"narHash": "sha256-khTB18ULzzAUaUPWBGLNgytSQT/nsu9KE4f6YicdZJI=",
|
||||||
"owner": "accentor",
|
"owner": "accentor",
|
||||||
"repo": "flake",
|
"repo": "flake",
|
||||||
"rev": "05f5c086a639dd0ddaf218052d36779b7e6bbf08",
|
"rev": "9a08d6f8844a9eb22fa73bf2251cc6c4a890a6d0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -41,11 +41,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653575582,
|
"lastModified": 1653704792,
|
||||||
"narHash": "sha256-XZCeWmDyocwCSj52bhNhsbTaKYkeewwPWdmm8V7YcEM=",
|
"narHash": "sha256-tHmvv9XNAEKNRSinvOUN8LuyIK/ZWyq9qxOQjgWlgN4=",
|
||||||
"owner": "accentor",
|
"owner": "accentor",
|
||||||
"repo": "api",
|
"repo": "api",
|
||||||
"rev": "bdd967ac1ab2343d80eec6fb2e7fa8532ce1c0de",
|
"rev": "0d11655d48d4d91734cadc88f778ca2a5e4a19aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -67,11 +67,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653533139,
|
"lastModified": 1653708773,
|
||||||
"narHash": "sha256-okzc59Z+erTyi5CyBxct44SfhKpsYbLqb/Nz8rPKiv8=",
|
"narHash": "sha256-7UZhfoSCFdI8jfjJQZ4YX9w0IFbhi0J2hFSIrHHkuuM=",
|
||||||
"owner": "accentor",
|
"owner": "accentor",
|
||||||
"repo": "web",
|
"repo": "web",
|
||||||
"rev": "fddf8b08ad41a93b7fc27a35bba4232faa2ba547",
|
"rev": "808d78ed2c721cf57c6d79f44b1060b0ad74823f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -177,11 +177,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653679857,
|
"lastModified": 1653713938,
|
||||||
"narHash": "sha256-9gn+1Xaqm2Mdc6QD+wHB74tJzn/+tqOSHzwz0C1212U=",
|
"narHash": "sha256-r8fh0Yrrkh6dcgKgXjUo1X985Qmyu4neiJ4DWcwIV5k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "3380f53d06f484a87c5dd0317bc081dbc9f5f13d",
|
"rev": "b4e68af357c86148dad55b0a40049c63df7271b4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -266,11 +266,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653407748,
|
"lastModified": 1653581809,
|
||||||
"narHash": "sha256-g9puJaILRTb9ttlLQ7IehpV7Wcy0n+vs8LOFu6ylQcM=",
|
"narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5ce6597eca7d7b518c03ecda57d45f9404b5e060",
|
"rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -282,11 +282,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653644476,
|
"lastModified": 1653724318,
|
||||||
"narHash": "sha256-/CLFYMHQvoMtdg9QxBGgwTPGFcetqnnyDKA0agCJABs=",
|
"narHash": "sha256-4J2d/fc7huLrYsU7VRiquSNOcQoqQQQGNweR48zFEc4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "7d0a3fef248bc5f6b81124e49100b55c495b27cf",
|
"rev": "7a8313c6322856a5adbf9217e289733e67020652",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -325,11 +325,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653559117,
|
"lastModified": 1653730829,
|
||||||
"narHash": "sha256-g7A8TPVD4k/cX3/j2EKEm+S0ZUuyRp3pkA0KLxoZMXQ=",
|
"narHash": "sha256-PuJl51mB6GoN5mgP4bXDDFhWWmzbhfsegMWbZlHptdk=",
|
||||||
"owner": "chvp",
|
"owner": "chvp",
|
||||||
"repo": "tetris",
|
"repo": "tetris",
|
||||||
"rev": "e83dde13260f44282b27e28554383d2ad69db7d4",
|
"rev": "578e9be4f8ab03d93967583d11d29a96dbf40dbc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
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