From bd6789be2007612f42192c0df135ed54133108dd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 21 Nov 2023 00:37:32 -0500 Subject: gnu: linux-libre 6.6: Update to 6.6.2. * gnu/packages/linux.scm (linux-libre-6.6-version): Update to 6.6.2. (linux-libre-6.6-pristine-source): Update hash. Change-Id: Id9fcd2c35b602d1bda0395b867969801aabffe1c --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2024163a08..bfa7e5d600 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -493,7 +493,7 @@ (define (%upstream-linux-source version hash) ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.6-version "6.6.1") +(define-public linux-libre-6.6-version "6.6.2") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts @@ -503,7 +503,7 @@ (define deblob-scripts-6.6 (base32 "1hg3ck1j8288fhlhcvhgs1zzwh3i62nfvphw7x3vsaqr75kiwbjp"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "0d42b1hbvv9w3y3q4wydr6il0g5a823n54a06p4p5vcpgkadf7ns"))) + (hash (base32 "0zmpk5ls6282j88xpnymkr8z5hxpk2495hjjxm0jmb6ninnzdm3k"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) -- cgit v1.2.3 From 8e0485515d710b089bf04e642b211109c7438108 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 21 Nov 2023 00:38:24 -0500 Subject: gnu: linux-libre: Update to 6.5.12. * gnu/packages/linux.scm (linux-libre-6.5-version): Update to 6.5.12. (linux-libre-6.5-pristine-source): Update hash. Change-Id: Ie4c626df9d2332a64a1b6f4780cbbfefda1d5626 --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bfa7e5d600..1845d67344 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -508,7 +508,7 @@ (define-public linux-libre-6.6-pristine-source (%upstream-linux-source version hash) deblob-scripts-6.6))) -(define-public linux-libre-6.5-version "6.5.11") +(define-public linux-libre-6.5-version "6.5.12") (define-public linux-libre-6.5-gnu-revision "gnu") (define deblob-scripts-6.5 (linux-libre-deblob-scripts @@ -518,7 +518,7 @@ (define deblob-scripts-6.5 (base32 "066z5lw5vrfayhv23hpfcm6fh6b7zmn2v13kfv1g3z3jl1wblhfh"))) (define-public linux-libre-6.5-pristine-source (let ((version linux-libre-6.5-version) - (hash (base32 "06dmb4hbwrms0lp4axphwgj8wbnzsym70sx55lxr501b53wlmqif"))) + (hash (base32 "17rmkzxszp2jg1zx2mmdcy30ffrsd0qms513sxd14klp5k9w2saa"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.5))) -- cgit v1.2.3 From 24f5c0cfb63ce3a6c75e3469ddf7579a3e98daab Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 21 Nov 2023 00:38:45 -0500 Subject: gnu: linux-libre 6.1: Update to 6.1.63. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.63. (linux-libre-6.1-pristine-source): Update hash. Change-Id: I95037f235a9c5b61730c0b0423517763e6e0582e --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1845d67344..32b233988f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -526,7 +526,7 @@ (define-public linux-libre-6.5-pristine-source ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-6.1-version "6.1.62") +(define-public linux-libre-6.1-version "6.1.63") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -536,7 +536,7 @@ (define deblob-scripts-6.1 (base32 "1hdibv43xbn1lv83i6qjgfmf1bvqxvq17fryfsq4r4sjgs9212js"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "1v453q4sf0j8708ivs1zmdf645hgimqvxfc8xz7czgnnmipn3zdr"))) + (hash (base32 "13bmy22mi4ybl21kr3hdy6qiaawiqz2jgl2gl9hwqkyx04xh97f2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit v1.2.3 From 1de25bd7e9135ad60bcfa11990a55a7c1fc7420d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 21 Nov 2023 00:39:00 -0500 Subject: gnu: linux-libre 5.15: Update to 5.15.139. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.139. (linux-libre-5.15-pristine-source): Update hash. Change-Id: I664fdafc4e1f60eedb24935a8cda49c3168bfc5a --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 32b233988f..d27fd93f76 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -541,7 +541,7 @@ (define-public linux-libre-6.1-pristine-source (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.138") +(define-public linux-libre-5.15-version "5.15.139") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -551,7 +551,7 @@ (define deblob-scripts-5.15 (base32 "1idjrn2w8jrixj8ifkk1awxyyq5042nc4p2mld4rda96azlnp948"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1ajaxy97gx0c9cdxiyxa49ykfsykir22i9abfrcizh71ci0yb15g"))) + (hash (base32 "0kh4v1224a7p7ib64pnmc1qid3d1lvg3c14l5s4rpr8qzq6w2s4w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.2.3 From 875cc9e31f7e3cd76cfc513df0135f4ffa79930e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 21 Nov 2023 00:39:15 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.201. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.201. (linux-libre-5.10-pristine-source): Update hash. Change-Id: Ib578c3d98294d08be248326ef66c31cdfb927805 --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d27fd93f76..1f3832f9fb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -556,7 +556,7 @@ (define-public linux-libre-5.15-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.200") +(define-public linux-libre-5.10-version "5.10.201") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -566,7 +566,7 @@ (define deblob-scripts-5.10 (base32 "0xrrnmb5kcc5r21bdm24aq0fnkk1imn367c1cxlj78b6l6gigx4b"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "012i41bj8rcqn0vhfxrwq3gg82nb6pp2cwq8n146wj47pwgrcbcx"))) + (hash (base32 "0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 1ec6796c5f2c2beb8c610b6a128839941234aa5b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 21 Nov 2023 00:39:33 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.261. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.261. (linux-libre-5.4-pristine-source): Update hash. Change-Id: I3624696b83474ffea9c0d633c66f9a9fe440184a --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1f3832f9fb..fc92663245 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -571,7 +571,7 @@ (define-public linux-libre-5.10-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.260") +(define-public linux-libre-5.4-version "5.4.261") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -581,7 +581,7 @@ (define deblob-scripts-5.4 (base32 "0sw67b2pk3lng4y67diqqnhxaggnp3nbkx8dxc5fs27rinfxr4m1"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1zpbaipd2j3idj8h9iznlj0ywcq5nkhwj707a1f9ixf82h3q4c4q"))) + (hash (base32 "1hsgnv2vcziflhzrrxiny2yp88ybdqda48fm60xhpaphhs0cgfii"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 616c0ca13cf4512712cacd300b90d9b84255c0c1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 21 Nov 2023 00:39:51 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.299. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.299. (linux-libre-4.19-pristine-source): Update hash. Change-Id: Ia51529e3c4ea05328404bcccaac883237ddc52be --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fc92663245..f9d0f6d16a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -586,7 +586,7 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.298") +(define-public linux-libre-4.19-version "4.19.299") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -596,7 +596,7 @@ (define deblob-scripts-4.19 (base32 "1425mhkfxn18vxn05bb4h3li7x1jl7l1hf1zi8xhnqv3wa31h9wl"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0mhgq6hdcls1af7nj999x1mds5b37s7vwin8nsb4q0lnx2y1da4x"))) + (hash (base32 "12p431p2jqjfsf0all3fgn47z9fr2cdqyxipfrf4s4mlw4hpbyy6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 9a89b4f2eccb673975c9e70437ec61ac1ccbdf62 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 21 Nov 2023 00:40:08 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.330. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.330. (linux-libre-4.14-pristine-source): Update hash. Change-Id: I7070fee547089377d945f9fc86f2eb0fa6f95f0d --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f9d0f6d16a..2c2164d83c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -601,7 +601,7 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.329") +(define-public linux-libre-4.14-version "4.14.330") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -611,7 +611,7 @@ (define deblob-scripts-4.14 (base32 "1faagsj4i31z2bp83hflx3q9vrddjnn37a3ah2b47iaplva7z1nd"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1dvb4xf0b7snabznl7bg7gga7ffdmywy8vr8q65pzl9yf6fnhdny"))) + (hash (base32 "0rwgzyfmrns6zir0dpxkwz2hm3z8c0af3wy11lmxamaa5i2wq3k7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From f3abc356cdff69a5234fba9f68aa86199b35d127 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 11 Nov 2023 09:05:10 +0800 Subject: gnu: fcitx5: Update to 5.1.5. * gnu/packages/fcitx5.scm (fcitx5): Update to 5.1.5. Change-Id: I6e3ac3c8ad77fd53d431bd1501ae6b44ad49a66a --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index dcf2695118..e9c797dcdb 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -87,7 +87,7 @@ (define-public xcb-imdkit (define-public fcitx5 (package (name "fcitx5") - (version "5.1.0") + (version "5.1.5") (source (origin (method url-fetch) @@ -95,7 +95,7 @@ (define-public fcitx5 "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-" version "_dict.tar.xz")) (sha256 - (base32 "1a1d3bcxddv3hsmffgf608arhamia17bq82q932sy5zl9j8s423y")))) + (base32 "108a8561wh01vl5gqp2rnmnrh9qq3v8md3410dw46lx705a1wy4r")))) (arguments (list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF"))) (build-system cmake-build-system) -- cgit v1.2.3 From 075ffb39b63faf73a59f39e40651dacb12d50413 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 11 Nov 2023 09:05:11 +0800 Subject: gnu: fcitx5-lua: Update to 5.0.11. * gnu/packages/fcitx5.scm (fcitx5-lua): Update to 5.0.11. Change-Id: Iacfd1a197c888cc1a79e31723c57e5ac34a8a7f5 --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index e9c797dcdb..f87fef191f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -138,7 +138,7 @@ (define-public fcitx5 (define-public fcitx5-lua (package (name "fcitx5-lua") - (version "5.0.10") + (version "5.0.11") (source (origin (method url-fetch) @@ -146,7 +146,7 @@ (define-public fcitx5-lua "https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-" version ".tar.xz")) (sha256 - (base32 "13vh6i7pap3h9jrjri3cfi7pcjwhlkw9g24ibfh0aykdhd8d7p99")))) + (base32 "1hc1vhaycfp9bjvch7qrvza5gdimr30rvwavbwqd27lrh36910yc")))) (build-system cmake-build-system) (arguments (list -- cgit v1.2.3 From 6427b76e4206ceffd385b2cce19ca73f217758ac Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 11 Nov 2023 09:05:12 +0800 Subject: gnu: libime: Update to 1.1.3. * gnu/packages/fcitx5.scm (libime): Update to 1.1.3. [inputs]: Add zstd:lib. [native-inputs]: Add pkg-config and remove python. Change-Id: Ia3a580c2292b68a8f492b29c37d7219a77271d54 --- gnu/packages/fcitx5.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index f87fef191f..5dc2af85b1 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -29,6 +29,7 @@ (define-module (gnu packages fcitx5) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages anthy) #:use-module (gnu packages boost) + #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages datastructures) #:use-module (gnu packages enchant) @@ -164,19 +165,19 @@ (define-public fcitx5-lua (define-public libime (package (name "libime") - (version "1.1.0") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-" version "_dict.tar.xz")) (sha256 - (base32 "0jqr9riwygr3c9qzs8hx46smhgys68bf6m70fmam819903a9gpf0")))) + (base32 "0c1zn4bi71a84jh7x0fly3xqrsjm08ja3sglxrkfm9snk0x6ybhf")))) (build-system cmake-build-system) (inputs - (list fcitx5 boost)) + (list fcitx5 boost (list zstd "lib"))) (native-inputs - (list extra-cmake-modules python)) ;needed to run test + (list extra-cmake-modules pkg-config)) (home-page "https://github.com/fcitx/libime") (synopsis "Library for implementing generic input methods") (description "Libime is a library for implementing various input method -- cgit v1.2.3 From 774b180e1b9cea0fca4178875ef1434a580ab602 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 11 Nov 2023 09:05:14 +0800 Subject: gnu: fcitx5-anthy: Update to 5.1.2. * gnu/packages/fcitx5.scm (fcitx5-anthy): Update to 5.1.2. Change-Id: I0e6e8b3774221fdb91ee91fa2870cdda3d6e9273 --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 5dc2af85b1..fd81b2e027 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -340,7 +340,7 @@ (define-public fcitx5-qt (define-public fcitx5-anthy (package (name "fcitx5-anthy") - (version "5.1.0") + (version "5.1.2") (source (origin (method url-fetch) @@ -348,7 +348,7 @@ (define-public fcitx5-anthy "/fcitx5-anthy/fcitx5-anthy-" version ".tar.xz")) (sha256 - (base32 "0hzk3v36ph6f2nnlqqyw08w3qakbcb71y572ff09cy5b20vb29dp")))) + (base32 "0a1x1b7y5n1a9clb9j9mryhx2fnd5l5rwb74f38c0s93rxx8fhpf")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;; no tests -- cgit v1.2.3 From 7d693b1bad58303a967141a5e06ccb8fa4d6a9c0 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 11 Nov 2023 09:05:13 +0800 Subject: gnu: fcitx5-qt: Update to 5.1.3. * gnu/packages/fcitx5.scm (fcitx5-qt): Update to 5.1.3. Change-Id: Id0b375c7d052f2d2d8a4d10f8415b748823efe14 --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index fd81b2e027..e7297ce9d2 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -305,7 +305,7 @@ (define gclient (define-public fcitx5-qt (package (name "fcitx5-qt") - (version "5.1.0") + (version "5.1.3") (source (origin (method url-fetch) @@ -313,7 +313,7 @@ (define-public fcitx5-qt "/fcitx5-qt/fcitx5-qt-" version ".tar.xz")) (sha256 - (base32 "02gnzwf0mlshmh1hw8c1866643qmdqazwjz339jq0c3ll61f8m7h")))) + (base32 "0wyzq91fcqhv655fjhzfjmlj0xr365sl5cjgck75xaj08gj3mw61")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 1f1dedc3bdb80b3390dbcb7a3ad31311ca79ccc2 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 11 Nov 2023 09:05:15 +0800 Subject: gnu: fcitx5-chinese-addons: Update to 5.1.2. * gnu/packages/fcitx5.scm (fcitx5-chinese-addons): Update to 5.1.2. Change-Id: Icbfa1628c23adfc5c2789480c9803a1b1c257a0f --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index e7297ce9d2..241babbded 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -364,7 +364,7 @@ (define-public fcitx5-anthy (define-public fcitx5-chinese-addons (package (name "fcitx5-chinese-addons") - (version "5.1.0") + (version "5.1.2") (source (origin (method url-fetch) @@ -372,7 +372,7 @@ (define-public fcitx5-chinese-addons "/fcitx5-chinese-addons/fcitx5-chinese-addons-" version "_dict.tar.xz")) (sha256 - (base32 "1akf4qqvck7m93i0183ffb7jfsz0rq4f3bkf89vfxlqp4i7lfw5l")))) + (base32 "13na8qvz0vh43gmxa81jn96xpp6maz71ga039z6lqr069hzsx1vc")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From bc97f1aa45acd945a97c9c15a6df60ffcc128304 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 11 Nov 2023 09:05:16 +0800 Subject: gnu: fcitx5-configtool: Update to 5.1.2. * gnu/packages/fcitx5.scm (fcitx5-configtool): Update to 5.1.2. Change-Id: I534cb1943c09d5a36f171608fcbb6b09661d2bb4 --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 241babbded..40f85a317a 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -428,7 +428,7 @@ (define-public fcitx5-chinese-addons (define-public fcitx5-configtool (package (name "fcitx5-configtool") - (version "5.1.0") + (version "5.1.2") (source (origin (method url-fetch) @@ -436,7 +436,7 @@ (define-public fcitx5-configtool "https://download.fcitx-im.org/fcitx5" "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz")) (sha256 - (base32 "0xv5kckm6bsbavw0s2iqg128fv7j8sh49lpwc0acqrdmwj49x1pz")))) + (base32 "1k6101wjl5j9qb174j75g5nbvz7hvh0cj01w6b9n65pqcv4hsf6c")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 857f5017507cfe6cbf742bfb7d33c1520f8c6d15 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 11 Nov 2023 09:05:17 +0800 Subject: gnu: fcitx5-rime: Update to 5.1.3. * gnu/packages/fcitx5.scm (fcitx5-rime): Update to 5.1.3. Change-Id: Ia7939616d93ec0235b9fd50f2ae2a26d551a650c --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 40f85a317a..043eeffbc4 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -538,7 +538,7 @@ (define (install-theme-variant variant target) (define-public fcitx5-rime (package (name "fcitx5-rime") - (version "5.1.1") + (version "5.1.3") (source (origin (method url-fetch) (uri (string-append "https://download.fcitx-im.org/fcitx5" @@ -546,7 +546,7 @@ (define-public fcitx5-rime ".tar.xz")) (sha256 (base32 - "1h6vh5pkak8l528l2d2nw5gy6zqa2sy3ris3xzkakb8kmgyjd3da")))) + "0cs3zq69fpasch6sq9yar2qw8403rxr2g4hjxn7mmshi1h1j6nm8")))) (build-system cmake-build-system) (arguments '(#:tests? #f ;no tests -- cgit v1.2.3 From 6d7eb7de7d09e2964b10537bdcf7fde929421324 Mon Sep 17 00:00:00 2001 From: Suhail Date: Fri, 20 Oct 2023 19:51:35 +0000 Subject: gnu: tilda: Add version 1.6-alpha with D-Bus support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/terminals.scm (tilda-dbus): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/terminals.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index adb5e223e7..ad9fba23a4 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -189,6 +189,29 @@ (define-public tilda (home-page "https://github.com/lanoxx/tilda") (license license:gpl2+))) +(define-public tilda-dbus + (package + (inherit tilda) + (name "tilda") + (version "1.6-alpha") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lanoxx/tilda") + (commit "51a980a55ad6d750daa21d43a66d44577dad277b"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pdarmlxkap9v689s88b89l5hi4vspsrrysh7pbm9rhdjmzk5m2c")))) + (synopsis "GTK+-based drop-down terminal with experimental D-Bus support") + (description + "Tilda is a terminal emulator similar to normal terminals like +gnome-terminal (GNOME) or Konsole (KDE), with the difference that it drops down +from the edge of a screen when a certain configurable hotkey is pressed. This +is similar to the built-in consoles in some applications. Tilda is highly +configurable through a graphical wizard. This version enables D-Bus support +which is necessary for using Tilda on Wayland."))) + (define-public termite (package (name "termite") -- cgit v1.2.3 From 40109b1756b2f41f5c58988980c8a334c71b4cf5 Mon Sep 17 00:00:00 2001 From: Suhail Date: Fri, 20 Oct 2023 19:53:30 +0000 Subject: gnu: tilda: Fix lint error by updating input list format for v1.5.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/terminals.scm (tilda)[native-inputs]: Use updated format. Signed-off-by: Ludovic Courtès --- gnu/packages/terminals.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index ad9fba23a4..a685b2cf09 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -174,10 +174,7 @@ (define-public tilda (for-each make-file-writable (find-files "po" ".")) #t))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + (list autoconf automake gettext-minimal pkg-config)) (inputs (list libconfuse vte)) (synopsis "GTK+-based drop-down terminal") -- cgit v1.2.3 From a8dafaddf4d7a51711c8262a99721dffa259d73b Mon Sep 17 00:00:00 2001 From: Suhail Date: Fri, 20 Oct 2023 19:54:32 +0000 Subject: gnu: tilda: Run guix style on tilda@1.5.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/terminals.scm (tilda): Re-indent. Signed-off-by: Ludovic Courtès --- gnu/packages/terminals.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index a685b2cf09..27b1e1a2ac 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -156,29 +156,27 @@ (define-public tilda (package (name "tilda") (version "1.5.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/lanoxx/tilda") - (commit (string-append "tilda-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0q2i9ny8sh7zjzgvkx8vcvk593wcvchjc4xq4nrlqdd377r7cg5q")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lanoxx/tilda") + (commit (string-append "tilda-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q2i9ny8sh7zjzgvkx8vcvk593wcvchjc4xq4nrlqdd377r7cg5q")))) (build-system glib-or-gtk-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-po-writable - (lambda _ - (for-each make-file-writable (find-files "po" ".")) - #t))))) - (native-inputs - (list autoconf automake gettext-minimal pkg-config)) - (inputs - (list libconfuse vte)) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-po-writable + (lambda _ + (for-each make-file-writable + (find-files "po" ".")) #t))))) + (native-inputs (list autoconf automake gettext-minimal pkg-config)) + (inputs (list libconfuse vte)) (synopsis "GTK+-based drop-down terminal") - (description "Tilda is a terminal emulator similar to normal terminals like + (description + "Tilda is a terminal emulator similar to normal terminals like gnome-terminal (GNOME) or Konsole (KDE), with the difference that it drops down from the edge of a screen when a certain configurable hotkey is pressed. This is similar to the built-in consoles in some applications. Tilda is highly -- cgit v1.2.3 From f40f9178e665bce158e24eeb5fd1592cdb9dc374 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Fri, 20 Oct 2023 13:55:53 -0400 Subject: gnu: Add findimagedupes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/disk.scm (findimagedupes): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/disk.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 9d2e170cc0..113455eee5 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Disseminate Dissent ;;; Copyright © 2023 Timotej Lazar +;;; Copyright © 2023 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ (define-module (gnu packages disk) #:use-module (gnu packages file-systems) #:use-module (gnu packages file) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -71,6 +73,7 @@ (define-module (gnu packages disk) #:use-module (gnu packages guile) #:use-module (gnu packages hurd) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nss) @@ -102,6 +105,7 @@ (define-module (gnu packages disk) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix build-system scons) @@ -343,6 +347,61 @@ (define-public fdisk tables, and it understands a variety of different formats.") (license license:gpl3+))) +(define-public findimagedupes + (package + (name "findimagedupes") + (version "2.20.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jhnc/findimagedupes") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zfxmc6c1z4hzsq3k85xxida1v291frq4wbmxv9cg4jmw0ddk5ic")))) + (build-system perl-build-system) + (arguments + (list + #:tests? #f + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + ;; There's no ‘make install’ target. + (lambda* (#:key outputs #:allow-other-keys) + (install-file "findimagedupes" + (string-append #$output "/bin")))) + (add-after 'unpack 'use-image-magick + ;; TODO: package perl-graphics-magick and switch this out + (lambda _ + (substitute* "findimagedupes" + (("Graphics::Magick") + "Image::Magick")))) + (add-after 'unpack 'set-inline-dir + (lambda _ + (substitute* "findimagedupes" + (("/usr/local") + #$output)))) + (add-after 'install 'inline-generation + (lambda _ + (mkdir-p (string-append #$output "/lib/findimagedupes")) + (invoke (string-append #$output "/bin/findimagedupes")))) + (add-after 'install 'wrap-findimagedupes + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append #$output + "/bin/findimagedupes") + `("PERL5LIB" ":" prefix + (,(getenv "PERL5LIB") ,(string-append #$output + "/lib/perl5/site_perl"))))))))) + (inputs (list bash-minimal perl-db-file perl-file-mimeinfo + perl-image-magick perl-inline-c)) + (home-page "https://github.com/jhnc/findimagedupes") + (synopsis "Find visually similar or duplicate images") + (description "findimagedupes compares a list of files for visual +similarity.") + (license license:gpl3+))) + (define-public gpart ;; The latest (0.3) release is from 2015 and is missing a crash fix. (let ((commit "ec03350a01ad69708b5a3e2d47b8e002b0eba6c9") -- cgit v1.2.3 From 42aabf9dac744ccb4ece315e2d7e058b8410f17e Mon Sep 17 00:00:00 2001 From: Rodion Goritskov Date: Tue, 14 Nov 2023 23:22:21 +0400 Subject: gnu: Add clifm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/clifm.scm (clifm): New variable * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Co-authored-by: Ludovic Courtès Change-Id: Iba6929365aabdc779d42dcde08e826efc7288664 --- gnu/local.mk | 1 + gnu/packages/clifm.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 gnu/packages/clifm.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index fcd9024ce3..fc2662e479 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -177,6 +177,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/chromium.scm \ %D%/packages/ci.scm \ %D%/packages/cinnamon.scm \ + %D%/packages/clifm.scm \ %D%/packages/clojure.scm \ %D%/packages/cluster.scm \ %D%/packages/cmake.scm \ diff --git a/gnu/packages/clifm.scm b/gnu/packages/clifm.scm new file mode 100644 index 0000000000..92d14f1072 --- /dev/null +++ b/gnu/packages/clifm.scm @@ -0,0 +1,62 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Rodion Goritskov +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages clifm) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (guix utils) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages readline) + #:use-module (gnu packages acl) + #:use-module (gnu packages linux)) + +(define-public clifm + (package + (name "clifm") + (version "1.15") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/leo-arch/clifm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1r9pxlyn8jg0wmzbmbc71l42098lz5k32k6yid09yz6d0gaax7g1")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "CC=" + ,(cc-for-target)) + (string-append "PREFIX=" + (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (delete 'check)))) + (inputs (list readline acl libcap)) + (home-page "https://github.com/leo-arch/clifm") + (synopsis "Command-line file manager") + (description "Clifm a shell-like, text-based terminal file manager that +sits on the command line. + +It is built with command line principles in mind: instead of navigating +through a big menu of files, it lets you type, exactly as you do in your +regular shell, but easier and faster.") + (license license:gpl2+))) -- cgit v1.2.3 From c4b4badb2e5d3b47fb48e765c75a1a0be0ae0217 Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Wed, 1 Nov 2023 16:30:22 -0400 Subject: gnu: babeltrace: Do not install bindings as egg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Oddly enough, bindings were now installed as an egg. Fix this by forcing setuptools to install individual files with `--single-version-externally-managed' * gnu/packages/instrumentation.scm (babeltrace)[arguments]<#:make-flags>: Pass it via DISTSETUPOPTS. Change-Id: I143dd16179e1e4728cb8e5d6b00b06359da83389 Signed-off-by: Ludovic Courtès --- gnu/packages/instrumentation.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 7fa7b2f7ba..3097eba033 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -85,7 +85,9 @@ (define-public babeltrace `(#:tests? #f ; FIXME - When Python's bindings are enabled, tests do not ; pass. #:make-flags - ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) + ,#~(list + (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") + "DISTSETUPOPTS=--single-version-externally-managed") ;no .egg files #:configure-flags '("--enable-debug-info" "--enable-man-pages" -- cgit v1.2.3 From 0bc856034076b49cfa20f505a4c11c830b68c1b0 Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Wed, 1 Nov 2023 16:35:16 -0400 Subject: gnu: Add babeltrace/dev. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/instrumentation.scm (babeltrace/dev): New variable. Change-Id: Ib54ced9a1ede5d9acc9a53ff325663a28a3b447f Co-authored-by: Ludovic Courtès --- gnu/packages/instrumentation.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 3097eba033..8b1a2a1c02 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -97,11 +97,9 @@ (define-public babeltrace (modify-phases %standard-phases ;; These are recommended in the project's README for a development ;; build configuration. - (add-before 'configure 'set-environment-variables + (add-after 'unpack 'reconfigure (lambda _ - (setenv "BABELTRACE_DEV_MODE" "1") - (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE") - (invoke "autoreconf" "-vfi")))))) + (delete-file "configure")))))) (inputs (list glib)) ;; NOTE - elfutils is used for the LTTng debug information filter @@ -143,6 +141,21 @@ (define-public babeltrace bindings, and the command-line tool @command{babeltrace2}.") (license license:expat))) +(define-public babeltrace/dev + (package/inherit babeltrace + ;; This dev variant of the package babeltrace is slower but allows better + ;; development of plugins as recommended by the authors. + (name "babeltrace-dev") + (synopsis "Trace manipulation toolkit (variant for plugin developers)") + (arguments + (substitute-keyword-arguments (package-arguments babeltrace) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'set-environment-variables + (lambda _ + (setenv "BABELTRACE_DEV_MODE" "1") + (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE"))))))))) + (define-public barectf (package (name "barectf") -- cgit v1.2.3 From f7995b6644c8ac8af7209a59e595510aa383f6a2 Mon Sep 17 00:00:00 2001 From: Jonathan Pieper Date: Wed, 1 Nov 2023 19:45:57 +0100 Subject: gnu: duplicity: Update to 2.1.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/backup.scm (duplicity): Update to 2.1.4. [source]: Switch to ‘git-fetch’ and change URL. [arguments]: Add ‘fix-version’ phase. Signed-off-by: Ludovic Courtès Change-Id: I0a19d19741f665ddb84da83d4bbefc959290fe42 --- gnu/packages/backup.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 12c4a45b9d..f10c7914d5 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -104,16 +104,16 @@ (define-module (gnu packages backup) (define-public duplicity (package (name "duplicity") - (version "0.8.21") + (version "2.1.4") (source (origin - (method url-fetch) - (uri (string-append "https://code.launchpad.net/duplicity/" - (version-major+minor version) - "-series/" version "/+download/duplicity-" - version ".tar.gz")) - (sha256 - (base32 "0ld4bhsi6iv4bvy99pblbr7vlwy9jbgfd6flyvb8qwbl8rvadzjp")))) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/duplicity/duplicity") + (commit (string-append "rel." version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14x5brpq1l400i9l2hnyqmbn19cc1hnbmj5fn8cs8zzwzbgrfxng")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) ; for msgfmt @@ -155,6 +155,10 @@ (define-public duplicity (substitute* '("testing/functional/__init__.py" "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))))) + (add-before 'build 'fix-version + (lambda _ + (substitute* "duplicity/__init__.py" + (("\\$version") ,(package-version this-package))))) (add-before 'check 'set-up-tests (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" (getcwd)) ; gpg needs to write to $HOME -- cgit v1.2.3 From ad40a5d0e23fd038780ee87ceb4b4363c575f018 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Nov 2023 16:15:16 +0100 Subject: gnu: duplicity: Use ‘search-input-file’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/backup.scm (duplicity)[arguments]: In ‘use-store-file-names’ phase, use ‘search-input-file’. Change-Id: I4b66a22283fc6e426377ad9f4f4c451598eb74e0 --- gnu/packages/backup.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f10c7914d5..5aa0d5688f 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -146,12 +146,14 @@ (define-public duplicity (lambda* (#:key inputs #:allow-other-keys) (substitute* "duplicity/gpginterface.py" (("self.call = u'gpg'") - (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))) + (string-append "self.call = '" + (search-input-file inputs "/bin/gpg") + "'"))) (substitute* "duplicity/backends/giobackend.py" (("subprocess.Popen\\(\\[u'dbus-launch'\\]") (string-append "subprocess.Popen([u'" - (assoc-ref inputs "dbus") - "/bin/dbus-launch']"))) + (search-input-file inputs "/bin/dbus-launch") + "']"))) (substitute* '("testing/functional/__init__.py" "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))))) -- cgit v1.2.3 From 9363ec208b892e3ea43eb573ea4d41d8e269044a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Nov 2023 16:28:02 +0100 Subject: gnu: duplicity: Remove input labels and use gexps. * gnu/packages/backup.scm (duplicity)[native-inputs, propagated-inputs]: Remove labels. [arguments]: Use labels. Change-Id: I08c7d20cca5d2f96edf9da77df9a1a3a8e5c2e5b --- gnu/packages/backup.scm | 93 +++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 45 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 5aa0d5688f..49b0fe2620 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -116,22 +116,20 @@ (define-public duplicity (base32 "14x5brpq1l400i9l2hnyqmbn19cc1hnbmj5fn8cs8zzwzbgrfxng")))) (build-system python-build-system) (native-inputs - `(("gettext" ,gettext-minimal) ; for msgfmt - ("util-linux" ,util-linux) ; setsid command, for the tests - ("par2cmdline" ,par2cmdline) - ("python-fasteners" ,python-fasteners) - ("python-future" ,python-future) ; for tests - ("python-paramiko" ,python-paramiko) - ("python-pexpect" ,python-pexpect) - ("python-pytest" ,python-pytest) - ("python-pytest-runner" ,python-pytest-runner) - ("python-setuptools-scm" ,python-setuptools-scm) - ("tzdata" ,tzdata-for-tests) - ("mock" ,python-mock))) + (list gettext-minimal ; for msgfmt + util-linux ; setsid command, for the tests + par2cmdline + python-fasteners + python-future ; for tests + python-paramiko + python-pexpect + python-pytest + python-pytest-runner + python-setuptools-scm + tzdata-for-tests + python-mock)) (propagated-inputs - `(("lockfile" ,python-lockfile) - ("pygobject" ,python-pygobject) - ("urllib3" ,python-urllib3))) + (list python-lockfile python-pygobject python-urllib3)) (inputs (list dbus ; dbus-launch (Gio backend) librsync @@ -139,36 +137,41 @@ (define-public duplicity gnupg ; gpg executable needed util-linux)) ; for setsid (arguments - `(#:test-target "test" - #:phases - (modify-phases %standard-phases - (add-before 'build 'use-store-file-names - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "duplicity/gpginterface.py" - (("self.call = u'gpg'") - (string-append "self.call = '" - (search-input-file inputs "/bin/gpg") - "'"))) - (substitute* "duplicity/backends/giobackend.py" - (("subprocess.Popen\\(\\[u'dbus-launch'\\]") - (string-append "subprocess.Popen([u'" - (search-input-file inputs "/bin/dbus-launch") - "']"))) - (substitute* '("testing/functional/__init__.py" - "testing/overrides/bin/lftp") - (("/bin/sh") (which "sh"))))) - (add-before 'build 'fix-version - (lambda _ - (substitute* "duplicity/__init__.py" - (("\\$version") ,(package-version this-package))))) - (add-before 'check 'set-up-tests - (lambda* (#:key inputs #:allow-other-keys) - (setenv "HOME" (getcwd)) ; gpg needs to write to $HOME - (setenv "TZDIR" ; some timestamp checks need TZDIR - (search-input-directory inputs "share/zoneinfo")) - ;; Some things respect TMPDIR, others hard-code /tmp, and the - ;; defaults don't match up, breaking test_restart. Fix it. - (setenv "TMPDIR" "/tmp")))))) + (list #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'use-store-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "duplicity/gpginterface.py" + (("self.call = u'gpg'") + (string-append "self.call = '" + (search-input-file inputs + "/bin/gpg") + "'"))) + (substitute* "duplicity/backends/giobackend.py" + (("subprocess.Popen\\(\\[u'dbus-launch'\\]") + (string-append "subprocess.Popen([u'" + (search-input-file inputs + "/bin/dbus-launch") "']"))) + (substitute* '("testing/functional/__init__.py" + "testing/overrides/bin/lftp") + (("/bin/sh") + (which "sh"))))) + (add-before 'build 'fix-version + (lambda _ + (substitute* "duplicity/__init__.py" + (("\\$version") + #$(package-version this-package))))) + (add-before 'check 'set-up-tests + (lambda* (#:key inputs #:allow-other-keys) + (setenv "HOME" + (getcwd)) ; gpg needs to write to $HOME + (setenv "TZDIR" ; some timestamp checks need TZDIR + (search-input-directory inputs + "share/zoneinfo")) + ;; Some things respect TMPDIR, others hard-code /tmp, and the + ;; defaults don't match up, breaking test_restart. Fix it. + (setenv "TMPDIR" "/tmp")))))) (home-page "https://duplicity.gitlab.io/duplicity-web/") (synopsis "Encrypted backup using rsync algorithm") (description -- cgit v1.2.3 From 300e9ad43d1f7a10013aa0724ed3aeb7d93500c1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Nov 2023 16:38:59 +0100 Subject: gnu: cuirass: Update to bdc1f9f. * gnu/packages/ci.scm (cuirass): Update to bdc1f9f. Change-Id: I952442ddd122e63f0414a480cb08b8221d9beedd --- gnu/packages/ci.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 1fa5818b6d..a367a5778b 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -59,11 +59,11 @@ (define-module (gnu packages ci) #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) (define-public cuirass - (let ((commit "eb3f539dc95de705c89b07258efe4663e76f7dab") - (revision "0")) + (let ((commit "bdc1f9f304a3f5931ec507dcfe0b91b185b70708") + (revision "1")) (package (name "cuirass") - (version "1.2.0") + (version (git-version "1.2.0" revision commit)) (source (origin (method git-fetch) @@ -73,7 +73,7 @@ (define-public cuirass (file-name (git-file-name name version)) (sha256 (base32 - "0rvzcsm0zwwv8rb5z0jdgc7adzzx0cin9n2hhclp5d0kqn582hny")))) + "031vv3rk7vzal611iq8sgq5yackp78kdpz8qn78j561pl9bip80n")))) (build-system gnu-build-system) (arguments (list #:modules `((guix build utils) -- cgit v1.2.3 From e5c3cf139da2f147d6da67f587a482e6ed7d9cde Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Nov 2023 08:12:08 +0200 Subject: gnu: aria2: Update to 1.37.0. * gnu/packages/bittorrent.scm (aria2): Update to 1.37.0. Change-Id: Iddaeabb59b774b61610722f485c8c773aaf60434 --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index abf8a609e9..5b06041bdc 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -285,7 +285,7 @@ (define-public tremc (define-public aria2 (package (name "aria2") - (version "1.36.0") + (version "1.37.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/aria2/aria2/releases/" @@ -293,7 +293,7 @@ (define-public aria2 "/aria2-" version ".tar.xz")) (sha256 (base32 - "1987x4ywnnrhhfs9hi2h820c200d7nas9nd35414yh0jiihfglaq")))) + "0sxng4pynhj2qinranpv6wyzys3d42kz1gg2nrn63sw5f2nj1930")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From 5e8e9bcd25e7bfe945e6e31778e156b796bbc131 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Nov 2023 09:05:03 +0200 Subject: gnu: aria2: Unbundle wslay. * gnu/packages/bittorrent.scm (aria2)[source]: Add snippet to delete configure script and remove bundled dependency. Add a patch. [native-inputs]: Add autoconf, automake, gettext-minimal, libtool. [inputs]: Add wslay. * gnu/packages/patches/aria2-unbundle-wslay.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I92390a872454726ff9587518bb535d2105c44ef3 --- gnu/local.mk | 1 + gnu/packages/bittorrent.scm | 15 ++++++- gnu/packages/patches/aria2-unbundle-wslay.patch | 54 +++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/aria2-unbundle-wslay.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index fc2662e479..db9d6b93a4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -920,6 +920,7 @@ dist_patch_DATA = \ %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \ %D%/packages/patches/apr-fix-atomics.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ + %D%/packages/patches/aria2-unbundle-wslay.patch \ %D%/packages/patches/ark-skip-xar-test.patch \ %D%/packages/patches/arpack-ng-propagate-rng-state.patch \ %D%/packages/patches/asli-use-system-libs.patch \ diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 5b06041bdc..6f75a92cff 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -78,6 +78,7 @@ (define-module (gnu packages bittorrent) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) + #:use-module (gnu packages web) #:use-module (gnu packages xml)) (define-public transmission @@ -293,7 +294,12 @@ (define-public aria2 "/aria2-" version ".tar.xz")) (sha256 (base32 - "0sxng4pynhj2qinranpv6wyzys3d42kz1gg2nrn63sw5f2nj1930")))) + "0sxng4pynhj2qinranpv6wyzys3d42kz1gg2nrn63sw5f2nj1930")) + (patches (search-patches "aria2-unbundle-wslay.patch")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "deps") + (delete-file "configure"))))) (build-system gnu-build-system) (arguments (list @@ -312,7 +318,11 @@ (define-public aria2 (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageReceiverTest\\);" text) (string-append "// " text)))))))) (native-inputs - (list cppunit ; for the tests + (list autoconf ; since we adjusted configure.ac + automake + gettext-minimal + libtool + cppunit ; for the tests pkg-config)) (inputs (list c-ares @@ -322,6 +332,7 @@ (define-public aria2 libxml2 nettle sqlite + wslay zlib)) (home-page "https://aria2.github.io/") (synopsis "Utility for parallel downloading files") diff --git a/gnu/packages/patches/aria2-unbundle-wslay.patch b/gnu/packages/patches/aria2-unbundle-wslay.patch new file mode 100644 index 0000000000..e3e534bbe1 --- /dev/null +++ b/gnu/packages/patches/aria2-unbundle-wslay.patch @@ -0,0 +1,54 @@ +This patch causes aria2 to depend on an external wslay. +The wslay version was copied from the configure.ac in deps/wslay +configure still needs to be deleted to update the script +deps/wslay is no longer necessary and can also be removed + +diff --git a/Makefile.am b/Makefile.am +index afe70a2..8c4d058 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = po lib deps src doc test ++SUBDIRS = po lib src doc test + + ACLOCAL_AMFLAGS = -I m4 --install + RST2HTML = @RST2HTML@ +diff --git a/configure.ac b/configure.ac +index 14b340f..74d5937 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1001,15 +1001,18 @@ if test "x$have_option_const_name" = "xyes"; then + fi + + if test "x$enable_websocket" = "xyes"; then +- AC_CONFIG_SUBDIRS([deps/wslay]) ++ PKG_CHECK_MODULES([WSLAY], [libwslay >= 1.1.1], [have_wslay=yes], [have_wslay=no]) + enable_websocket=yes + AC_DEFINE([ENABLE_WEBSOCKET], [1], + [Define 1 if WebSocket support is enabled.]) +- # $(top_srcdir) for `make distcheck` +- WSLAY_CFLAGS="-I\$(top_builddir)/deps/wslay/lib/includes -I\$(top_srcdir)/deps/wslay/lib/includes" +- WSLAY_LIBS="\$(top_builddir)/deps/wslay/lib/libwslay.la" +- AC_SUBST([WSLAY_CFLAGS]) +- AC_SUBST([WSLAY_LIBS]) ++ if test "x$have_wslay" = "xyes"; then ++ WSLAY_CFLAGS="$WSLAY_CFLAGS" ++ WSLAY_LIBS="$WSLAY_LIBS" ++ AC_SUBST([WSLAY_CFLAGS]) ++ AC_SUBST([WSLAY_LIBS]) ++ else ++ ARIA2_DEP_NOT_MET([wslay]) ++ fi + fi + AM_CONDITIONAL([ENABLE_WEBSOCKET], [test "x$enable_websocket" = "xyes"]) + +@@ -1071,8 +1074,7 @@ AC_CONFIG_FILES([Makefile + doc/manual-src/ru/Makefile + doc/manual-src/ru/conf.py + doc/manual-src/pt/Makefile +- doc/manual-src/pt/conf.py +- deps/Makefile]) ++ doc/manual-src/pt/conf.py]) + AC_OUTPUT + + AC_MSG_NOTICE([summary of build options: -- cgit v1.2.3 From f29288a9cecd700f9c5b53236d2233d4da1b2b6a Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:11 -0800 Subject: gnu: Add emacs-dnt. * gnu/packages/emacs-xyz.scm (emacs-dnt): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 90fe9fceeb..96fec9fcc4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -135,6 +135,7 @@ ;;; Copyright © 2023 Sergiu Ivanov ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2023 Thanos Apollo +;;; Copyright © 2023 Ian Eure ;;; ;;; This file is part of GNU Guix. ;;; @@ -3294,6 +3295,29 @@ (define-public emacs-eww-lnum incrementally confined in Isearch manner.") (license license:gpl3+))) +(define-public emacs-dnt + (let ((commit "d28d232d682094ab79cfa78c97668c6ebd327c8c") + (revision "1")) + (package + (name "emacs-dnt") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/dnt.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bls9j1ibw0npjapslbrh6nmlbn3d4ajhjygsqlf6h9qg12sxm3r")))) + (inputs (list emacs-s)) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/dnt") + (synopsis "Strip trackers from URLs") + (description "This package provides a series of rules and helper functions +to prevent advertisers from tracking you when you open URLs (or listen to +podcasts) in Emacs.") + (license (list license:gpl3+))))) ;;; -- cgit v1.2.3 From 025d717382c97913f8abc246ab95c2c6c3fc8aae Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:12 -0800 Subject: gnu: Add emacs-geoclue. * gnu/packages/emacs-xyz.scm (emacs-geoclue): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 96fec9fcc4..e66d748be9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5046,6 +5046,28 @@ (define-public emacs-google-maps directly inside Emacs. It requires a Google Map Static API key to function.") (license license:gpl3+)))) +(define-public emacs-geoclue + (let ((commit "f409b544be4d2cfd848f4658618374b0bc76cb3c") + (revision "1")) + (package + (name "emacs-geoclue") + (version (git-version "0.8.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/geoclue.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ggyn9rvc6si3xy1rrw2f2hyw6cys4bgb9v0ah0qq65y3dnziq6m")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/geoclue") + (synopsis "Determine your current location using GeoClue2 over D-Bus") + (description "This package provides an Emacs library which lets you +determine your current location using GeoClue2 over D-Bus.") + (license (list license:gpl3+))))) + (define-public emacs-nominatim (let ((revision "0") (commit "f814e16f8f4e2cfd633f52b29699a009ab704fbf")) -- cgit v1.2.3 From 70dbb8bb9ad5f2c1aba0400d08a03e154b7c7ae7 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:13 -0800 Subject: gnu: Add emacs-9lc-mode. * gnu/packages/emacs-xyz.scm (emacs-9lc-mode): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e66d748be9..a1c6d2953e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9817,6 +9817,28 @@ (define-public emacs-sbt-mode navigation to errors.") (license license:gpl3+))) +(define-public emacs-9lc-mode + (let ((commit "7871476488fc7b66e05714797a9a5b8275988662") + (revision "1")) + (package + (name "emacs-9lc-mode") + (version (git-version "0.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/9lc-mode.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kmx0c413yvvaq33v7lf3gzdjpxkr5faa1wj2j0m25lyyz8dsdm7")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/geoclue") + (synopsis "Major mode for editing Fluke 9000 scripts") + (description + "This package provides a major mode for editing Fluke 9010a \"9LC\" files.") + (license (list license:gpl3+))))) + (define-public emacs-scheme-complete ;; Upstream does not provide tags. The commit below corresponds to the ;; exact version update. Version is extracted from main file. -- cgit v1.2.3 From c04a9a7a7d3da5250168ddcac9210af6c0fe2b27 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:14 -0800 Subject: gnu: Add emacs-tl1-mode. * gnu/packages/emacs-xyz.scm (emacs-tl1-mode): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a1c6d2953e..867953ce59 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9839,6 +9839,30 @@ (define-public emacs-9lc-mode "This package provides a major mode for editing Fluke 9010a \"9LC\" files.") (license (list license:gpl3+))))) +(define-public emacs-tl1-mode + (let ((commit "48d12893cc81d7f92dc7b603d3751d8512ed0eb0") + (revision "1")) + (package + (name "emacs-tl1-mode") + (version (git-version "1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/tl1-mode.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mf0wqbn9h0353hkhcykzrm2dk1jvyijqs4hsvgj3kwp1whws7br")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/geoclue") + (synopsis "Major mode for editing Fluke 9100 TL/1 source code") + (description + "This package provides a major mode for editing Fluke TL/1 source code. +TL/1 is a language used to control Fluke’s 9100 series of testing and +troubleshooting mainframes.") + (license (list license:gpl3+))))) + (define-public emacs-scheme-complete ;; Upstream does not provide tags. The commit below corresponds to the ;; exact version update. Version is extracted from main file. -- cgit v1.2.3 From bd59fca6d2ab472123fca7008366ea66a8a991eb Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:15 -0800 Subject: gnu: Add emacs-diss. * gnu/packages/emacs-xyz.scm (emacs-diss): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 867953ce59..5a2bbc58e7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17839,6 +17839,29 @@ (define-public emacs-dired-git-info information inside the Dired buffer.") (license license:gpl3+)))) +(define-public emacs-diss + (let ((commit "8a99a1b34de4575087da49fe1e19bcf33ac49f46") + (revision "1")) + (package + (name "emacs-diss") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/diss.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06xvl85dkp3c2cw41f2gy7db2d7fy5pv5w1wr7vd7ccdlg3fq4gc")))) + + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/diss") + (synopsis "Dired Image Slideshow") + (description "Diss is a full-featured image slideshow for Emacs, based +on Dired and image-mode.") + (license (list license:gpl3+))))) + (define-public emacs-dired-toggle-sudo (let ((commit "13bbe52c54893f5aa3e56228450ffdd0c9e1d169") (revision "0")) -- cgit v1.2.3 From 1eafa4c4bee4c2f59820b439e8e0d442d2a41e37 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:16 -0800 Subject: gnu: Add emacs-exwm-mff. * gnu/packages/emacs-xyz.scm (emacs-exwm-mff): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5a2bbc58e7..828ccead0d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31297,6 +31297,29 @@ (define-public emacs-exwm-edit invoked.") (license license:gpl3+)))) +(define-public emacs-exwm-mff + (let ((commit "89206f2e3189f589c27c56bd2b6203e906ee7100") + (revision "1")) + (package + (name "emacs-exwm-mff") + (version (git-version "1.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/exwm-mff.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ipmapyd4jmpnk34wk9kfbvqnl04x74yg2pmj298wqa61ylw1n9j")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/exwm-mff") + (synopsis "Mouse follows focus for EXWM") + (description "This package provides a minor mode to automatically warp +the mouse pointer to the center of a focused window, as well as a command to +warp it to the currently selected window.") + (license (list license:gpl3+))))) + (define-public emacs-exwm-modeline (package (name "emacs-exwm-modeline") -- cgit v1.2.3 From 4de0a818e1867b8eb42e567609e9dca3399d8275 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:17 -0800 Subject: gnu: Add emacs-exwm-firefox-core. * gnu/packages/emacs-xyz.scm (emacs-exwm-firefox-core): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 828ccead0d..55bed96e00 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31341,6 +31341,30 @@ (define-public emacs-exwm-modeline workspaces.") (license license:gpl3+))) +(define-public emacs-exwm-firefox-core + (let ((commit "e2fe2a895e8f973307ef52f8c9976b26e701cbd0") + (revision "1")) + (package + (name "emacs-exwm-firefox-core") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/walseb/exwm-firefox-core.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k5jkjzx6f8nfmbkc61raj585p9pymycgzv7rr3fhv2drgkaa4yi")))) + (inputs (list emacs-exwm)) + (build-system emacs-build-system) + (home-page "https://github.com/walseb/exwm-firefox-core") + (synopsis "Control Firefox with EXWM") + (description + "This package contains functions that execute exwm +keypresses mapped in firefox to the action described in the function name.") + (license (list license:gpl3+))))) + (define-public emacs-ert-async (package (name "emacs-ert-async") -- cgit v1.2.3 From 61dbcde666d27dfb96f373d0f8140bd0d103ba24 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:18 -0800 Subject: gnu: Add emacs-exwm-firefox. * gnu/packages/emacs-xyz.scm (emacs-exwm-firefox): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 55bed96e00..ae104508ee 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31365,6 +31365,31 @@ (define-public emacs-exwm-firefox-core keypresses mapped in firefox to the action described in the function name.") (license (list license:gpl3+))))) +(define-public emacs-exwm-firefox + (let ((commit "7390c3bc425894aeda3c12c23f61a234bb71a2d9") + (revision "1")) + (package + (name "emacs-exwm-firefox") + (version (git-version "0.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/exwm-firefox.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xmgij04h4cbcgqafyyf9qajf0wp6mxpfpwjm6gi1jgisrql882d")))) + (build-system emacs-build-system) + (inputs (list emacs-exwm-firefox-core emacs-s emacs-exwm)) + (home-page "https://codeberg.org/emacs-weirdware/exwm-firefox") + (synopsis "Enhanced support for Firefox under EXWM") + (description + "This package adds enhanced support for Firefox (and forks +based on Firefox) under EXWM. Keybindings intentionally mirror other Emacs +navigation controls.") + (license (list license:gpl3+))))) + (define-public emacs-ert-async (package (name "emacs-ert-async") -- cgit v1.2.3 From 95bebea936b2554ffc73e4c0f67ceee4ed7635dc Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:19 -0800 Subject: gnu: Add emacs-exwm-ss. * gnu/packages/emacs-xyz.scm (emacs-exwm-ss): New variable. Change-Id: Ia3d8d0712b08bd93290d6144dbcf69b6b577654a Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ae104508ee..4993f032cd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31390,6 +31390,29 @@ (define-public emacs-exwm-firefox navigation controls.") (license (list license:gpl3+))))) +(define-public emacs-exwm-ss + (let ((commit "b11d3df7a50c39b4e1b92ef8a6685cf80b53912c") + (revision "1")) + (package + (name "emacs-exwm-ss") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/exwm-ss.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "045b0cjycf7nf52ap89w5dz16l1qyh940qxwvdi76v6al78amrap")))) + (build-system emacs-build-system) + (inputs (list emacs-exwm)) + (home-page "https://codeberg.org/emacs-weirdware/exwm-ss") + (synopsis "Automatically inhibit screensaver activation in EXWM") + (description "This package provides a global minor mode to inhibit +screensaver activation in EXWM.") + (license (list license:gpl3+))))) + (define-public emacs-ert-async (package (name "emacs-ert-async") -- cgit v1.2.3 From 6b5221d72458d9e7181605ff401a73ba89797ed7 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:20 -0800 Subject: gnu: Add emacs-debase. * gnu/packages/emacs-xyz.scm (emacs-debase): New variable. Change-Id: Idab93a2e2f0834b041792beb41790c725be1e16d Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4993f032cd..430847b722 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34890,6 +34890,30 @@ (define-public emacs-helm-linux-disks (home-page "https://github.com/Akirak/helm-linux-disks") (license license:gpl3+)))) +(define-public emacs-debase + (let ((commit "0b6fc2af3440d68798e3a85d4c889341aae07936") + (revision "1")) + (package + (name "emacs-debase") + (version (git-version "0.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/debase.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "112vk1svnc6516vhs47sx5jw6bg8lwrc15l99dxj0sc313lxjy3k")))) + (build-system emacs-build-system) + (inputs (list)) + (home-page "https://codeberg.org/emacs-weirdware/debase") + (synopsis "D-Bus convenience layer for Emacs") + (description + "Debase provides a higher-level API for using and implementing D-Bus +services inside Emacs.") + (license (list license:gpl3+))))) + (define-public emacs-psession (let ((commit "3e97267c92b164584e06a6c70ee7491714c7c12c") (revision "1")) -- cgit v1.2.3 From e72af64dd3be94cdb1eaa7bdf80a1fd26b671dbd Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:21 -0800 Subject: gnu: Add emacs-discomfort. * gnu/packages/emacs-xyz.scm (emacs-discomfort): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 430847b722..e7c58c9459 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34914,6 +34914,28 @@ (define-public emacs-debase services inside Emacs.") (license (list license:gpl3+))))) +(define-public emacs-discomfort + (let ((commit "873eea833bbae7196b92bb1102494b8bf5dc5df6") + (revision "1")) + (package + (name "emacs-discomfort") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/discomfort.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01p4bfiasqxfmp9x1bxdc7763bh712d3vlp2014y8pzrwb1jqdaq")))) + (build-system emacs-build-system) + (inputs (list emacs-debase)) + (home-page "https://codeberg.org/emacs-weirdware/discomfort") + (synopsis "User interface to mount & unmount disks in Emacs.") + (description "Discomfort is an interface to mount and unmount disks in Emacs, using UDisks2.") + (license (list license:gpl3+))))) + (define-public emacs-psession (let ((commit "3e97267c92b164584e06a6c70ee7491714c7c12c") (revision "1")) -- cgit v1.2.3 From 09ed237d624a341f8ca349f729f571536a81d1e4 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:22 -0800 Subject: gnu: Add emacs-shell-here. * gnu/packages/emacs-xyz.scm (emacs-shell-here): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e7c58c9459..4969dabb19 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -36465,6 +36465,30 @@ (define-public emacs-shell-pop you use some other configuration.") (license license:gpl3+)))) +(define-public emacs-shell-here + (let ((commit "eeb437ff26d62a5009046b1b3b4503b768e3131a") + (revision "1")) + (package + (name "emacs-shell-here") + (version (git-version "1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/shell-here.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x8lnybxj7k6wj941lgqmm57f3qqnmb0gc7573l1fxwfhf39fl20")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/shell-here") + (synopsis "Launch a shell relative to default-directory") + (description + "This package provides commands to open a shell buffer in (or relative +to) the default-directory or – using projectile or find-file-in-project – a +project root.") + (license (list license:gpl3+))))) + (define-public emacs-tshell ;; XXX: Upstream has no tagged release. Version is extracted from keyword ;; in main file. -- cgit v1.2.3 From 70140ba71967d0e6cf10d760bb22739b8696e6f2 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:23 -0800 Subject: gnu: Add emacs-hyperspace. * gnu/packages/emacs-xyz.scm (emacs-hyperspace): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4969dabb19..14039e8e3c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -36489,6 +36489,33 @@ (define-public emacs-shell-here project root.") (license (list license:gpl3+))))) +(define-public emacs-hyperspace + (let ((commit "f574d07fd8715e806ba4f0487b73c699963baed3") + (revision "1")) + (package + (name "emacs-hyperspace") + (version (git-version "0.8.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/hyperspace.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19h3d12a99i7a92k3iw4zmjmw3dazsgnkc6j4965h033r1s40amx")))) + (build-system emacs-build-system) + (inputs (list emacs-s)) + (home-page "https://codeberg.org/emacs-weirdware/hyperspace") + (synopsis "Get there from here") + (description + "Hyperspace is a way to get nearly anywhere from wherever +you are, whether that's within Emacs or on the web. It's somewhere in between +Quicksilver and keyword URLs, giving you a single, consistent interface to get +directly where you want to go. It’s for things that you use often, but not +often enough to justify a dedicated binding.") + (license (list license:gpl3+))))) + (define-public emacs-tshell ;; XXX: Upstream has no tagged release. Version is extracted from keyword ;; in main file. -- cgit v1.2.3 From 540f248c51a1950dc4b0b8430edf05ac7b6f4394 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 14 Nov 2023 18:13:24 -0800 Subject: gnu: Add emacs-nssh. * gnu/packages/emacs-xyz.scm (emacs-nssh): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 14039e8e3c..1e19d653a1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -36516,6 +36516,29 @@ (define-public emacs-hyperspace often enough to justify a dedicated binding.") (license (list license:gpl3+))))) +(define-public emacs-nssh + (let ((commit "74d43738565749af680e4d1388e0c2f88e93498d") + (revision "1")) + (package + (name "emacs-nssh") + (version (git-version "0.9.12" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/nssh.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i2nnrg7xv7b2bbby6idszs9byk2jd83q7vqj6lxgn80w94i56nn")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/nssh") + (synopsis "SSH mode for Emacs") + (description "This package provides an SSH mode for Emacs, built on +top of Tramp and shell mode. It keeps a history of previously connected +hosts and supports auto-completion of known hosts.") + (license (list license:gpl3+))))) + (define-public emacs-tshell ;; XXX: Upstream has no tagged release. Version is extracted from keyword ;; in main file. -- cgit v1.2.3 From 5023424f16029ed8e24dc2b2ba8eba5812ece26b Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 16 Nov 2023 19:27:33 +0100 Subject: gnu: Add clingo-dl. * gnu/packages/potassco.scm (clingo-dl): New variable. Change-Id: Ib6ff517435a614c3625d042453db05fe518241cd --- gnu/packages/potassco.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index e6d7caa1ef..887c220ccf 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -221,6 +221,28 @@ (define-public clingo (description "Clingo computes answer sets for a given logic program.") (license license:expat))) +(define-public clingo-dl + (package + (name "clingo-dl") + (version "1.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/potassco/clingo-dl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dncwj63vdm6958vb7355d5j9mdr7hm037j4z82yz6l77jg3sipw")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f ; no tests + #:configure-flags #~`("-DPYCLINGODL_ENABLE=off"))) + (inputs (list clingo)) + (home-page "https://github.com/potassco/clingo-dl") + (synopsis "Solver for answer set programs modulo difference constraints") + (description "Clingo-DL is an extension to Clingo that models constraints +over difference logic.") + (license license:expat))) + (define-public emacs-pasp-mode (let ((commit "59385eb0e8ebcfc8c11dd811fb145d4b0fa3cc92") (revision "1")) -- cgit v1.2.3 From 5b910b4f7cf5f994d42fffb107109808678b706c Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:44 +0100 Subject: gnu: scilab: Remove uneeded code. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scilab): [source](snippet): Remove directory Visual-Studio-settings and file Scilab.sln. [arguments](configure-flags): Remove uneeded FFLAGS environment variable set. [arguments](phases): prebuild: Remove uneeded SCIHOME setting code. Change-Id: I71c044e19617bf556bbe95e7ba0cdbd716921055 Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 34710fc65c..750de949b7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9559,7 +9559,8 @@ (define-public scilab (for-each delete-file-recursively '("scilab" "config" - "libs/GetWindowsVersion")) + "libs/GetWindowsVersion" + "Visual-Studio-settings")) (for-each delete-file (cons* "aclocal.m4" "configure" @@ -9571,6 +9572,7 @@ (define-public scilab "m4/ltversion.m4" "m4/lt~obsolete.m4" "m4/pkg.m4" + "Scilab.sln" (find-files "." "^Makefile\\.in$"))) ;; And finally some files in the modules directory: @@ -9654,10 +9656,7 @@ (define-public scilab (search-input-directory %build-inputs "include/eigen3")) ;; Find and link to the OCaml Num package "OCAMLC=ocamlfind ocamlc -package num" - "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg" - ;; There are some 2018-fortran errors that are ignored - ;; with this fortran compiler flag. - "FFLAGS=-fallow-argument-mismatch") + "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg") #:phases #~(modify-phases %standard-phases ;; The Num library is specified with the OCAMLC and @@ -9685,14 +9684,12 @@ (define-public scilab (lambda* (#:key inputs #:allow-other-keys) ;; Fix scilab script. (substitute* "bin/scilab" - (("\\/bin\\/ls") + (("/bin/ls") (search-input-file inputs "bin/ls"))) ;; Fix core.start. (substitute* "modules/core/etc/core.start" (("'SCI/modules") - "SCI+'/modules")) - ;; Set SCIHOME to /tmp before macros compilation. - (setenv "SCIHOME" "/tmp"))) + "SCI+'/modules")))) ;; Prevent race condition (add-after 'pre-build 'build-parsers (lambda* (#:key (make-flags #~'()) #:allow-other-keys) -- cgit v1.2.3 From d2a4beaf04d90fd26495ac6e05ddc2cae1a96524 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:45 +0100 Subject: gnu: scilab: Activate tests and disable failing tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scilab): Activate tests and disable failing tests. [arguments]: (tests?): Activate tests. (phases): [remove-desktop-files]: Extend and rename to restrain-to-scilab-cli. [disable-failing-tests]: Add phase. Change-Id: Icfec349c6efe14e7787ba8d385e5d51f82be82ea Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 750de949b7..6b208d188a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9627,8 +9627,6 @@ (define-public scilab tk)) (arguments (list - ;; The tests require java code. - #:tests? #f #:configure-flags #~(list "--enable-relocatable" @@ -9668,12 +9666,31 @@ (define-public scilab "modules/scicos/src/translator/makefile.mak" "modules/scicos/src/modelica_compiler/makefile.mak") (("nums\\.cmx?a") "")))) - ;; Install only scilab-cli.desktop - (add-after 'unpack 'remove-desktop-files - (lambda _ - (substitute* "desktop/Makefile.am" - (("desktop_DATA =") - "desktop_DATA = scilab-cli.desktop\nDUMMY =")))) + (add-after 'unpack 'restrain-to-scilab-cli + (lambda _ + ;; Install only scilab-cli.desktop + (substitute* "desktop/Makefile.am" + (("desktop_DATA =") + "desktop_DATA = scilab-cli.desktop\nDUMMY =")) + ;; Replace scilab with scilab-cli for tests. + (substitute* "Makefile.incl.am" + (("scilab-bin") "scilab-cli-bin") + (("scilab -nwni") "scilab-cli") + ;; Do not install tests, demos and examples. + ;; This saves up to 140 Mo in the final output. + (("(TESTS|DEMOS|EXAMPLES)_DIR=.*" all kind) + (string-append kind "_DIR="))))) + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "Makefile" + (("TESTS = .*") + "TESTS =\n")) + (substitute* "modules/functions_manager/Makefile" + (("check:.*") + "check:\n")) + (substitute* "modules/types/Makefile" + (("\\$\\(MAKE\\) \\$\\(AM_MAKEFLAGS\\) check-am") + "")))) ;; These generated files are assumed to be present during ;; the build. (add-after 'bootstrap 'bootstrap-dynamic_link-scripts -- cgit v1.2.3 From 70b1ac2bc56d57565d3c0cae6d62588cefd35bb3 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:46 +0100 Subject: gnu: scilab: Use gexp for tcl and tk libraries. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scilab): Use gexp for tcl and tk libraries. [argments](configure-flags): Use gexp for tcl and tk libraries. Change-Id: I31fe9a9e2afd9b6266a2e7a2c7044b3c9d0dfa4f Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6b208d188a..abc0dc748d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9626,6 +9626,8 @@ (define-public scilab tcl tk)) (arguments + (let* ((tcl (this-package-input "tcl")) + (tk (this-package-input "tk"))) (list #:configure-flags #~(list @@ -9638,18 +9640,10 @@ (define-public scilab "--disable-build-help" "--with-external-scirenderer" ;; Tcl and Tk library locations. - (string-append "--with-tcl-include=" - (dirname - (search-input-file %build-inputs "include/tcl.h"))) - (string-append "--with-tcl-library=" - (dirname - (search-input-directory %build-inputs "lib/tcl8"))) - (string-append "--with-tk-include=" - (dirname - (search-input-file %build-inputs "include/tk.h"))) - (string-append "--with-tk-library=" - (dirname - (search-input-directory %build-inputs "lib/tk8.6"))) + (string-append "--with-tcl-include=" #$tcl "/include") + (string-append "--with-tcl-library=" #$tcl "/lib") + (string-append "--with-tk-include=" #$tk "/include") + (string-append "--with-tk-library=" #$tk "/lib") (string-append "--with-eigen-include=" (search-input-directory %build-inputs "include/eigen3")) ;; Find and link to the OCaml Num package @@ -9714,7 +9708,7 @@ (define-public scilab (apply invoke "make" "src/cpp/parse/parsescilab.cpp" "src/cpp/parse/scanscilab.cpp" - make-flags))))))) + make-flags)))))))) (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab -- cgit v1.2.3 From a4d7310ab97e45166ea845deb574cc4efbd1b915 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:47 +0100 Subject: gnu: scilab: Add phase rewrap-scilab-cli. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scilab): Add phase rewrap-scilab-cli. Change-Id: Ia3ca5df1a4795c34b6c1cdc8c3b0d7cc2badf0cb Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index abc0dc748d..9113e2e28d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9708,7 +9708,27 @@ (define-public scilab (apply invoke "make" "src/cpp/parse/parsescilab.cpp" "src/cpp/parse/scanscilab.cpp" - make-flags)))))))) + make-flags)))) + ;; The startup script is mostly there to define the following env + ;; variables properly. We can do this with guix directly. + (add-after 'install 'rewrap-scilab-cli + (lambda _ + (define (bin path) (string-append #$output "/bin/" path)) + (delete-file (bin "scilab-cli")) + (wrap-program (bin "scilab-cli-bin") + `("SCI" = (,(string-append #$output "/share/scilab"))) + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append #$output "/lib/scilab"))) + `("TCL_LIBRARY" = (,(string-append #$tcl "/lib"))) + `("TK_LIBRARY" = (,(string-append #$tk "/lib")))) + (copy-file (bin "scilab-cli-bin") (bin "scilab-cli")) + (copy-file (bin ".scilab-cli-bin-real") (bin "scilab-cli-bin")) + (delete-file (bin ".scilab-cli-bin-real")) + (substitute* (bin "scilab-cli") + (("\\.scilab-cli-bin-real") + "scilab-cli-bin") + (("export SCI=") + "unset LANGUAGE\nexport SCI=")))))))) (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab -- cgit v1.2.3 From 4c4da25dbfc187c79938601a9bebca3c3727abaf Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:48 +0100 Subject: gnu: scilab: Reindent. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scilab): Reindent. Change-Id: I4813863a8ef5cb36de597ed31bcce0b34cfb1160 Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 139 +++++++++++++++++++++++++------------------------ 1 file changed, 70 insertions(+), 69 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9113e2e28d..a5a004d16e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2022, 2023 Liliana Marie Prikler ;;; Copyright © 2022 Maximilian Heisinger ;;; Copyright © 2022 Akira Kyle +;;; Copyright © 2022, 2023 Nicolas Graves ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2023 Jake Leporte ;;; Copyright © 2023 Camilo Q.S. (Distopico) @@ -9577,18 +9578,18 @@ (define-public scilab ;; And finally some files in the modules directory: (for-each - (lambda (file) - (delete-file - (string-append "modules/dynamic_link/src/scripts/" file))) - '("aclocal.m4" - "configure" - "compile" - "config.guess" - "config.sub" - "ltmain.sh" - "depcomp" - "install-sh" - "missing")) + (lambda (file) + (delete-file + (string-append "modules/dynamic_link/src/scripts/" file))) + '("aclocal.m4" + "configure" + "compile" + "config.guess" + "config.sub" + "ltmain.sh" + "depcomp" + "install-sh" + "missing")) (delete-file-recursively "modules/dynamic_link/src/scripts/m4") (for-each delete-file '("modules/ast/src/cpp/parse/scanscilab.cpp" @@ -9628,38 +9629,38 @@ (define-public scilab (arguments (let* ((tcl (this-package-input "tcl")) (tk (this-package-input "tk"))) - (list - #:configure-flags - #~(list - "--enable-relocatable" - "--disable-static-system-lib" - "--enable-build-parser" - ;; Disable all java code. - "--without-gui" - "--without-javasci" - "--disable-build-help" - "--with-external-scirenderer" - ;; Tcl and Tk library locations. - (string-append "--with-tcl-include=" #$tcl "/include") - (string-append "--with-tcl-library=" #$tcl "/lib") - (string-append "--with-tk-include=" #$tk "/include") - (string-append "--with-tk-library=" #$tk "/lib") - (string-append "--with-eigen-include=" - (search-input-directory %build-inputs "include/eigen3")) - ;; Find and link to the OCaml Num package - "OCAMLC=ocamlfind ocamlc -package num" - "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg") - #:phases - #~(modify-phases %standard-phases - ;; The Num library is specified with the OCAMLC and - ;; OCAMLOPT variables above. - (add-after 'unpack 'fix-ocaml-num - (lambda _ - (substitute* - '("modules/scicos/Makefile.modelica.am" - "modules/scicos/src/translator/makefile.mak" - "modules/scicos/src/modelica_compiler/makefile.mak") - (("nums\\.cmx?a") "")))) + (list + #:configure-flags + #~(list + "--enable-relocatable" + "--disable-static-system-lib" + "--enable-build-parser" + ;; Disable all java code. + "--without-gui" + "--without-javasci" + "--disable-build-help" + "--with-external-scirenderer" + ;; Tcl and Tk library locations. + (string-append "--with-tcl-include=" #$tcl "/include") + (string-append "--with-tcl-library=" #$tcl "/lib") + (string-append "--with-tk-include=" #$tk "/include") + (string-append "--with-tk-library=" #$tk "/lib") + (string-append "--with-eigen-include=" + (search-input-directory %build-inputs "include/eigen3")) + ;; Find and link to the OCaml Num package + "OCAMLC=ocamlfind ocamlc -package num" + "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg") + #:phases + #~(modify-phases %standard-phases + ;; The Num library is specified with the OCAMLC and + ;; OCAMLOPT variables above. + (add-after 'unpack 'fix-ocaml-num + (lambda _ + (substitute* + '("modules/scicos/Makefile.modelica.am" + "modules/scicos/src/translator/makefile.mak" + "modules/scicos/src/modelica_compiler/makefile.mak") + (("nums\\.cmx?a") "")))) (add-after 'unpack 'restrain-to-scilab-cli (lambda _ ;; Install only scilab-cli.desktop @@ -9685,31 +9686,31 @@ (define-public scilab (substitute* "modules/types/Makefile" (("\\$\\(MAKE\\) \\$\\(AM_MAKEFLAGS\\) check-am") "")))) - ;; These generated files are assumed to be present during - ;; the build. - (add-after 'bootstrap 'bootstrap-dynamic_link-scripts - (lambda _ - (with-directory-excursion "modules/dynamic_link/src/scripts" - ((assoc-ref %standard-phases 'bootstrap))))) - (add-before 'build 'pre-build - (lambda* (#:key inputs #:allow-other-keys) - ;; Fix scilab script. - (substitute* "bin/scilab" - (("/bin/ls") - (search-input-file inputs "bin/ls"))) - ;; Fix core.start. - (substitute* "modules/core/etc/core.start" - (("'SCI/modules") - "SCI+'/modules")))) - ;; Prevent race condition - (add-after 'pre-build 'build-parsers - (lambda* (#:key (make-flags #~'()) #:allow-other-keys) - (with-directory-excursion "modules/ast" - (apply invoke "make" - "src/cpp/parse/parsescilab.cpp" - "src/cpp/parse/scanscilab.cpp" - make-flags)))) - ;; The startup script is mostly there to define the following env + ;; These generated files are assumed to be present during + ;; the build. + (add-after 'bootstrap 'bootstrap-dynamic_link-scripts + (lambda _ + (with-directory-excursion "modules/dynamic_link/src/scripts" + ((assoc-ref %standard-phases 'bootstrap))))) + (add-before 'build 'pre-build + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix scilab script. + (substitute* "bin/scilab" + (("/bin/ls") + (search-input-file inputs "bin/ls"))) + ;; Fix core.start. + (substitute* "modules/core/etc/core.start" + (("'SCI/modules") + "SCI+'/modules")))) + ;; Prevent race condition + (add-after 'pre-build 'build-parsers + (lambda* (#:key (make-flags #~'()) #:allow-other-keys) + (with-directory-excursion "modules/ast" + (apply invoke "make" + "src/cpp/parse/parsescilab.cpp" + "src/cpp/parse/scanscilab.cpp" + make-flags)))) + ;; The startup script is mostly there to define the following env ;; variables properly. We can do this with guix directly. (add-after 'install 'rewrap-scilab-cli (lambda _ -- cgit v1.2.3 From 9d33830fd135bfd8c1bcd706a092e83ee7061e6b Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:49 +0100 Subject: gnu: scilab: Update to 2024.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scilab): Update to 2024.0.0. Remove patch. [native-inputs]: Switch to AUTOCONF-2.71. [inputs]: Switch to HDF5-1.10; add LIBARCHIVE. [arguments]: Add ‘fix-linking’ phase. Change-Id: Ie1af4dc620cee644388f6b8acf88ea50c4148b65 Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 16 ++++-- gnu/packages/patches/scilab-hdf5-1.8-api.patch | 71 -------------------------- 2 files changed, 11 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/scilab-hdf5-1.8-api.patch (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a5a004d16e..44e62f774d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -104,6 +104,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -9530,7 +9531,7 @@ (define-public optizelle (define-public scilab (package (name "scilab") - (version "2023.1.0") + (version "2024.0.0") (source (origin (method git-fetch) @@ -9540,10 +9541,9 @@ (define-public scilab (file-name (git-file-name name version)) (sha256 (base32 - "0hbqsnc67b4f8zc690kl79bwhjaasykjlmqbln8iymnjcn3l5ypd")) + "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7")) (modules '((guix build utils) (ice-9 ftw))) - (patches (search-patches "scilab-hdf5-1.8-api.patch")) (snippet #~(begin ;; Delete everything except for scilab itself: @@ -9598,7 +9598,7 @@ (define-public scilab "modules/ast/src/cpp/parse/parsescilab.cpp")))))) (build-system gnu-build-system) (native-inputs - (list autoconf + (list autoconf-2.71 autoconf-archive automake bison @@ -9615,8 +9615,9 @@ (define-public scilab curl fftw gettext-minimal - hdf5-1.14 + hdf5-1.10 lapack + libarchive libx11 libxml2 matio @@ -9661,6 +9662,11 @@ (define-public scilab "modules/scicos/src/translator/makefile.mak" "modules/scicos/src/modelica_compiler/makefile.mak") (("nums\\.cmx?a") "")))) + (add-after 'unpack 'fix-linking + (lambda _ + (substitute* "modules/Makefile.am" + (("libscilab_cli_la_LDFLAGS = .*\\)" all) + (string-append all " -lcurl"))))) (add-after 'unpack 'restrain-to-scilab-cli (lambda _ ;; Install only scilab-cli.desktop diff --git a/gnu/packages/patches/scilab-hdf5-1.8-api.patch b/gnu/packages/patches/scilab-hdf5-1.8-api.patch deleted file mode 100644 index 8b453e4720..0000000000 --- a/gnu/packages/patches/scilab-hdf5-1.8-api.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch fixes the compilation with hdf5 version >= 1.10. Adapted from -https://aur.archlinux.org/cgit/aur.git/plain/hdf5_18_api.patch?h=scilab-git. - -diff -ur a/scilab/modules/hdf5/includes/HDF5Objects.h b/scilab/modules/hdf5/includes/HDF5Objects.h ---- a/scilab/modules/hdf5/includes/HDF5Objects.h -+++ b/scilab/modules/hdf5/includes/HDF5Objects.h -@@ -16,14 +16,12 @@ - #ifndef __HDF5OBJECTS_H__ - #define __HDF5OBJECTS_H__ - --#define H5_NO_DEPRECATED_SYMBOLS - #undef H5_USE_16_API -+#define H5_USE_18_API - --#define H5Eset_auto_vers 2 - #include - #include - --#undef H5_NO_DEPRECATED_SYMBOLS - - //#define __HDF5OBJECTS_DEBUG__ - //#define __HDF5ERROR_PRINT__ -diff -ur a/scilab/modules/hdf5/Makefile.am b/scilab/modules/hdf5/Makefile.am ---- a/scilab/modules/hdf5/Makefile.am -+++ b/scilab/modules/hdf5/Makefile.am -@@ -104,8 +104,7 @@ - -DH5Gopen_vers=2 \ - -DH5Tget_array_dims_vers=2 \ - -DH5Acreate_vers=2 \ -- -DH5Rdereference_vers=2 \ -- -DNO_DEPRECATED_SYMBOLS -+ -DH5Rdereference_vers=2 - - - libscihdf5_la_CPPFLAGS = \ -diff -ur a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp ---- a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp -+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp -@@ -13,6 +13,8 @@ - * - */ - -+#define H5_USE_18_API -+ - #include - #include "function.hxx" - #include "string.hxx" -diff -ur a/scilab/modules/hdf5/src/c/h5_readDataFromFile.c b/scilab/modules/hdf5/src/c/h5_readDataFromFile.c ---- a/scilab/modules/hdf5/src/c/h5_readDataFromFile.c -+++ b/scilab/modules/hdf5/src/c/h5_readDataFromFile.c -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include -diff -ur a/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c b/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c ---- a/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c -+++ b/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include -- cgit v1.2.3 From 671592c2dddb06e5be448a65b3a9f7f152e04e40 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:50 +0100 Subject: gnu: scilab: Add phase set-version. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scilab): Add phase set-version. [arguments](phases): Add phase set-version. Change-Id: I0e461a229931d159196cae73d1db584250c579b2 Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 44e62f774d..2e1d9f9570 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9667,6 +9667,13 @@ (define-public scilab (substitute* "modules/Makefile.am" (("libscilab_cli_la_LDFLAGS = .*\\)" all) (string-append all " -lcurl"))))) + (add-after 'unpack 'set-version + (lambda _ + (substitute* "modules/core/includes/version.h.in" + (("scilab-branch-main") ; version + (string-append + "scilab-" + #$(version-major+minor (package-version this-package))))))) (add-after 'unpack 'restrain-to-scilab-cli (lambda _ ;; Install only scilab-cli.desktop -- cgit v1.2.3 From c7742721d16ac175951e4677086200dbfe9fb128 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:51 +0100 Subject: gnu: scilab: Set default SCIHOME value. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scilab): Set default SCIHOME value. [argmuments](phases)[rewrap-scilab-cli]: Set default -scihome option to respect XDG base dirs specification. Change-Id: I9b55758a3ca1fbc523c3e40e891a2462f3246390 Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2e1d9f9570..246f189115 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9739,8 +9739,12 @@ (define (bin path) (string-append #$output "/bin/" path)) (copy-file (bin ".scilab-cli-bin-real") (bin "scilab-cli-bin")) (delete-file (bin ".scilab-cli-bin-real")) (substitute* (bin "scilab-cli") - (("\\.scilab-cli-bin-real") - "scilab-cli-bin") + ;; Also set SCIHOME to sensible XDG base dirs value. + (("\\.scilab-cli-bin-real\"") + (string-append + "scilab-cli-bin\" -scihome " + "\"${XDG_STATE_HOME:-$HOME/.local/state}/scilab/" + #$(package-version this-package) "\"")) (("export SCI=") "unset LANGUAGE\nexport SCI=")))))))) (home-page "https://www.scilab.org/") -- cgit v1.2.3 From ff8e8d2f1ec467e7d348a4cb1fce631fc5efe45d Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Fri, 8 Sep 2023 12:34:19 +0200 Subject: gnu: Add vim-vader. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vim.scm (vim-vader): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/vim.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 469c8b64cb..8dcd6aad36 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022, 2023 Luis Henrique Gomes Higino ;;; Copyright © 2023 Charles Jackson +;;; Copyright © 2023 Foundation Devices, Inc. ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ (define-module (gnu packages vim) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system pyproject) @@ -1423,3 +1425,52 @@ (define-public vim-nerdcommenter operations and styles which are invoked via key mappings and a menu. These operations are available for most filetypes.") (license license:cc0))) + +(define-public vim-vader + (let ((revision "0") + (commit "6fff477431ac3191c69a3a5e5f187925466e275a")) + (package + (name "vim-vader") + (version (git-version "0.4.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/junegunn/vader.vim") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "179dbbqdyl6qf6jdb6kdazn3idz17m1h2n88rlggb1wnly74vjin")))) + (build-system copy-build-system) + (arguments + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("ftdetect" "share/vim/vimfiles/") + ("ftplugin" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")) + #:phases + (modify-phases %standard-phases + (add-before 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; FIXME: suite1.vader fails with an unknown reason, + ;; lang-if.vader requires Python and Ruby. + (substitute* "test/vader.vader" + (("Include.*feature/suite1.vader.*$") "") + (("Include.*feature/lang-if.vader.*$") "")) + + (display "Running Vim tests\n") + (with-directory-excursion "test" + (setenv "VADER_TEST_VIM" "vim -E") + (invoke "bash" "./run-tests.sh")))))))) + (native-inputs (list vim)) + (home-page "https://github.com/junegunn/vader.vim") + (synopsis "Test framework for Vimscript") + (description "Vader is a test framework for Vimscript designed to +simplify the process of writing and running unit tests. Vader.vim provides an +intuitive test syntax for defining test cases and expectations, it also can +be integrated with @acronym{CI, Continuous Integration} pipelines to +automate testing and is compatible with Vim and Neovim.") + (license license:expat)))) ;; Specified in README.md. -- cgit v1.2.3 From 33a1ee7f17338dbfa39bd00e449c667f345d41fa Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Fri, 8 Sep 2023 12:34:21 +0200 Subject: gnu: Add coq-for-coqtail. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/coq.scm (coq-for-coqtail): New variable. Signed-off-by: Ludovic Courtès Change-Id: I0c08a02f7937786b52039307c1019ae3474e625c --- gnu/packages/coq.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 09ca4030ea..f30f231f3b 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -42,6 +42,7 @@ (define-module (gnu packages coq) #:use-module (gnu packages texinfo) #:use-module (guix build-system dune) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) @@ -285,6 +286,32 @@ (define-public coq-flocq inside Coq.") (license license:lgpl3+))) +;; Union of coq and coq-ide-server as vim-coqtail expects coqc and coqidetop +;; to be in the same bin folder, when vim-coqtail is installed coqc and +;; coqidetop will be in the "same" bin folder in the profile, so this is only +;; required for testing the package. +;; +;; This is deeply ingrained in the internals of vim-coqtail so this is why +;; it's necessary. +(define-public coq-for-coqtail + (hidden-package + (package + (inherit coq) + (name "coq-for-coqtail") + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build union)) + #:builder + (begin + (use-modules (ice-9 match) + (guix build union)) + (match %build-inputs + (((names . directories) ...) + (union-build (assoc-ref %outputs "out") + directories)))))) + (inputs (list coq coq-ide-server))))) + (define-public coq-gappa (package (name "coq-gappa") -- cgit v1.2.3 From ff61fc8e0f1b7867dd0b0d3ad28185a8342b3038 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Fri, 8 Sep 2023 12:34:23 +0200 Subject: gnu: Add vim-coqtail. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vim.scm (vim-coqtail): New variable. Signed-off-by: Ludovic Courtès Change-Id: I5fa7266227097c724e29be4a133a8dc4bb8bb1af --- gnu/packages/vim.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 8dcd6aad36..61ae6ffc68 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -50,7 +50,9 @@ (define-module (gnu packages vim) #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages code) + #:use-module (gnu packages coq) #:use-module (gnu packages enlightenment) #:use-module (gnu packages fontutils) #:use-module (gnu packages gawk) @@ -450,6 +452,68 @@ (define-public vim-context-filetype (home-page "https://github.com/Shougo/context_filetype.vim") (license license:expat)))) ; ??? check again +(define-public vim-coqtail + (let ((commit "dfe3939c9caff69d9af76bfd74f1a40fb7dc5609") + (revision "0")) + (package + (name "vim-coqtail") + (version (git-version "1.7.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whonore/Coqtail") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0av2m075n6z05ah9ndrgnp9s16yrz6n2lj0igd9fh3c5k41x5xks")))) + (build-system copy-build-system) + (arguments + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("ftdetect" "share/vim/vimfiles/") + ("ftplugin" "share/vim/vimfiles/") + ("indent" "share/vim/vimfiles/") + ("python" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")) + #:phases + (modify-phases %standard-phases + (add-before 'install 'check + (lambda* (#:key inputs native-inputs tests? #:allow-other-keys) + (when tests? + (display "Running Python unit tests.\n") + (setenv "PYTHONPATH" (string-append (getcwd) "/python")) + (invoke "pytest" "-q" "tests/unit") + + (display "Running Python Coq tests.\n") + (invoke "pytest" "-q" "tests/coq") + + (display "Running Vim unit tests.\n") + (let* ((vim-vader (assoc-ref (or native-inputs inputs) + "vim-vader")) + (vader-path (string-append vim-vader + "/share/vim/vimfiles"))) + (with-directory-excursion "tests/vim" + (setenv "VADER_PATH" vader-path) + (invoke "vim" "-E" "-Nu" "vimrc" + "-c" "Vader! *.vader"))) + + ;; Remove __pycache__ files generated during testing so that + ;; they don't get installed. + (delete-file-recursively "python/__pycache__"))))))) + (native-inputs + (list coq-for-coqtail + python-pytest + vim-full ;; Plugin needs Python 3. + vim-vader)) + (propagated-inputs (list coq coq-ide-server)) + (synopsis "Interactive Coq proofs in Vim") + (description "Coqtail enables interactive Coq proof development in Vim +similar to CoqIDE or ProofGeneral.") + (home-page "https://github.com/whonore/Coqtail") + (license license:expat)))) + (define-public vim-fugitive (package (name "vim-fugitive") -- cgit v1.2.3 From 4acbdd40f8c5597558f0330ab14b7d40749b8d65 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sun, 5 Nov 2023 16:10:23 +0800 Subject: gnu: guile-ts: Update to 0.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-ts): Update to 0.2.0. Change-Id: Ifd0f3ac5fc069ac2e300dd2f4b44df49a4298e83 Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index af032db680..7326c1b65b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4593,7 +4593,7 @@ (define-public guile-torrent (define-public guile-ts (package (name "guile-ts") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference (url @@ -4602,7 +4602,7 @@ (define-public guile-ts (file-name (git-file-name name version)) (sha256 (base32 - "0xmq2d3mv921m0g1hqw6bjzh4m622g2c7pal11ks7vjn0m8d4bxj")))) + "1iqbr9rcpmq2f1zxxvl36ajwm81rkp38rrp42ixr4q59154r5513")))) (build-system gnu-build-system) (arguments (list #:make-flags #~(list "GUILE_AUTO_COMPILE=0") -- cgit v1.2.3 From 779ba3a6d3b08fb15796550aaf792f283dafa79d Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Sun, 5 Nov 2023 13:09:17 +0000 Subject: gnu: mpd: Update to 0.23.14. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mpd.scm (mpd): Update to 0.23.14. Change-Id: Iccfbf2c7028cd53b52005366d8bcf1592798e155 Signed-off-by: Ludovic Courtès --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 0e762144a1..b01d1934a2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -116,7 +116,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.23.13") + (version "0.23.14") (source (origin (method url-fetch) (uri @@ -125,7 +125,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "06fmy68lfrsi5y03l53dnwcynqhwh5f5vhdpbsr8lzmvzgk02sx9")))) + "1lh9nn4a7ng6i08df7rbs8c4nbgmz883pss9p2gswa6m4rsadfc5")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 8d596af2c9a80095b6b58853f8e971d806ad9f62 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 6 Nov 2023 20:27:18 +0000 Subject: gnu: folly: Update to 2023.11.06.00. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (folly): Update to 2023.11.06.00. Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 49e5b52e5f..5e35a03254 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1397,7 +1397,7 @@ (define-public cxxopts (define-public folly (package (name "folly") - (version "2022.10.31.00") + (version "2023.11.06.00") (source (origin (method git-fetch) (uri (git-reference @@ -1406,7 +1406,7 @@ (define-public folly (file-name (git-file-name name version)) (sha256 (base32 - "06r9xnj8ilghc0vv6r17k5apl3w19iwd76nr02svnv96c74bz2aa")))) + "0z0jhkma2qacc2kc27qsiwqwqkv07i9mwpc4vwcbawyzdajq6hd0")))) (build-system cmake-build-system) (arguments '(;; Tests must be explicitly enabled -- cgit v1.2.3 From dbc02656cf4804821e68d655fc871e2365150f43 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Mon, 20 Nov 2023 17:33:08 +0000 Subject: gnu: mympd: Update to 13.0.5. * gnu/packages/mpd.scm (mympd): Update to 13.0.5. [native-inputs]: Add jekyll. [outputs]: Add 'doc. [arguments]<#:configure-flags>: Install HTML documentation. Set correct value for localstatedir. <#:phases>: Add 'move-doc. Change-Id: I0f1ab4295b7bc03876ad1bbeff6154b4da6adc9a Signed-off-by: Christopher Baines --- gnu/packages/mpd.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index b01d1934a2..dc827a4670 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -57,6 +57,7 @@ (define-module (gnu packages mpd) #:use-module (gnu packages libusb) #:use-module (gnu packages lua) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) @@ -622,7 +623,7 @@ (define-public mpdevil (define-public mympd (package (name "mympd") - (version "12.1.1") + (version "13.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -631,22 +632,29 @@ (define-public mympd (file-name (git-file-name name version)) (sha256 (base32 - "1bal31xmdmq46bi0qmia07sqcwy695vcz5y5hxwkz71rcfywbsf9")))) + "1ly3iw4irybfxyafgrldldwc28a879wwnd1pg32m2sgrwyhr0czm")))) + (outputs '("out" "doc")) (build-system cmake-build-system) (arguments (list #:configure-flags - #~(list "-DMYMPD_BUILD_TESTING=ON" - ;; Handled by 'strip' phase. - "-DMYMPD_STRIP_BINARY=OFF") + #~(list "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" + "-DMYMPD_BUILD_TESTING=ON" + "-DMYMPD_DOC_HTML=ON") #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? ;; The following test requires network connectivity. - (invoke "ctest" "--exclude-regex" "test_http_client"))))))) - (native-inputs (list jq perl pkg-config)) + (invoke "ctest" "--exclude-regex" "test_http_client")))) + (add-after 'install 'move-doc + (lambda _ + (let ((old (string-append #$output "/share/doc")) + (new (string-append #$output:doc "/share/doc"))) + (mkdir-p (dirname new)) + (rename-file old new))))))) + (native-inputs (list jekyll jq perl pkg-config)) (inputs (list flac libid3tag lua openssl pcre2)) (home-page "https://jcorporation.github.io/") (synopsis "Web-based MPD client") -- cgit v1.2.3 From 813aee874c3078f6013453b5e0dac817d28091a0 Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Sat, 18 Nov 2023 02:48:27 +0100 Subject: gnu: python-pyfuse3: Update to 3.3.0. * gnu/packages/python-xyz.scm (python-pyfuse3): Update to 3.3.0. Change-Id: I9b4120c631e51ad9829f3fa7338bdb8b48f60b87 Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6a6f69e6bb..5a017b76d0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -32496,13 +32496,13 @@ (define-public python-psycopg2-binary (define-public python-pyfuse3 (package (name "python-pyfuse3") - (version "3.2.1") + (version "3.3.0") (source (origin (method url-fetch) (uri (pypi-uri "pyfuse3" version)) (sha256 - (base32 "0cvybynv9igssfa4l13q09gb6m7afmwk34wsbq8jk14sqpd4dl92")))) + (base32 "1gbkwmk7gpyy70cqj9226qvwrx13xlwxfz86l86n5ybr4i0zwc9b")))) (build-system python-build-system) (native-inputs (list pkg-config)) (inputs (list fuse)) -- cgit v1.2.3 From 07e6ecb870bec0c4cc9c633621cf2a275ea08da5 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Mon, 20 Nov 2023 16:44:25 +0100 Subject: gnu: beancount: Update to 2.3.6. * gnu/packages/finance.scm (beancount): Update to 2.3.6. Signed-off-by: Christopher Baines --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 4f3415232c..cd419f2102 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1957,13 +1957,13 @@ (define-public flowee (define-public beancount (package (name "beancount") - (version "2.3.5") + (version "2.3.6") (source (origin (method url-fetch) (uri (pypi-uri "beancount" version)) (sha256 - (base32 "0sn3x6c5vwvdfak1qm0y4vv284izrc4dly31mqyd9jz9l8jmdqql")) + (base32 "0nj7sdh7wxc0hv8wxwqhw9v1zgx1sn4w92368ci2wzdmssz967w0")) (patches (search-patches "beancount-disable-googleapis-fonts.patch")))) (build-system python-build-system) (arguments -- cgit v1.2.3 From 8960eb027834be3e2d415b584aa74b9d8d9251dd Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 22 Nov 2023 23:13:18 +0300 Subject: gnu: book-sparc: Update to 1.1.0. * gnu/packages/books.scm (book-sparc): Update to 1.1.0. [source]: Don't delete "sparc.pdf" as the file is now absent from the repository. [inputs]: Add "texlive-glossaries-english". Change-Id: I2e3b72a6a18d82d98787ea9a41041d11413f9c3a Signed-off-by: Christopher Baines --- gnu/packages/books.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/books.scm b/gnu/packages/books.scm index 97a7e3b45c..c3504bb4ff 100644 --- a/gnu/packages/books.scm +++ b/gnu/packages/books.scm @@ -42,7 +42,7 @@ (define-module (gnu packages books) (define-public book-sparc (package (name "book-sparc") - (version "1.0.1") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -50,12 +50,11 @@ (define-public book-sparc (commit (string-append "v" version)))) (sha256 (base32 - "0dswwwkb3h88cl3mhiy79s8i7sa9lmw6fxaj782vxgif795lcpxs")) + "0k1miyrnh5362qy50jzp5j3ww0c8hr7wk3y5kg6xlqgk9f8msvag")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet #~(begin - (delete-file "sparc.pdf") (substitute* "version.tex.in" (("@COMMIT@") "")) (substitute* "Makefile" @@ -86,6 +85,7 @@ (define-public book-sparc texlive-collection-langcyrillic texlive-fontspec texlive-glossaries + texlive-glossaries-english texlive-glossaries-extra texlive-koma-script texlive-lilyglyphs -- cgit v1.2.3 From 185d83d3caccb0da8153a3f657c3603ada4f33a7 Mon Sep 17 00:00:00 2001 From: Adriel Dumas--Jondeau Date: Wed, 22 Nov 2023 23:10:45 +0100 Subject: gnu: godot: Update to 4.1.3. * gnu/packages/game-development.scm (godot): Update to 4.1.3. Change-Id: Ia8844da04b568e32e9138b222ddfdca7868b010f Signed-off-by: Christopher Baines --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 1d9abd9705..671c7839ac 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2055,7 +2055,7 @@ (define-public godot-lts (define-public godot (package (name "godot") - (version "4.1.2") + (version "4.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -2064,7 +2064,7 @@ (define-public godot (file-name (git-file-name name version)) (sha256 (base32 - "1zm07rknpjkvyxpiscqsx5hi4gc5wi647jlhillxdf85b36s6q9j")) + "1mwwzf77ixkalciqakn6q42g9sl2570didfll406sfs42wz534ng")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) -- cgit v1.2.3 From 364c1b17e1433d9b9d5ab08f7110178643f69157 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 23 Nov 2023 14:05:50 +0000 Subject: gnu: nar-herder: Update to 0-23.5ccd6cb. * gnu/packages/package-management.scm (nar-herder): Update to 0-23.5ccd6cb. Change-Id: I6a43dd20de4518fb1f6476d321d8c76536fa47fc --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4b585362a4..f7ca7bed0c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1754,8 +1754,8 @@ (define-public guix-jupyter (license license:gpl3+))) (define-public nar-herder - (let ((commit "bf539aa08edfe8010606a31c00e0296c3d400319") - (revision "22")) + (let ((commit "5ccd6cbbdf5fc41e43a491d3414c1663e1fba64d") + (revision "23")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1766,7 +1766,7 @@ (define-public nar-herder (commit commit))) (sha256 (base32 - "1i9q7ys26r6y2xa4qqy21bcxlqiynxp3p1wl5gmyj33jnb9ryjby")) + "1lid5k4wgghl9lzhazx1c473qv18yxp0xxrvj04b33pdvxnaawl8")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From e815db3c2d1a216dd415a236aae1f153360d739b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 23 Nov 2023 14:07:11 +0000 Subject: gnu: guix-build-coordinator: Update to 92.78df0b3. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 92.78df0b3. Change-Id: Id60ca3be76c6ac897f1aa2fed4f8c03b03a25fea --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index f7ca7bed0c..756222318b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1510,8 +1510,8 @@ (define-public gwl/next "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "c226d48d97ce3a248cf2d814c9b4c4f48e67511e") - (revision "91")) + (let ((commit "78df0b3a9f4f27df8341da36d4dfa8e49dfad900") + (revision "92")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1522,7 +1522,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "0ig9hq483q2ir26gj6m9kj13a9hmq6sw18q0fiqvbvn31p4c8zvn")) + "06xp38k6yfvsvl20hrqvmarpysd07nkbj53an729lqr50qdd4jcq")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 714fba793af1f9953efa24b20e4dedb1b99c971c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 23 Nov 2023 14:09:57 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-44.e13febc. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-44.e13febc. Change-Id: I86917732673173cf6ebe211ac69b38444f450f20 --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 389f7d1375..822f0e7612 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4956,8 +4956,8 @@ (define-public python-tibanna (license license:expat))) (define-public guix-data-service - (let ((commit "37a07c2d6e8285877ad0440a7e4ae286b7b65177") - (revision "43")) + (let ((commit "e13febc81706fbfb7f073bc4e9ce73fbc80d5180") + (revision "44")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4969,7 +4969,7 @@ (define-public guix-data-service (file-name (git-file-name name version)) (sha256 (base32 - "0h83j10bq7dyda2idbqh5y6dcvmbl3xgc147yq4pk6bkh10y29y6")))) + "0pk86b44zg2yn73sxlcd9pqbz8xwprwzaib2npnq80y3yzc6qc22")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From 4162838ef8090863906c5cefa488815fcf6c742f Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Mon, 6 Nov 2023 12:18:45 +0100 Subject: gnu: radicale: Update to 3.1.8. * gnu/packages/dav.scm(radicale): Update to 3.1.8. [arguments] Enable tests. Change-Id: I8ed435587ab2ca4aafb387d4973f864fa4a94b2d Signed-off-by: Christopher Baines --- gnu/packages/dav.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index e0306b8a97..ae03442374 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -43,23 +43,17 @@ (define-module (gnu packages dav) (define-public radicale (package (name "radicale") - (version "3.1.7") + (version "3.1.8") (source (origin - ;; There are no tests in the PyPI tarball. (method git-fetch) (uri (git-reference (url "https://github.com/Kozea/Radicale") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mv1w9qazbis9ir5shr1ybsfn4cxd3rmxa3ns6kbk23yramlzwhg")))) + (base32 "1qy2azn02bw772yhzgqvyf1pyl0ijj9ccvl1078w9icl261yljap")))) (build-system python-build-system) - (arguments - (list - ;; TODO: enable again when https://github.com/Kozea/Radicale/issues/1184 - ;; is fixed - #:tests? #f)) (native-inputs (list python-pytest python-pytest-cov -- cgit v1.2.3 From f5650cd354daa755a05d20fd2e53dfb27169b311 Mon Sep 17 00:00:00 2001 From: Arnaud DABY-SEESARAM Date: Wed, 15 Nov 2023 22:09:35 +0100 Subject: gnu: Update ispell to 3.4.06. * gnu/packages/aspell.scm (ispell): Update to 3.4.06. Change-Id: I0d566a143336d88d4eb145b59b21c889b7ecdb12 Signed-off-by: Christopher Baines --- gnu/packages/aspell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 17ba794201..ffb13025f3 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -398,14 +398,14 @@ (define-public aspell-dict-ro (define-public ispell (package (name "ispell") - (version "3.4.05") + (version "3.4.06") (source (origin (method url-fetch) (uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-" version ".tar.gz")) (sha256 - (base32 "00jni7gvdswjd9sdwip5ixnvjg2qzv56mn3m8gdgl9gxwgnns36g")))) + (base32 "19pbhg3pbnykkk9hla2kfhfanm7wcdja2qria365l1y8shridj8p")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f -- cgit v1.2.3 From 03c01580d92161363051f17cbe191b7ec360ccef Mon Sep 17 00:00:00 2001 From: "Preston M. Firestone" Date: Wed, 15 Nov 2023 19:10:51 -0600 Subject: gnu: praat: Update to 6.4. * gnu/packages/language.scm (praat): Update to 6.4. Change-Id: I6138e87781e007d5798a908a4b5ae5c0c3338b05 Signed-off-by: Christopher Baines --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index faf3114b84..db78425ec9 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -854,7 +854,7 @@ (define-public link-grammar (define-public praat (package (name "praat") - (version "6.3.10") + (version "6.4") (source (origin (method git-fetch) (uri (git-reference @@ -863,7 +863,7 @@ (define-public praat (file-name (git-file-name name version)) (sha256 (base32 - "0kwv0p2bn2x5h0c61rymm87icqqwnbj699awgc5afl4qp53azci8")))) + "1rabv4175r1kbgb6n5xbir4j9ldpfr3wr6xa8jakzgny3dwlmsbg")))) (build-system gnu-build-system) (arguments (list #:make-flags #~(list (string-append "CC=" -- cgit v1.2.3 From c26ed5d6b971af11894015979f1e260df571a2be Mon Sep 17 00:00:00 2001 From: Thiago Jung Bauermann Date: Fri, 17 Nov 2023 14:21:44 -0300 Subject: gnu: mu: Update to 1.10.8. Version 1.10.8 fixes the installation of the Guile bindings, so we can enable it again. * gnu/packages/mail.scm (mu): Update to 1.10.7. [inputs]: Add guile-3.0. [arguments]: Add "-Dguile-extension-dir" to #:configure-flags. Add fix-ffi phase to allow Guile module to load its native library. Change-Id: I2a8250d8d6298712ad116b1d88157a4344175722 Signed-off-by: Christopher Baines --- gnu/packages/mail.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 256bd4b03a..353c8c7bd7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1206,14 +1206,14 @@ (define-public emacs-mew (define-public mu (package (name "mu") - (version "1.10.7") + (version "1.10.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/download/v" version "/mu-" version ".tar.xz")) (sha256 - (base32 "089w1m6sd0nk9l9j40d357fjym8kxmz7kwh3bclk58jxa6xckapa")))) + (base32 "129m6rz8vbd7370c3h3ma66bxqdkm6wsdix5qkmv1vm7sanxh4bb")))) (build-system meson-build-system) (native-inputs (list pkg-config @@ -1221,7 +1221,7 @@ (define-public mu gnupg ; for tests texinfo)) (inputs - (list glib gmime xapian)) + (list glib gmime guile-3.0 xapian)) (arguments (list #:modules '((guix build meson-build-system) @@ -1229,6 +1229,8 @@ (define-public mu (guix build utils)) #:imported-modules `(,@%meson-build-system-modules (guix build emacs-utils)) + #:configure-flags + #~(list (format #f "-Dguile-extension-dir=~a/lib" #$output)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-bin-references @@ -1241,6 +1243,11 @@ (define-public mu (substitute* '("lib/tests/bench-indexer.cc" "lib/utils/mu-test-utils.cc") (("/bin/rm") (which "rm"))))) + (add-after 'install 'fix-ffi + (lambda _ + (substitute* (find-files #$output "mu.scm") + (("\"libguile-mu\"") + (format #f "\"~a/lib/libguile-mu\"" #$output))))) (add-after 'install 'install-emacs-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads -- cgit v1.2.3 From 4fd84cec2bff566ddf9eb60ddaa06f86348d63b2 Mon Sep 17 00:00:00 2001 From: Michal Atlas Date: Thu, 23 Nov 2023 09:47:06 +0000 Subject: gnu: Add cl-lisp-critic. * gnu/packages/lisp-check.scm (cl-lisp-critic, sbcl-lisp-critic, ecl-lisp-critic): New variables. Change-Id: I38ed8af8f4316f47695a22e949b931770e350c1e Signed-off-by: jgart --- gnu/packages/lisp-check.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index 63a16d608c..7ce74316eb 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -1149,3 +1149,31 @@ (define-public cl-xlunit (define-public ecl-xlunit (sbcl-package->ecl-package sbcl-xlunit)) + +(define-public sbcl-lisp-critic + (package + (name "sbcl-lisp-critic") + (version "0.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/g000001/lisp-critic") + (commit "fb70c69dc61a53fb069b24edebcfb0de813a176b"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "059vfdn8ds44hihhjmylp059zl2gzghiipcigvjd51sb6zc6f0zy")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp linter") + (description "The Lisp Critic scans your code for instances of bad +Lisp programming practice.") + (home-page + "https://courses.cs.northwestern.edu/325/exercises/critic.html#critic") + (license license:expat))) + +(define-public cl-lisp-critic + (sbcl-package->cl-source-package sbcl-lisp-critic)) + +(define-public ecl-lisp-critic + (sbcl-package->ecl-package sbcl-lisp-critic)) + -- cgit v1.2.3 From 0083a2265960f8228112c36e0d10eb974ff9d1f1 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 23 Nov 2023 10:33:44 -0600 Subject: gnu: sbcl-lisp-critic: Update to 1.1-ea19f82. * gnu/packages/lisp-xyz.scm (sbcl-lisp-critic): Update to 1.1-ea19f82. [define-public]: Refactor to use let block for getting commit and revision. [version]: Add in version mentioned in ASD file. [source]: Pass in commit variable. Change-Id: Ie2ee4b77aab815c69445a8800e25631b6c9ab4a7 --- gnu/packages/lisp-check.scm | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index 7ce74316eb..5f5e39c193 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -1151,29 +1151,30 @@ (define-public ecl-xlunit (sbcl-package->ecl-package sbcl-xlunit)) (define-public sbcl-lisp-critic - (package - (name "sbcl-lisp-critic") - (version "0.0.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/g000001/lisp-critic") - (commit "fb70c69dc61a53fb069b24edebcfb0de813a176b"))) - (file-name (git-file-name name version)) - (sha256 - (base32 "059vfdn8ds44hihhjmylp059zl2gzghiipcigvjd51sb6zc6f0zy")))) - (build-system asdf-build-system/sbcl) - (synopsis "Common Lisp linter") - (description "The Lisp Critic scans your code for instances of bad -Lisp programming practice.") - (home-page - "https://courses.cs.northwestern.edu/325/exercises/critic.html#critic") - (license license:expat))) + (let ((commit "ea19f82a168a6119ac1b10d0f457c01a7119602f") + (revision "1")) + (package + (name "sbcl-lisp-critic") + (version (git-version "1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/g000001/lisp-critic") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15zg05pqfs2dhc5j7gfkwjmxawaizjpyb0p7386mpl4w93l9h84l")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp linter") + (description "The Lisp Critic scans your code for instances of bad + Lisp programming practice.") + (home-page + "https://courses.cs.northwestern.edu/325/exercises/critic.html#critic") + (license license:expat)))) (define-public cl-lisp-critic (sbcl-package->cl-source-package sbcl-lisp-critic)) (define-public ecl-lisp-critic (sbcl-package->ecl-package sbcl-lisp-critic)) - -- cgit v1.2.3 From d25e9f440b15882af1a45057ff65616162de8201 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 24 Nov 2023 10:32:54 +0200 Subject: gnu: go-gopkg-in-yaml-v3: Fix build on 32-bit systems. * gnu/packages/golang.scm (go-gopkg-in-yaml-v3)[source]: Add patch. * gnu/packages/patches/go-gopkg-in-yaml-v3-32bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Ia8a96b15d37a3d2f133da9374cac1e58e38f2d2c --- gnu/local.mk | 1 + gnu/packages/golang.scm | 3 +- .../patches/go-gopkg-in-yaml-v3-32bit.patch | 50 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/go-gopkg-in-yaml-v3-32bit.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index db9d6b93a4..023cd4b17f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1342,6 +1342,7 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-cc-1.72.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-fix-script-tests.patch \ + %D%/packages/patches/go-gopkg-in-yaml-v3-32bit.patch \ %D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \ %D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \ %D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \ diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9c707e5414..2c9aff4a28 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5577,7 +5577,8 @@ (define-public go-gopkg-in-yaml-v3 (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01b0wjb7yzv8wzzz2iim8mjpkwjnykcanrwiq06pkl89lr6gv8hn")))) + (base32 "01b0wjb7yzv8wzzz2iim8mjpkwjnykcanrwiq06pkl89lr6gv8hn")) + (patches (search-patches "go-gopkg-in-yaml-v3-32bit.patch")))) (build-system go-build-system) (arguments '(#:import-path "gopkg.in/yaml.v3")) diff --git a/gnu/packages/patches/go-gopkg-in-yaml-v3-32bit.patch b/gnu/packages/patches/go-gopkg-in-yaml-v3-32bit.patch new file mode 100644 index 0000000000..7a243f5d80 --- /dev/null +++ b/gnu/packages/patches/go-gopkg-in-yaml-v3-32bit.patch @@ -0,0 +1,50 @@ +https://sources.debian.org/src/golang-gopkg-yaml.v3/3.0.1-3/debian/patches/0001-Fix-0b-on-32-bit-systems.patch/ + +From: Shengjing Zhu +Date: Fri, 16 Apr 2021 00:40:09 +0800 +Subject: Fix -0b on 32-bit systems + +Origin: backport, https://github.com/go-yaml/yaml/pull/442 +--- + decode_test.go | 7 ++++--- + resolve.go | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/decode_test.go b/decode_test.go +index 51f5070..9cac74c 100644 +--- a/decode_test.go ++++ b/decode_test.go +@@ -175,9 +175,6 @@ var unmarshalTests = []struct { + }, { + "bin: -0b101010", + map[string]interface{}{"bin": -42}, +- }, { +- "bin: -0b1000000000000000000000000000000000000000000000000000000000000000", +- map[string]interface{}{"bin": -9223372036854775808}, + }, { + "decimal: +685_230", + map[string]int{"decimal": 685230}, +@@ -357,6 +354,10 @@ var unmarshalTests = []struct { + "int64_min: -9223372036854775808", + map[string]int64{"int64_min": math.MinInt64}, + }, ++ { ++ "int64_min_base2: -0b1000000000000000000000000000000000000000000000000000000000000000", ++ map[string]int64{"int64_min_base2": math.MinInt64}, ++ }, + { + "int64_neg_base2: -0b111111111111111111111111111111111111111111111111111111111111111", + map[string]int64{"int64_neg_base2": -math.MaxInt64}, +diff --git a/resolve.go b/resolve.go +index 64ae888..1b7d8c3 100644 +--- a/resolve.go ++++ b/resolve.go +@@ -223,7 +223,7 @@ func resolve(tag string, in string) (rtag string, out interface{}) { + } else if strings.HasPrefix(plain, "-0b") { + intv, err := strconv.ParseInt("-"+plain[3:], 2, 64) + if err == nil { +- if true || intv == int64(int(intv)) { ++ if intv == int64(int(intv)) { + return intTag, int(intv) + } else { + return intTag, intv -- cgit v1.2.3 From e4397a32ac81d0b23b168df27424001a7d20aee7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 24 Nov 2023 10:48:41 +0200 Subject: gnu: aerc: Enable building without zoxide. * gnu/packages/mail.scm (aerc)[arguments]: Only substitute zoxide path when it is an input. [inputs]: Only add zoxide when building on a supported system. Change-Id: I39b859982e1455e80a4b28979079c633e386fa34 --- gnu/packages/mail.scm | 93 +++++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 44 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 353c8c7bd7..b49b045197 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4915,11 +4915,12 @@ (define-public aerc (string-append "\"" (search-input-file inputs "bin/sh") "\""))) - (substitute* "commands/z.go" - (("\"zoxide\"") - (string-append - "\"" (search-input-file inputs "bin/zoxide") - "\""))) + (when (assoc-ref inputs "zoxide") + (substitute* "commands/z.go" + (("\"zoxide\"") + (string-append + "\"" (search-input-file inputs "bin/zoxide") + "\"")))) (substitute* (list "lib/crypto/gpg/gpg.go" "lib/crypto/gpg/gpg_test.go" "lib/crypto/gpg/gpgbin/keys.go" @@ -4939,45 +4940,49 @@ (define-public aerc (invoke "make" "CC=gcc" "install" "-C" (string-append "src/" import-path) (string-append "PREFIX=" #$output))))))) - (inputs (list gnupg - go-github-com-zenhack-go-notmuch - go-golang-org-x-oauth2 - go-github-com-xo-terminfo - go-github-com-stretchr-testify - go-github-com-riywo-loginshell - go-github-com-pkg-errors - go-github-com-mitchellh-go-homedir - go-github-com-miolini-datacounter - go-github-com-mattn-go-runewidth - go-github-com-mattn-go-isatty - go-github-com-lithammer-fuzzysearch - go-github-com-kyoh86-xdg - go-github-com-imdario-mergo - go-github-com-google-shlex - go-github-com-go-ini-ini - go-github-com-gdamore-tcell-v2 - go-github-com-gatherstars-com-jwz - go-github-com-fsnotify-fsnotify - go-github-com-emersion-go-smtp - go-github-com-emersion-go-sasl - go-github-com-emersion-go-pgpmail - go-github-com-emersion-go-message - go-github-com-emersion-go-maildir - go-github-com-emersion-go-imap-sortthread - go-github-com-emersion-go-imap - go-github-com-emersion-go-msgauth - go-github-com-emersion-go-mbox - go-github-com-ddevault-go-libvterm - go-github-com-danwakefield-fnmatch - go-github-com-creack-pty - go-github-com-arran4-golang-ical - go-github-com-protonmail-go-crypto - go-github-com-syndtr-goleveldb-leveldb - go-git-sr-ht-sircmpwn-getopt - go-git-sr-ht-rockorager-tcell-term - python - python-vobject - zoxide)) + (inputs + (append + (list gnupg + go-github-com-zenhack-go-notmuch + go-golang-org-x-oauth2 + go-github-com-xo-terminfo + go-github-com-stretchr-testify + go-github-com-riywo-loginshell + go-github-com-pkg-errors + go-github-com-mitchellh-go-homedir + go-github-com-miolini-datacounter + go-github-com-mattn-go-runewidth + go-github-com-mattn-go-isatty + go-github-com-lithammer-fuzzysearch + go-github-com-kyoh86-xdg + go-github-com-imdario-mergo + go-github-com-google-shlex + go-github-com-go-ini-ini + go-github-com-gdamore-tcell-v2 + go-github-com-gatherstars-com-jwz + go-github-com-fsnotify-fsnotify + go-github-com-emersion-go-smtp + go-github-com-emersion-go-sasl + go-github-com-emersion-go-pgpmail + go-github-com-emersion-go-message + go-github-com-emersion-go-maildir + go-github-com-emersion-go-imap-sortthread + go-github-com-emersion-go-imap + go-github-com-emersion-go-msgauth + go-github-com-emersion-go-mbox + go-github-com-ddevault-go-libvterm + go-github-com-danwakefield-fnmatch + go-github-com-creack-pty + go-github-com-arran4-golang-ical + go-github-com-protonmail-go-crypto + go-github-com-syndtr-goleveldb-leveldb + go-git-sr-ht-sircmpwn-getopt + go-git-sr-ht-rockorager-tcell-term + python + python-vobject) + (if (supported-package? zoxide) + (list zoxide) + '()))) (native-inputs (list scdoc)) (home-page "https://git.sr.ht/~rjarry/aerc") (synopsis "Email client for the terminal") -- cgit v1.2.3 From c562008bd1d0c0fa8854cbde5ec5e02dcfceb701 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 31 Oct 2023 09:36:06 +0100 Subject: gnu: uuu: Update to 1.5.125. * gnu/packages/flashing-tools.scm (uuu): Update to 1.5.125. [inputs]: Add zstd:lib. Change-Id: I2a4f311994fea75c8db48440d00a1ff92ff0ff40 Signed-off-by: Mathieu Othacehe --- gnu/packages/flashing-tools.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 23d21ca6a9..6165845261 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -580,7 +580,7 @@ (define-public srecord (define-public uuu (package (name "uuu") - (version "1.4.165") + (version "1.5.125") (source (origin (method git-fetch) @@ -590,7 +590,7 @@ (define-public uuu (file-name (git-file-name name version)) (sha256 (base32 - "0k309lp27d4k6x4qq0badbk8i47xsc6f3fffz73650iyfs4hcniw")))) + "02nyax1z2qkcxs764lj5cpazv8n957hv9ipd9b5rqpgi9pgnvlvz")))) (arguments `(#:tests? #f ; no tests #:modules ((guix build utils) @@ -618,7 +618,8 @@ (define-public uuu (native-inputs (list pkg-config)) (inputs - (list libusb bzip2 zlib libzip openssl)) + (list libusb bzip2 zlib libzip openssl + `(,zstd "lib"))) (home-page "https://github.com/NXPmicro/mfgtools") (synopsis "Freescale/NXP I.MX chip image deploy tools") (description "@code{uuu} is a command line tool, evolved out of MFGTools. -- cgit v1.2.3 From 9f67681db15d22f7ede5488315d52b78e357343e Mon Sep 17 00:00:00 2001 From: Rémi Teissier Date: Wed, 1 Nov 2023 15:54:17 +0100 Subject: gnu: Add antifennel. Change-Id: Ic1f3fbc4d73ebc30291f4b60e7e8d16942c6627d Signed-off-by: Mathieu Othacehe --- gnu/packages/lua.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 65cab6511c..1cde6bd66c 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1269,6 +1269,39 @@ (define-public fennel system.") (license license:expat))) +(define-public antifennel + (package + (version "0.2.0") + (name "antifennel") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~technomancy/antifennel") + (commit version))) + (sha256 + (base32 "1hd9h17q31b3gg88c657zq4han4air2ag55rrakbmcpy6n8acsqc")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (inputs (list luajit)) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (delete 'configure) + ;; Tests pass after the fix introduced by the commit + ;; ecd2169fcad1fa6616fdf6e6a8569f5b866601e5 + (delete 'check) + (replace 'install + (lambda _ + (install-file "antifennel" + (string-append #$output "/bin"))))))) + (home-page "https://git.sr.ht/~technomancy/antifennel") + (synopsis "Turn Lua code into Fennel code") + (description + "This package provides a way to turn Lua code into Fennel code. +This compiler does the opposite of what the Fennel compiler does.") + (license license:expat))) + (define-public fnlfmt (package (name "fnlfmt") -- cgit v1.2.3 From 369c1782c77be0c68cc5cdd66184c33ca8b89d6c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 10 Nov 2023 12:13:00 -0800 Subject: gnu: librecast: Update to 0.8.0. * gnu/packages/networking.scm (librecast): Update to 0.8.0. [inputs]: Add libbsd. [source]: Apply guix style. --- gnu/packages/networking.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2028830087..dc2eabca11 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -127,6 +127,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages libbsd) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libusb) @@ -522,16 +523,16 @@ (define-public libnice (define-public librecast (package (name "librecast") - (version "0.7.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://codeberg.org/librecast/librecast") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0y0km0fv39m3i227pyg7fcr7d94gbji51fkcywqyrjgmk4j1hp1n")))) + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/librecast/librecast") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01m0q4n2hy3csbzil8ivjyzb1mh4w9jlh9iiv6z53kasl7aas27i")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f @@ -541,7 +542,7 @@ (define-public librecast (string-append "PREFIX=" (assoc-ref %outputs "out")))) #:test-target "test")) - (inputs (list libsodium lcrq)) + (inputs (list libsodium lcrq libbsd)) (synopsis "IPv6 multicast library") (description "Librecast is a C library which supports IPv6 multicast networking.") -- cgit v1.2.3 From 4ec8724c77c031e3ec94b3583c5b3cfc101fac61 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 10 Nov 2023 11:14:36 -0800 Subject: gnu: lcsync: Update to 0.3.0. Apply guix style. * gnu/packages/networking.scm (lcsync): Update to 0.3.0. [inputs]: Add libbsd. [arguments]: Drop 'use-prefix-from-configure-in-doc-makefile and 'add-library-paths. --- gnu/packages/networking.scm | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index dc2eabca11..994ce6a96a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -327,42 +327,26 @@ (define-public netperf (define-public lcsync (package (name "lcsync") - (version "0.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://codeberg.org/librecast/lcsync") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0bsd3dkir2i647nmrmyb7skbv16v0f6f3gfwkpxz8g42978dlms5")))) + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/librecast/lcsync") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rhk80ybd2zranay76z1ysifnnm786lg9kiiijcwv76qy95in9ks")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f - #:configure-flags - (list - (string-append "--prefix=" - (assoc-ref %outputs "out"))) + #:configure-flags (list (string-append "--prefix=" + (assoc-ref %outputs "out"))) #:make-flags (let ((target ,(%current-target-system))) (list ,(string-append "CC=" (cc-for-target)))) - #:test-target "test" - #:phases (modify-phases %standard-phases - (add-after 'unpack 'use-prefix-from-configure-in-doc-makefile - ;; Use prefix from configure. Fixed upstream: - ;; https://codeberg.org/librecast/lcsync/commit/4ba00f6 - ;; XXX: Remove for 0.2.2+ - (lambda _ - (substitute* "doc/Makefile.in" - (("PREFIX .= /usr/local") "PREFIX ?= @prefix@")))) - (add-before 'build 'add-library-paths - (lambda* (#:key inputs #:allow-other-keys) - (let* ((librecast (assoc-ref inputs "librecast"))) - (substitute* (list "./src/Makefile" "./test/Makefile") - (("-llibrecast") - (string-append "-L" librecast "/lib -llibrecast"))))))))) - (inputs (list lcrq librecast libsodium)) + #:test-target "test")) + (inputs (list lcrq librecast libsodium libbsd)) (home-page "https://librecast.net/lcsync.html") (synopsis "Librecast file and data syncing tool") (description -- cgit v1.2.3 From 4b6f6b3e180afc5d1b286130710dd9e3eb6c2889 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 15 Sep 2023 16:34:25 +0200 Subject: gnu: Add grub-coreboot * gnu/packages/bootloaders.scm (grub-coreboot): New variable. Signed-off-by: Denis 'GNUtoo' Carikli Signed-off-by: Vagrant Cascadian --- gnu/packages/bootloaders.scm | 67 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index fb20ba0efa..e708641623 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021 Pierre Langlois ;;; Copyright © 2021 Vincent Legoll ;;; Copyright © 2021 Brice Waegeneire -;;; Copyright © 2022 Denis 'GNUtoo' Carikli +;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2021 Stefan ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; @@ -295,6 +295,71 @@ (define-public grub-minimal #t)))))))) +(define-public grub-coreboot + (package + (inherit grub) + (name "grub-coreboot") + (synopsis "GRand Unified Boot loader (Coreboot payload version)") + (arguments + `(,@(substitute-keyword-arguments (package-arguments grub) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'disable-broken-tests + (lambda _ + (setenv "DISABLE_HARD_ERRORS" "1") + (setenv + "XFAIL_TESTS" + (string-join + ;; TODO: All the tests below use grub shell + ;; (tests/util/grub-shell.in), and here grub-shell uses + ;; QEMU and a Coreboot image to run the tests. Since we + ;; don't have a Coreboot package in Guix yet these tests + ;; are disabled. See the Guix bug #64667 for more details + ;; (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64667). + (list + "pata_test" + "ahci_test" + "uhci_test" + "ehci_test" + "example_grub_script_test" + "ohci_test" + "grub_script_eval" + "grub_script_echo1" + "grub_script_test" + "grub_script_leading_whitespace" + "grub_script_echo_keywords" + "grub_script_vars1" + "grub_script_for1" + "grub_script_while1" + "grub_script_if" + "grub_script_comments" + "grub_script_functions" + "grub_script_continue" + "grub_script_break" + "grub_script_shift" + "grub_script_blockarg" + "grub_script_return" + "grub_script_setparams" + "grub_cmd_date" + "grub_cmd_sleep" + "grub_cmd_regexp" + "grub_script_not" + "grub_cmd_echo" + "grub_script_expansion" + "grub_script_gettext" + "grub_script_escape_comma" + "help_test" + "grub_script_strcmp" + "test_sha512sum" + "grub_cmd_tr" + "test_unset" + "file_filter_test") + " ")))))) + ((#:configure-flags flags + ''()) + `(cons* "--with-platform=coreboot" + ,flags))))))) + (define-public grub-efi (package (inherit grub) -- cgit v1.2.3 From 6bf19a63d8d4f8e50d21a061c6b68a9d5d100a33 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 25 Nov 2023 09:51:57 +0300 Subject: gnu: obs-looking-glass: Update to B6. * gnu/packages/video.scm (obs-looking-glass): Update to B6. [source]: Use upstream tarball and switch to url-fetch. Change-Id: Ie60fe98fbeefe8f21c514599189e8171917456b6 --- gnu/packages/video.scm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 561268aabd..341f77cdc3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3618,18 +3618,15 @@ (define-public obs (define-public obs-looking-glass (package (name "obs-looking-glass") - (version "B5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gnif/LookingGlass") - (commit version) - (recursive? #t))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09mn544x5hg1z31l92ksk7fi7yj9r8xdk0dcl9fk56ivcr452ylm")))) + (version "B6") + (source (origin + (method url-fetch) + (uri (string-append "https://looking-glass.io/artifact/" version + "/source")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15d7wwbzfw28yqbz451b6n33ixy50vv8acyzi8gig1mq5a8gzdib")))) (build-system cmake-build-system) (arguments (list -- cgit v1.2.3 From 06c1301aa2e4f2f9d9679695b11c61093235c1cc Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 11 Nov 2023 20:00:52 +0800 Subject: gnu: kbdd: Fix cross-compilation. * gnu/packages/xdisorg.scm (kbdd): Fix cross-compilation. [native-inputs]: Add dbus-glib. Change-Id: I4f5bc93c8f372d47e7bf0d91e181775400c64ecf Signed-off-by: Mathieu Othacehe --- gnu/packages/xdisorg.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index fe70d25e3b..5fccd378bf 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3202,6 +3202,7 @@ (define-public kbdd (build-system gnu-build-system) (native-inputs (list autoconf automake + dbus-glib ;; for dbus-binding-tool `(,glib "bin") pkg-config)) (inputs (list dbus-glib glib libx11)) -- cgit v1.2.3 From 5edc8bec3022663d960820d34022764aed8284a2 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 11 Nov 2023 19:30:53 +0800 Subject: gnu: smu: Fix cross-compilation. * gnu/packages/markup.scm (smu): Fix cross-compilation. [arguments]: Use Gexp and CC-FOR-TARGET. Change-Id: Ifb6a1962b12b31ed0092cb042670301a3ef4cfa8 Signed-off-by: Mathieu Othacehe --- gnu/packages/markup.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 595b08fa20..4a9a382104 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2022 jgart ;;; Copyright © 2022 Vinicius Monego +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -428,13 +429,13 @@ (define-public smu (base32 "1jm7lhnzjx4q7gcwlkvsbffcy0zppywyh50d71ami6dnq182vvcc")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc" - (string-append "PREFIX=" - (assoc-ref %outputs "out"))) - #:tests? #f ; no tests included - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:tests? #f ; no tests included + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (home-page "https://github.com/Gottox/smu") (synopsis "Simple markup") (description -- cgit v1.2.3 From 7ae33c70f0183dab49a8b03e95505c08974c38a8 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 11 Nov 2023 18:57:09 +0800 Subject: gnu: xcompmgr: Fix cross-compilation. * gnu/packages/xorg.scm (xcompmgr): Fix cross-compilation. [native-inputs]: Add util-macros. Change-Id: Ice00c75ebd2cdf100bb9eb604c6928baaa85aa26 Signed-off-by: Mathieu Othacehe --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f65ffa7476..7d46558746 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6120,7 +6120,7 @@ (define-public xcompmgr (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - (list pkg-config autoconf automake)) + (list util-macros pkg-config autoconf automake)) (inputs (list libx11 libxext -- cgit v1.2.3 From a077907226d2f0d1345a661f7b285336ee858c10 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 11 Nov 2023 16:45:46 +0800 Subject: gnu: protobuf: Fix cross-compilation. * gnu/packages/protobuf.scm (protobuf): Fix cross-compilation. [native-inputs]: When cross-compiling, add this-package. [inputs]: Add googletest. Change-Id: Id7d3a8be9d4211249c0adc3a99a7a07206f9c495 Signed-off-by: Mathieu Othacehe --- gnu/packages/protobuf.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 8cd805799e..c157eabce0 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -156,8 +157,11 @@ (define-public protobuf (install-file file slib) (delete-file file)) (find-files lib "\\.a$")))))))) - (native-inputs (list googletest)) - (inputs (list zlib)) + (native-inputs (append (if (%current-target-system) + (list this-package) + '()) + (list googletest))) + (inputs (list zlib googletest)) (home-page "https://github.com/protocolbuffers/protobuf") (synopsis "Data encoding for remote procedure calls (RPCs)") (description -- cgit v1.2.3 From f982e290f04f611d6f23367781c73346b77ea14f Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 11 Nov 2023 17:49:04 +0800 Subject: gnu: nkf: Fix cross-compilation. * gnu/packages/textutils.scm (nkf): Fix cross-compilation. [arguments]: Use gexp and CC-FOR-TARGET. Change-Id: Idd2cbdd89d4ce2feb484a6005e06f1eba491feea Signed-off-by: Mathieu Othacehe --- gnu/packages/textutils.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 41a34b6c4e..801d8fd8ad 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Gabriel Wicki ;;; Copyright © 2023 Reza Housseini ;;; Copyright © 2023 Hilton Chain +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1289,13 +1290,14 @@ (define-public nkf "0anw0knr1iy4p9w3d3b3pbwzh1c43p1i2q4c28kw9zviw8kx2rly")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; test for perl module - #:make-flags (list "CC=gcc" "CFLAGS=-O2 -Wall -pedantic" - (string-append "prefix=" %output) - "MKDIR=mkdir -p") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) ; No ./configure script + (list #:tests? #f ; test for perl module + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "CFLAGS=-O2 -Wall -pedantic" + (string-append "prefix=" #$output) + "MKDIR=mkdir -p") + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) ; No ./configure script (home-page "https://ja.osdn.net/projects/nkf/") (synopsis "Network Kanji Filter") (description "Nkf is yet another kanji code converter among networks, -- cgit v1.2.3 From b9d4c299893e28b4343cd2fef5f1d25b9d228396 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 11 Nov 2023 18:10:37 +0800 Subject: gnu: odt2txt: Fix cross-compilation. * gnu/packages/textutils.scm (odt2txt): Fix cross-compilation. [arguments]: Use Gexp and CC-FOR-TARGET. Change-Id: I0a81e601813da0e4b2accaf835e3ea774b742df8 Signed-off-by: Mathieu Othacehe --- gnu/packages/textutils.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 801d8fd8ad..ea182b1925 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1130,13 +1130,13 @@ (define-public odt2txt "0im3kzvhxkjlx57w6h13mc9584c74ma1dyymgvpq2y61av3gc35v")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no make check - #:make-flags (list "CC=gcc" - (string-append "DESTDIR=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - ;; no configure script - (delete 'configure)))) + (list #:tests? #f ; no make check + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output)) + #:phases + #~(modify-phases %standard-phases + ;; no configure script + (delete 'configure)))) (inputs (list zlib)) (home-page "https://github.com/dstosberg/odt2txt/") -- cgit v1.2.3 From 909d55e0776cb8862613d029b4ce337a6a959c02 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 11 Nov 2023 18:28:54 +0800 Subject: gnu: daikichi: Fix cross-compilation. * gnu/packages/textutils.scm (daikichi): Fix cross-compilation. [inputs]: Add diffutils. Change-Id: I7e46a3f61a869c10f3491e1397232125ccf76149 Signed-off-by: Mathieu Othacehe --- gnu/packages/toys.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 21d5279e85..2fa47315c0 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019, 2022 Liliana Marie Prikler ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Leo Famulari +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,6 +71,7 @@ (define-public daikichi (search-input-file inputs (string-append "bin/" cmd))))))))) (inputs (list bash-minimal coreutils sed + diffutils fmt gmp)) (native-inputs (list pkg-config)) (home-page "https://gitlab.com/lilyp/daikichi") -- cgit v1.2.3 From 3350f3be0d4bb9a8f2bff7be15e58803a9f9c19c Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 11 Nov 2023 22:31:22 +0800 Subject: gnu: zix: Update to 0.4.2. * gnu/packages/datastructures.scm (zix): Update to 0.4.2. Change-Id: I4465ff6eefbdbb7a3de1806fc4adbec285fa26a1 Signed-off-by: Mathieu Othacehe --- gnu/packages/datastructures.scm | 45 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 0689ef4259..c6b2396537 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Mark H Weaver ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2023 Nicolas Goaziou +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -444,28 +445,26 @@ (define-public robin-map (license license:expat))) (define-public zix - (let ((commit "a13ae5ad9dc70075740f11139f1db96cc79faa59") - (revision "0")) - (package - (name "zix") - (version (git-version "0.3.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/drobilla/zix.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1njyb8lz1d5qzf0k14pb3rq13xkxnddwbz090dj69138ymz1xgyl")))) - (build-system meson-build-system) - (arguments - (list #:configure-flags #~(list "-Ddocs=disabled"))) ;needs "sphinxygen" - (native-inputs (list pkg-config)) - (home-page "https://gitlab.com/drobilla/zix") - (synopsis "C library of portability wrappers and data structures") - (description - "Zix is a C library of portability wrappers and data structures. It + (package + (name "zix") + (version "0.4.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/drobilla/zix.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07pbq4bi64iv39swldfbcp7131b5n4hs64pgd417gqlwv8qvgjcw")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags #~(list "-Ddocs=disabled"))) ;needs "sphinxygen" + (native-inputs (list pkg-config)) + (home-page "https://gitlab.com/drobilla/zix") + (synopsis "C library of portability wrappers and data structures") + (description + "Zix is a C library of portability wrappers and data structures. It provides the following components: @table @code @item ZixAllocator A customizable allocator. @@ -480,4 +479,4 @@ (define-public zix zix/filesystem.h Functions for working with filesystems. @item zix/path.h Functions for working with filesystem paths lexically. @end table") - (license license:isc)))) + (license license:isc))) -- cgit v1.2.3 From 6e4914a037c8b332ab3f1149129c0bd1cea4640b Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Wed, 22 Nov 2023 16:48:02 +0800 Subject: gnu: Add qtrvsim. * gnu/packages/emulators.scm (qtrvsim): New variable. Change-Id: I8e51184534fa9990c318008513e1e6566a04b10a Signed-off-by: Mathieu Othacehe --- gnu/packages/emulators.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 0729feb071..138b68bc21 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 c4droid ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 Hendursaga +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -111,7 +112,8 @@ (define-module (gnu packages emulators) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) - #:use-module (guix build-system python)) + #:use-module (guix build-system python) + #:use-module (guix build-system qt)) (define-public vice (package @@ -2492,6 +2494,29 @@ (define-public exomizer ;; zlib license with an (non-)advertising clause. (license license:zlib))) +(define-public qtrvsim + (package + (name "qtrvsim") + (version "0.9.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cvut/qtrvsim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zi39q8ajkzl8d47sacj0dk1a2n5jmfgr29x9iby59v792g7p8ac")) + (modules '((guix build utils))) + (snippet #~(begin (delete-file-recursively "external/libelf"))))) + (build-system qt-build-system) + (inputs (list libelf qtbase-5)) + (home-page "https://github.com/cvut/qtrvsim") + (synopsis "RISC-V CPU simulator for education purposes") + (description "RISC-V CPU simulator for education purposes with pipeline and +cache visualization. Developed at FEE CTU for computer architecture classes.") + (license license:gpl3+))) + (define-public cc65 (package (name "cc65") -- cgit v1.2.3 From 9f562060a47ee815bed3796f49de32d3cf8990bd Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 3 Nov 2023 09:48:25 +0800 Subject: gnu: font-lxgw-wenkai: Update to 1.311. * gnu/packages/fonts.scm (font-lxgw-wenkai): Update to 1.311. Change-Id: I0d7530c917a78e9f283ebfd4b84064b77261338d --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 22a42d227f..27aaa19a1d 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -3159,7 +3159,7 @@ (define-public font-atui-feather (define-public font-lxgw-wenkai (package (name "font-lxgw-wenkai") - (version "1.310") + (version "1.311") (source (origin (method url-fetch) (uri (string-append @@ -3167,7 +3167,7 @@ (define-public font-lxgw-wenkai version "/lxgw-wenkai-v" version ".tar.gz")) (sha256 (base32 - "10z8ilcpfxmll6j6ck4yj90x48vh3c7ck0lm61qjangpw9fcgfb1")))) + "0f5fnqcwp8kicrbkncn5j1w06cil771jfdcjf2w48vl62m4gmf27")))) (build-system font-build-system) (home-page "https://lxgw.github.io/2021/01/28/Klee-Simpchin/") (synopsis "Simplified Chinese Imitation Song typeface") -- cgit v1.2.3 From 25f0e19b72f6d81529bcff84e798b1b07354e2ba Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 3 Nov 2023 09:50:00 +0800 Subject: gnu: font-lxgw-wenkai-tc: Update to 1.011. * gnu/packages/fonts.scm (font-lxgw-wenkai-tc): Update to 1.011. Change-Id: I632f25389077825320db741ab23ef6e2ec09b6fb --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 27aaa19a1d..812282cf9e 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -3181,7 +3181,7 @@ (define-public font-lxgw-wenkai-tc (package (inherit font-lxgw-wenkai) (name "font-lxgw-wenkai-tc") - (version "1.010") + (version "1.011") (source (origin (method url-fetch) (uri (string-append @@ -3189,7 +3189,7 @@ (define-public font-lxgw-wenkai-tc version "/lxgw-wenkai-tc-v" version ".tar.gz")) (sha256 (base32 - "1yppqrfmynai1canlq0hksl3yaj8kflbnj41ljl4lxwaz6q9i1ly")))) + "0x83a7zg1w82bpilk84ajlisccf90kl01gz89fipgqji9nii71bv")))) (home-page "https://github.com/lxgw/LxgwWenKaitc") (synopsis "Traditional Chinese Imitation Song typeface") (description -- cgit v1.2.3 From 282927e9705724aa09e89805f87fa2c395356dcf Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 18 Nov 2023 15:08:06 +0800 Subject: gnu: font-sarasa-gothic: Update to 0.42.6. * gnu/packages/fonts.scm (font-sarasa-gothic): Update to 0.42.6. Change-Id: I84203bf94b3b147c440a473fef0fcff4596fcd29 --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 812282cf9e..813367be8a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1952,7 +1952,7 @@ (define-public font-junicode (define-public font-sarasa-gothic (package (name "font-sarasa-gothic") - (version "0.42.1") + (version "0.42.6") (source (origin (method url-fetch) @@ -1960,7 +1960,7 @@ (define-public font-sarasa-gothic "/releases/download/v" version "/sarasa-gothic-ttc-" version ".7z")) (sha256 - (base32 "0lrhipis21cafpsf8wsrdavlblfgzz424r23rj78ik8npbws1a3v")))) + (base32 "0czx10yph2lxg2k4w6qjnil73zb2pgg3g400apm9gay41m04990v")))) (build-system font-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ca8dda242873cad762b14cbdb42c8dfa54dd6a1e Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 23 Oct 2023 22:20:01 +0800 Subject: gnu: zig-0.10: Use gexp. * gnu/packages/zig.scm (zig-0.10)[arguments]: Use gexp. Change-Id: I8ba6a4bd92784637cd3a4448e2f99ed521a17f3a --- gnu/packages/zig.scm | 79 ++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 39 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index dcca9a1121..882e5426dc 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -20,6 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages zig) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix git-download) @@ -53,45 +54,45 @@ (define-public zig-0.10 (native-inputs (list llvm-15)) (arguments - `(#:configure-flags - (list ,@(if (%current-target-system) - '(string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system)) - '()) - (string-append "-DZIG_TARGET_MCPU=baseline") - "-DZIG_SHARED_LLVM=ON" - (string-append "-DZIG_LIB_DIR=" (assoc-ref %outputs "out") - "/lib/zig")) - #:validate-runpath? #f ; TODO: zig binary can't find ld-linux. - #:out-of-source? #f ; for tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-env-variables - (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; Set CC, since the stage 2 zig relies on it to find the libc - ;; installation, and otherwise silently links against its own. - (setenv "CC" ,(cc-for-target)) - ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")))) - (add-after 'patch-source-shebangs 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - ;; Zig uses information about /usr/bin/env to determine the - ;; version of glibc and other data. - (substitute* "lib/std/zig/system/NativeTargetInfo.zig" - (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs tests? #:allow-other-keys) - (when tests? - (invoke (string-append (assoc-ref outputs "out") "/bin/zig") - "build" "test" - ;; We're not testing the compiler bootstrap chain. - "-Dskip-stage1" - "-Dskip-stage2-tests" - ;; Non-native tests try to link and execute non-native - ;; binaries. - "-Dskip-non-native"))))))) + (list + #:configure-flags + #~(list #$@(if (%current-target-system) + (list (string-append "-DZIG_TARGET_TRIPLE=" + (%current-target-system))) + '()) + "-DZIG_TARGET_MCPU=baseline" + "-DZIG_SHARED_LLVM=ON" + (string-append "-DZIG_LIB_DIR=" #$output "/lib/zig")) + #:validate-runpath? #f ;TODO: zig binary can't find ld-linux. + #:out-of-source? #f ;for tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-env-variables + (lambda _ + ;; Set CC, since the stage 2 zig relies on it to find the libc + ;; installation, and otherwise silently links against its own. + (setenv "CC" #$(cc-for-target)) + ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. + (setenv "ZIG_GLOBAL_CACHE_DIR" + (string-append (getcwd) "/zig-cache")))) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + ;; Zig uses information about /usr/bin/env to determine the + ;; version of glibc and other data. + (substitute* "lib/std/zig/system/NativeTargetInfo.zig" + (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke (string-append #$output "/bin/zig") + "build" "test" + ;; We're not testing the compiler bootstrap chain. + "-Dskip-stage1" + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native"))))))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 1680e3c77f4cc37b1f2ea378ae10a9353f3c6e92 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 23 Oct 2023 22:26:45 +0800 Subject: gnu: zig-0.9: Use gexp. * gnu/packages/zig.scm (zig-0.9)[arguments]: Use gexp. Change-Id: I38c856320ace6d960ae342f5de164ca6c3f449c0 --- gnu/packages/zig.scm | 95 ++++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 47 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index 882e5426dc..bc3e1c019a 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -147,52 +147,53 @@ (define-public zig-0.9 (native-inputs (list llvm-13)) (arguments - `(#:configure-flags - (list ,@(if (%current-target-system) - (string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system)) - '())) - #:out-of-source? #f ; for tests - ;; There are too many unclear test failures. - #:tests? ,(not (or (target-riscv64?) - (%current-target-system))) - #:phases - (modify-phases %standard-phases - (add-after 'configure 'set-cache-dir - (lambda _ - ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")))) - ,@(if (target-riscv64?) - ;; It is unclear why all these tests fail to build. - `((add-after 'unpack 'adjust-tests - (lambda _ - (substitute* "build.zig" - ((".*addRuntimeSafetyTests.*") "") - ((".*addRunTranslatedCTests.*") "")) - (substitute* "test/standalone.zig" - ;; These tests fail to build on riscv64-linux. - ;; They both contain 'exe.linkSystemLibrary("c");' - ((".*shared_library.*") "") - ((".*mix_o_files.*") "") - ;; ld.lld: error: undefined symbol: __tls_get_addr - ;; Is this symbol x86 only in glibc? - ((".*link_static_lib_as_system_lib.*") ""))))) - '()) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs tests? #:allow-other-keys) - (when tests? - (invoke (string-append (assoc-ref outputs "out") "/bin/zig") - ;; Testing the standard library takes >7.5GB RAM, and - ;; will fail if it is OOM-killed. The 'test-toolchain' - ;; target skips standard library and doc tests. - "build" "test-toolchain" - ;; Stage 2 is experimental, not what we run with `zig', - ;; and stage 2 tests require a lot of RAM. - "-Dskip-stage2-tests" - ;; Non-native tests try to link and execute non-native - ;; binaries. - "-Dskip-non-native"))))))))) + (list + #:configure-flags + #~(list #$@(if (%current-target-system) + (list (string-append "-DZIG_TARGET_TRIPLE=" + (%current-target-system))) + '())) + #:out-of-source? #f ; for tests + ;; There are too many unclear test failures. + #:tests? (not (or (target-riscv64?) + (%current-target-system))) + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'set-cache-dir + (lambda _ + ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. + (setenv "ZIG_GLOBAL_CACHE_DIR" + (string-append (getcwd) "/zig-cache")))) + #$@(if (target-riscv64?) + ;; It is unclear why all these tests fail to build. + `((add-after 'unpack 'adjust-tests + (lambda _ + (substitute* "build.zig" + ((".*addRuntimeSafetyTests.*") "") + ((".*addRunTranslatedCTests.*") "")) + (substitute* "test/standalone.zig" + ;; These tests fail to build on riscv64-linux. + ;; They both contain 'exe.linkSystemLibrary("c");' + ((".*shared_library.*") "") + ((".*mix_o_files.*") "") + ;; ld.lld: error: undefined symbol: __tls_get_addr + ;; Is this symbol x86 only in glibc? + ((".*link_static_lib_as_system_lib.*") ""))))) + '()) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke (string-append #$output "/bin/zig") + ;; Testing the standard library takes >7.5GB RAM, and + ;; will fail if it is OOM-killed. The 'test-toolchain' + ;; target skips standard library and doc tests. + "build" "test-toolchain" + ;; Stage 2 is experimental, not what we run with `zig', + + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native"))))))))) (define-public zig zig-0.10) -- cgit v1.2.3 From f0682a6388c5f96dde979cacad3339916168c790 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 23 Oct 2023 22:38:50 +0800 Subject: gnu: zig-0.10: Inherit from zig-0.9. * gnu/packages/zig.scm (zig-0.9): Expand definition. (zig-0.10): Inherit from zig-0.9. Change-Id: I36c273ac3f08982f598fa934571c1b83437cb977 --- gnu/packages/zig.scm | 179 +++++++++++++++++++++++++-------------------------- 1 file changed, 88 insertions(+), 91 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index bc3e1c019a..08ee650d8b 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -30,10 +30,10 @@ (define-module (gnu packages zig) #:use-module (gnu packages compression) #:use-module (gnu packages llvm)) -(define-public zig-0.10 +(define-public zig-0.9 (package (name "zig") - (version "0.10.1") + (version "0.9.1") (source (origin (method git-fetch) @@ -42,57 +42,66 @@ (define-public zig-0.10 (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")) - (patches (search-patches "zig-do-not-link-against-librt.patch")))) + (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) + (patches (search-patches "zig-0.9-riscv-support.patch" + "zig-use-system-paths.patch" + "zig-do-not-link-against-librt.patch")))) (build-system cmake-build-system) - (inputs - (list clang-15 ; Clang propagates llvm. - lld-15 - zlib - (list zstd "lib"))) - ;; Zig compiles fine with GCC, but also needs native LLVM libraries. - (native-inputs - (list llvm-15)) (arguments (list #:configure-flags #~(list #$@(if (%current-target-system) (list (string-append "-DZIG_TARGET_TRIPLE=" (%current-target-system))) - '()) - "-DZIG_TARGET_MCPU=baseline" - "-DZIG_SHARED_LLVM=ON" - (string-append "-DZIG_LIB_DIR=" #$output "/lib/zig")) - #:validate-runpath? #f ;TODO: zig binary can't find ld-linux. - #:out-of-source? #f ;for tests + '())) + #:out-of-source? #f ; for tests + ;; There are too many unclear test failures. + #:tests? (not (or (target-riscv64?) + (%current-target-system))) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'set-env-variables + #$@(if (target-riscv64?) + ;; It is unclear why all these tests fail to build. + `((add-after 'unpack 'adjust-tests + (lambda _ + (substitute* "build.zig" + ((".*addRuntimeSafetyTests.*") "") + ((".*addRunTranslatedCTests.*") "")) + (substitute* "test/standalone.zig" + ;; These tests fail to build on riscv64-linux. + ;; They both contain 'exe.linkSystemLibrary("c");' + ((".*shared_library.*") "") + ((".*mix_o_files.*") "") + ;; ld.lld: error: undefined symbol: __tls_get_addr + ;; Is this symbol x86 only in glibc? + ((".*link_static_lib_as_system_lib.*") ""))))) + '()) + (add-after 'configure 'set-cache-dir (lambda _ - ;; Set CC, since the stage 2 zig relies on it to find the libc - ;; installation, and otherwise silently links against its own. - (setenv "CC" #$(cc-for-target)) ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. (setenv "ZIG_GLOBAL_CACHE_DIR" (string-append (getcwd) "/zig-cache")))) - (add-after 'patch-source-shebangs 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - ;; Zig uses information about /usr/bin/env to determine the - ;; version of glibc and other data. - (substitute* "lib/std/zig/system/NativeTargetInfo.zig" - (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) (delete 'check) (add-after 'install 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke (string-append #$output "/bin/zig") - "build" "test" - ;; We're not testing the compiler bootstrap chain. - "-Dskip-stage1" + ;; Testing the standard library takes >7.5GB RAM, and + ;; will fail if it is OOM-killed. The 'test-toolchain' + ;; target skips standard library and doc tests. + "build" "test-toolchain" + ;; Stage 2 is experimental, not what we run with `zig', + "-Dskip-stage2-tests" ;; Non-native tests try to link and execute non-native ;; binaries. "-Dskip-non-native"))))))) + (inputs + (list clang-13 ;Clang propagates llvm. + lld-13)) + ;; Zig compiles fine with GCC, but also needs native LLVM libraries. + (native-inputs + (list llvm-13)) (native-search-paths (list (search-path-specification @@ -123,11 +132,11 @@ (define-public zig-0.10 (properties `((max-silent-time . 9600))) (license license:expat))) -(define-public zig-0.9 +(define-public zig-0.10 (package - (inherit zig-0.10) + (inherit zig-0.9) (name "zig") - (version "0.9.1") + (version "0.10.1") (source (origin (method git-fetch) @@ -136,64 +145,52 @@ (define-public zig-0.9 (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) - (patches (search-patches "zig-0.9-riscv-support.patch" - "zig-use-system-paths.patch" - "zig-do-not-link-against-librt.patch")))) + (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")) + (patches (search-patches "zig-do-not-link-against-librt.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments zig-0.9) + ((#:configure-flags flags ''()) + #~(cons* "-DZIG_TARGET_MCPU=baseline" + "-DZIG_SHARED_LLVM=ON" + (string-append "-DZIG_LIB_DIR=" #$output "/lib/zig") + #$flags)) + ;; TODO: zig binary can't find ld-linux. + ((#:validate-runpath? _ #t) #f) + ((#:tests? _ #t) #t) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + #$@(if (target-riscv64?) + `((delete 'adjust-tests)) + '()) + (add-after 'unpack 'set-CC + (lambda _ + ;; Set CC, since the stage 2 zig relies on it to find the libc + ;; installation, and otherwise silently links against its own. + (setenv "CC" #$(cc-for-target)))) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + ;; Zig uses information about /usr/bin/env to determine the + ;; version of glibc and other data. + (substitute* "lib/std/zig/system/NativeTargetInfo.zig" + (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke (string-append #$output "/bin/zig") + "build" "test" + ;; We're not testing the compiler bootstrap chain. + "-Dskip-stage1" + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native")))))))) (inputs - (list clang-13 ; Clang propagates llvm. - lld-13)) - ;; Zig compiles fine with GCC, but also needs native LLVM libraries. + (modify-inputs (package-inputs zig-0.9) + (prepend zlib `(,zstd "lib")) + (replace "clang" clang-15) + (replace "lld" lld-15))) (native-inputs - (list llvm-13)) - (arguments - (list - #:configure-flags - #~(list #$@(if (%current-target-system) - (list (string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system))) - '())) - #:out-of-source? #f ; for tests - ;; There are too many unclear test failures. - #:tests? (not (or (target-riscv64?) - (%current-target-system))) - #:phases - #~(modify-phases %standard-phases - (add-after 'configure 'set-cache-dir - (lambda _ - ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")))) - #$@(if (target-riscv64?) - ;; It is unclear why all these tests fail to build. - `((add-after 'unpack 'adjust-tests - (lambda _ - (substitute* "build.zig" - ((".*addRuntimeSafetyTests.*") "") - ((".*addRunTranslatedCTests.*") "")) - (substitute* "test/standalone.zig" - ;; These tests fail to build on riscv64-linux. - ;; They both contain 'exe.linkSystemLibrary("c");' - ((".*shared_library.*") "") - ((".*mix_o_files.*") "") - ;; ld.lld: error: undefined symbol: __tls_get_addr - ;; Is this symbol x86 only in glibc? - ((".*link_static_lib_as_system_lib.*") ""))))) - '()) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke (string-append #$output "/bin/zig") - ;; Testing the standard library takes >7.5GB RAM, and - ;; will fail if it is OOM-killed. The 'test-toolchain' - ;; target skips standard library and doc tests. - "build" "test-toolchain" - ;; Stage 2 is experimental, not what we run with `zig', - - "-Dskip-stage2-tests" - ;; Non-native tests try to link and execute non-native - ;; binaries. - "-Dskip-non-native"))))))))) + (modify-inputs (package-native-inputs zig-0.9) + (replace "llvm" llvm-15))))) (define-public zig zig-0.10) -- cgit v1.2.3 From 1566e00fbc87ba7b6320be7f587e2e5e5c082b38 Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 14 Nov 2023 15:34:48 +0000 Subject: gnu: LLVM, Clang, libomp, lld: Update to 17.0.5. * gnu/packages/llvm.scm (llvm-17, clang-17, libomp-17, lld-17): Update to 17.0.5. Change-Id: I6f719be6fea037e4e57643589d1e585ad039ab68 Signed-off-by: Hilton Chain --- gnu/packages/llvm.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 82a4088829..6bd52969e6 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -601,13 +601,13 @@ (define %llvm-monorepo-hashes '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2") ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky") - ("17.0.3" . "1fhrnsv87if7kbqmrsxy2r7ykx3gnr9lmbmvkhvycc91ii4ihybx"))) + ("17.0.5" . "149flpr96vcn7a1ckya6mm93m9yp85l47w156fjd0r99ydxrw5kv"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) ("15.0.7" . ("clang-15.0-libc-search-path.patch")) ("16.0.6" . ("clang-16.0-libc-search-path.patch")) - ("17.0.3" . ("clang-17.0-libc-search-path.patch")))) + ("17.0.5" . ("clang-17.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -1500,7 +1500,7 @@ (define-public clang-toolchain-16 (define-public llvm-17 (package (inherit llvm-15) - (version "17.0.3") + (version "17.0.5") (source (llvm-monorepo version)))) (define-public clang-runtime-17 @@ -1516,7 +1516,7 @@ (define-public clang-17 (package-version llvm-17))) (sha256 (base32 - "0an16xdc8rgrdf0dcq3sdg82ajyb00h4bff9n0gm7gqf48ds0da8"))))) + "12dbp10bhq25a44qnvz978mf9y6pdycwpp7sgq8a93by0fpgb72r"))))) (define-public libomp-17 (package -- cgit v1.2.3 From 95ea1277ae2ebd278bdb51a7887f5ba1116fbc64 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 25 Nov 2023 16:17:12 +0100 Subject: gnu: commencement: Use locales for the right libc version on GNU/Hurd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Until now, we were unconditionally using ‘glibc-utf8-locales’, which targets the glibc version used on Linux (2.35) rather than that used on the Hurd (2.37). This would lead to build failures due to the inability to use locale encoding when targeting i586-gnu. * gnu/packages/base.scm (glibc-utf8-locales/hurd): New variable. * gnu/packages/commencement.scm (glibc-utf8-locales-final/hurd): New variable. (%boot5-inputs): Use it when ‘target-hurd?’ returns #t. (%final-inputs): Likewise. Change-Id: I1666d615dffbe3561cf2d9612b85cd31a48a7dcd --- gnu/packages/base.scm | 5 +++++ gnu/packages/commencement.scm | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 2d8e9143cd..41aff0ca97 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1512,6 +1512,11 @@ (define-public glibc/hurd-headers (delete 'build))))) ; nothing to build (supported-systems %hurd-systems))) +(define-public glibc-utf8-locales/hurd + ;; Locales for the libc version used on GNU/Hurd. + (hidden-package + (make-glibc-utf8-locales glibc/hurd))) + (define* (libc-for-target #:optional (target (or (%current-target-system) (%current-system)))) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 80fdb5aed7..a1ee015d04 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3365,6 +3365,16 @@ (define-public glibc-utf8-locales-final `(("glibc" ,glibc-final) ("gzip" ,(with-boot4 gzip)))))) +(define-public glibc-utf8-locales-final/hurd + ;; Locales for the libc version used on GNU/Hurd. + (package + (inherit glibc-utf8-locales/hurd) + (properties `((hidden? . #t) + ,@(package-properties glibc-utf8-locales/hurd))) + (native-inputs + `(("glibc" ,glibc-final) + ("gzip" ,(with-boot4 gzip)))))) + (define-public ld-wrapper ;; The final 'ld' wrapper, which uses the final Guile and Binutils. (make-ld-wrapper "ld-wrapper" @@ -3383,7 +3393,9 @@ (define (%boot5-inputs) ;; Now with UTF-8 locales. Remember that the bootstrap binaries were built ;; with an older libc, which cannot load the new locale format. See ;; . - `(("locales" ,glibc-utf8-locales-final) + `(("locales" ,(if (target-hurd?) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final)) ,@(%boot4-inputs))) (define with-boot5 @@ -3484,7 +3496,9 @@ (define-public %final-inputs ("gcc" ,gcc-final) ("libc" ,glibc-final) ("libc:static" ,glibc-final "static") - ("locales" ,glibc-utf8-locales-final)))))) + ("locales" ,(if (target-hurd?) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final))))))) (define-public canonical-package (let ((name->package (mlambda (system) -- cgit v1.2.3 From 4735893e1bdac1dbff2edb1ad6ecbc5111bad8da Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Tue, 21 Nov 2023 22:17:04 +0100 Subject: gnu: network-manager-applet: Update to 1.34.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (network-manager-applet): Update to 1.34.0. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ac3035e07d..e1c3f2821a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2017, 2020, 2021 Brendan Tildesley ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Jovany Leandro G.C -;;; Copyright © 2018 Vasile Dumitrascu +;;; Copyright © 2018, 2023 Vasile Dumitrascu ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018, 2019 Timothy Sample ;;; Copyright © 2019 Danny Milosavljevic @@ -8669,7 +8669,7 @@ (define-public mobile-broadband-provider-info (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/network-manager-applet/" @@ -8677,7 +8677,7 @@ (define-public network-manager-applet "network-manager-applet-" version ".tar.xz")) (sha256 (base32 - "0f5sxxi9rywg8mhglcyk3sqmgv5wwl4vxzar56847b852pxazdd2")))) + "1a55mf4ww06lqacs6zndp29ayyby5f8rgg1lp341y5kb1x3qwdmb")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From bc3842901fb66bd4a7b5e0807c87c8c28137d19b Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Tue, 21 Nov 2023 22:24:43 +0100 Subject: gnu: conky: Update to 1.19.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/conky.scm (conky): Update to 1.19.6. Signed-off-by: Ludovic Courtès --- gnu/packages/conky.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index bd26cdd015..e29c6e1070 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Siniša Biđin ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt -;;; Copyright © 2019 Vasile Dumitrascu +;;; Copyright © 2019, 2023 Vasile Dumitrascu ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +40,7 @@ (define-public conky (package (name "conky") (home-page "https://github.com/brndnmtthws/conky") - (version "1.19.4") + (version "1.19.6") (source (origin (method git-fetch) @@ -49,7 +49,7 @@ (define-public conky (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03zzssdg1qdv83p4c3dbjgr0g1n0spc0ndk9bds1rd2n82i6g6sy")))) + (base32 "02mdqsizc36v3zqhxnyv2mch9w0gqnl4a25yxishka9yv5ni5iig")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From e3933f8b4d661c265d30d85e51d639986f3ee649 Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Sun, 19 Nov 2023 20:19:57 +0100 Subject: gnu: emacs-ein: Update to 20230826. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-ein): Update to 20230826. Signed-off-by: Ludovic Courtès Change-Id: I55f4d6bba65d917dee042fdd9b38b3e6d0123df3 --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1e19d653a1..996142dc3e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37665,10 +37665,10 @@ (define-public emacs-code-cells (define-public emacs-ein ;; XXX: Upstream doesn't make any release, and didn't set any version. - (let ((commit "b2410dc96f61aa806a7934099d8f1e40c8f6ca18")) + (let ((commit "998ba22660be2035cd23bed1555e47748c4da8a2")) (package (name "emacs-ein") - (version "20220911") + (version "20230826") (source (origin (method git-fetch) @@ -37679,7 +37679,7 @@ (define-public emacs-ein (file-name (git-file-name name version)) (sha256 (base32 - "02392bxl0msda58cls0i79mzqjs73x39czx0mlb0sg2vxp84gy15")))) + "09qbswzz6kbxc74dmdgagrk5wgbm89sabf0bfy76j4qlcg6550mx")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 39ca9a964d7f45878295efc142be8abf5c7910eb Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Sun, 12 Nov 2023 16:44:07 -0500 Subject: gnu: xscreensaver: Update to 6.08. * gnu/packages/xdisorg.scm (xscreensaver): Update to 6.08. [inputs]: Remove gdk-pixbuf-xlib. Add glib:bin. Change-Id: I610ae408a0e0d01868ba23a5574a301dc1ea3330 Signed-off-by: Mathieu Othacehe --- gnu/packages/xdisorg.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5fccd378bf..8de2ed3816 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1709,7 +1709,7 @@ (define-public gammastep (define-public xscreensaver (package (name "xscreensaver") - (version "6.04") + (version "6.08") (source (origin (method url-fetch) @@ -1717,7 +1717,7 @@ (define-public xscreensaver (string-append "https://www.jwz.org/xscreensaver/xscreensaver-" version ".tar.gz")) (sha256 - (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q")) + (base32 "18vnbs2ns42cgnnsvwn0zh98wcfzxf2k9mib5x5zkv6f4njjpxaw")) (modules '((guix build utils))) (snippet ;; 'configure.ac' checks for $ac_unrecognized_opts and exits if it's @@ -1764,14 +1764,13 @@ (define-public xscreensaver libjpeg-turbo linux-pam pango - gdk-pixbuf-xlib gtk+ perl cairo bc libxrandr glu - glib)) + `(,glib "bin"))) (home-page "https://www.jwz.org/xscreensaver/") (synopsis "Classic screen saver suite supporting screen locking") (description -- cgit v1.2.3 From 625a847d2a554168bec6e294888d9d1f8ab03d08 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 25 Nov 2023 22:47:10 +0100 Subject: gnu: commencement: Avoid cyclic dependency when targeting i586-pc-gnu. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a regression introduced in 95ea1277ae2ebd278bdb51a7887f5ba1116fbc64 where: guix build coreutils --target=i586-pc-gnu coreutils would never complete due to a dependency loop introduced in ‘%final-inputs’. * gnu/packages/commencement.scm (%final-inputs): Pass argument to ‘target-hurd?’. Change-Id: I4df7907fb9afcd2b170ba19307666eaa81f12d41 --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a1ee015d04..03fecd6d9b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3496,7 +3496,7 @@ (define-public %final-inputs ("gcc" ,gcc-final) ("libc" ,glibc-final) ("libc:static" ,glibc-final "static") - ("locales" ,(if (target-hurd?) + ("locales" ,(if (target-hurd? (%current-system)) glibc-utf8-locales-final/hurd glibc-utf8-locales-final))))))) -- cgit v1.2.3 From c7ec42afe3ffd0312bd89f26775c58b0d1de2bd9 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 7 Nov 2023 17:36:16 +0100 Subject: gnu: Add ppp-2.4.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/samba.scm (ppp-2.4.9): New variable. Change-Id: I496016429ec4a8289b2a4ab51caa9245b914b4a5 Signed-off-by: Ludovic Courtès --- gnu/packages/samba.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 89a79cee2d..f52b86e1ed 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -507,6 +507,38 @@ (define-public ppp license:gpl2+ license:public-domain)))) +(define-public ppp-2.4.9 + (package + (inherit ppp) + (name "ppp") + (version "2.4.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ppp-project/ppp") + (commit (string-append "ppp-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bhhksdclsnkw54a517ndrw55q5zljjbh9pcqz1z4a2z2flxpsgk")))) + (arguments + (list #:tests? #f ;; No "check" target + #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-Makefile + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl")) + (libpcap (assoc-ref inputs "libpcap"))) + (substitute* "pppd/Makefile.linux" + (("/usr/include/openssl") + (string-append openssl "/include")) + (("-DPPP_FILTER") + (string-append "-DPPP_FILTER -I" libpcap "/include"))) + (substitute* "pppd/pppcrypt.h" + (("des\\.h") "openssl/des.h"))) + #t))))))) + (define-public wsdd (package (name "wsdd") -- cgit v1.2.3 From c5c3939ad395884ec8a5730110b4060d4abae593 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 7 Nov 2023 17:36:17 +0100 Subject: gnu: openfortivpn: Depend on ppp 2.4.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vpn.scm (openfortivpn): Update to 1.17.3. [inputs]: Remove ppp; add ppp-2.4.9. Change-Id: Ia88254afb1d7aaa9d3d6bf6c9e752d84165560b3 Co-authored-by: Ludovic Courtès --- gnu/packages/vpn.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 972f9b0329..489a35da42 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -825,7 +825,9 @@ (define-public openfortivpn (native-inputs (list autoconf automake pkg-config)) (inputs - (list openssl ppp)) + ;; ppp < 2.5.0 is required due to + ;; . + (list openssl ppp-2.4.9)) (home-page "https://github.com/adrienverge/openfortivpn") (synopsis "Client for PPP+SSL VPN tunnel services") (description "Openfortivpn is a client for PPP+SSL VPN tunnel services. It -- cgit v1.2.3 From 6a91350640a141cb875be717ce245c60b0842e9a Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 7 Nov 2023 17:36:18 +0100 Subject: gnu: network-manager-fortisslvpn: Depend on ppp 2.4.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (network-manager-fortisslvpn): Update to 1.4.0. [inputs]: Remove ppp; add ppp-2.4.9. Change-Id: I5ef055e3fc5fc855aca8d2fa95ff995a229db89d Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e1c3f2821a..0be935585d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8635,7 +8635,10 @@ (define-public network-manager-fortisslvpn libsecret network-manager openfortivpn - ppp)) + + ;; ppp < 2.5.0 is currently required: + ;; https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/084ef529c5fb816927ca54866f66b340265aa9f6 + ppp-2.4.9)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "Fortinet SSLVPN plug-in for NetworkManager") (description -- cgit v1.2.3 From 3634c55ce48a73a5b728f74a3e890ba3f9b43bcb Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 29 Oct 2023 11:54:49 +0300 Subject: gnu: Deprecate the "go-github-com-lucas-clemente-quic-go" variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-lucas-clemente-quic-go): Rename to "go-github-com-quic-go-quic-go". [arguments]: Patch source files to replace "lucas-clemente" with "quic-go". [home-page]: Update. (go-github-com-lucas-clemente-quic-go): Define as deprecated by "go-github-com-quic-go-quic-go". Change-Id: I9a99d4d904fadcf0b6854e806042ce5ad190ac0c Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2c9aff4a28..9b5045f9f3 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7692,14 +7692,14 @@ (define-public go-github-com-cheekybits-genny (home-page "https://github.com/cheekybits/genny/") (license license:expat))) -(define-public go-github-com-lucas-clemente-quic-go +(define-public go-github-com-quic-go-quic-go (package - (name "go-github-com-lucas-clemente-quic-go") + (name "go-github-com-quic-go-quic-go") (version "0.14.4") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lucas-clemente/quic-go") + (url "https://github.com/quic-go/quic-go") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7707,20 +7707,31 @@ (define-public go-github-com-lucas-clemente-quic-go "04l3gqbc3gh079n8vgnrsf8ypgv8sl63xjf28jqfrb45v2l73vyz")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/lucas-clemente/quic-go" + '(#:import-path "github.com/quic-go/quic-go" ;; XXX More packages required... - #:tests? #f)) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-repository-path + (lambda _ + (substitute* (find-files "src/github.com/quic-go/quic-go/" ".*\\.go|.*\\.mod") + (("lucas-clemente") + "quic-go"))))))) (propagated-inputs - (list go-golang-org-x-crypto go-github-com-cheekybits-genny + (list go-golang-org-x-crypto + go-github-com-cheekybits-genny go-github-com-marten-seemann-chacha20 go-github-com-marten-seemann-qtls go-github-com-golang-protobuf-proto)) (synopsis "QUIC in Go") (description "This package provides a Go language implementation of the QUIC network protocol.") - (home-page "https://github.com/lucas-clemente/quic-go") + (home-page "https://github.com/quic-go/quic-go") (license license:expat))) +(define-public go-github-com-lucas-clemente-quic-go + (deprecated-package "go-github-com-lucas-clemente-quic-go" go-github-com-quic-go-quic-go)) + (define-public go-github-com-lunixbochs-vtclean (package (name "go-github-com-lunixbochs-vtclean") -- cgit v1.2.3 From b9c8f3784aa4353de40aef3b8e81a40e5decc585 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 1 Nov 2023 23:32:36 +0300 Subject: gnu: go-github-com-arceliar-ironwood: Update to v0.0.0-20231028101932-ceac99571f43. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-arceliar-ironwood): Update to v0.0.0-20231028101932-ceac99571f43. Change-Id: I313d67094ca6e99ccb8c8bf1c8cc001fc9dd537a Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9b5045f9f3..ffac94854f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2022 Christopher Howard ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Timo Wilken +;;; Copyright © 2023 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -11971,7 +11972,7 @@ (define-public go-github-com-containerd-console (define-public go-github-com-arceliar-ironwood (package (name "go-github-com-arceliar-ironwood") - (version "0.0.0-20221115123222-ec61cea2f439") + (version "v0.0.0-20231028101932-ceac99571f43") (source (origin (method git-fetch) @@ -11981,7 +11982,7 @@ (define-public go-github-com-arceliar-ironwood (file-name (git-file-name name version)) (sha256 (base32 - "0jdfhsr1yci0a4fpf2pmh9n4d7iryjx12y3549gv9nfjf91rs225")))) + "1shxpmi847jf7rfa5mb0m4nflwmlg65hjgjm9v7ynjvcp0licsi4")))) (build-system go-build-system) (arguments '(#:import-path "github.com/Arceliar/ironwood" -- cgit v1.2.3 From cad061327ebbde79ca56cc56b5554372a6af1e62 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 4 Nov 2023 12:32:14 +0300 Subject: gnu: Deprecate the "go-github-com-willf-bitset" variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-willf-bitset): Rename to "go-github-com-bits-and-blooms-bitset". [arguments]: Update. [home-page]: Update. (go-github-com-willf-bitset): Define as deprecated by "go-github-com-bits-and-blooms-bitset". Change-Id: Iaa31f120d1c2b18a5c916ea5e68b89bd3e534ffd Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ffac94854f..6d23ade32a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8648,29 +8648,32 @@ (define-public go-github-com-mattn-go-sqlite3 @code{database/sql}.") (license license:expat))) -(define-public go-github-com-willf-bitset +(define-public go-github-com-bits-and-blooms-bitset (package - (name "go-github-com-willf-bitset") + (name "go-github-com-bits-and-blooms-bitset") (version "1.1.10") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/willf/bitset") - (commit (string-append "v" version)))) + (url "https://github.com/bits-and-blooms/bitset") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0wpaxg6va3qwd0hq0b8rpb1hswvzzbfm2h8sjmcsdpbkydjjx9zg")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/willf/bitset")) + '(#:import-path "github.com/bits-and-blooms/bitset")) (synopsis "Bitsets in Go") (description "This package provides a Go implementation of bitsets, which are a mapping between non-negative integers and boolean values focused on efficient space usage.") - (home-page "https://github.com/willf/bitset") + (home-page "https://github.com/bits-and-blooms/bitset") (license license:bsd-3))) +(define-public go-github-com-willf-bitset + (deprecated-package "go-github-com-willf-bitset" go-github-com-bits-and-blooms-bitset)) + (define-public go-github-com-willf-bloom (package (name "go-github-com-willf-bloom") -- cgit v1.2.3 From f4b88255bc116bc72376507ce4e53d539937ee86 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 4 Nov 2023 12:34:17 +0300 Subject: gnu: go-github-com-bits-and-blooms-bitset: Update to 1.11.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-bits-and-blooms-bitset): Update to 1.11.0. Change-Id: I36dff5e8434f736d448c4dc8918f36020d25303a Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6d23ade32a..e9fb67c981 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8651,7 +8651,7 @@ (define-public go-github-com-mattn-go-sqlite3 (define-public go-github-com-bits-and-blooms-bitset (package (name "go-github-com-bits-and-blooms-bitset") - (version "1.1.10") + (version "1.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -8660,7 +8660,7 @@ (define-public go-github-com-bits-and-blooms-bitset (file-name (git-file-name name version)) (sha256 (base32 - "0wpaxg6va3qwd0hq0b8rpb1hswvzzbfm2h8sjmcsdpbkydjjx9zg")))) + "1ialciixmr98p10rh61rnnkxpqi1j9hycbkv9rnjl0vnmsnpy0cy")))) (build-system go-build-system) (arguments '(#:import-path "github.com/bits-and-blooms/bitset")) -- cgit v1.2.3 From fb59ead37b75619adb5a17f0595025e99dfd7938 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 4 Nov 2023 18:03:02 +0300 Subject: gnu: Update "go-github-com-willf-bitset" to 3.6.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-willf-bloom): Rename to "go-github-com-bits-and-blooms-bloom". Update to 3.6.0. [arguments]: Replace "willf" with "bits-and-blooms". [home-page]: Likewise. (go-github-com-willf-bloom): Define as deprecated by "go-github-com-bits-and-blooms-bloom". Change-Id: Ib9ecbff9c2694fae53bbc355fcb03079140183a0 Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e9fb67c981..a6f0092e85 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8674,22 +8674,22 @@ (define-public go-github-com-bits-and-blooms-bitset (define-public go-github-com-willf-bitset (deprecated-package "go-github-com-willf-bitset" go-github-com-bits-and-blooms-bitset)) -(define-public go-github-com-willf-bloom +(define-public go-github-com-bits-and-blooms-bloom (package - (name "go-github-com-willf-bloom") - (version "2.0.3") + (name "go-github-com-bits-and-blooms-bloom") + (version "3.6.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/willf/bloom") - (commit (string-append "v" version)))) + (url "https://github.com/bits-and-blooms/bloom") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0ygan8pgcay7wx3cs3ja8rdqj7nly7v3and97ddcc66020jxchzg")))) + "02rpjlgl7k3755qnlsk519xazgqlk73b8wvkpqlvccywms5w77bq")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/willf/bloom" + '(#:import-path "github.com/bits-and-blooms/bloom" #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-import-path @@ -8697,17 +8697,20 @@ (define-public go-github-com-willf-bloom ;; See 'go.mod' in the source distribution of Syncthing 1.5.0 for ;; more information. ;; - (substitute* "src/github.com/willf/bloom/bloom.go" + (substitute* "src/github.com/bits-and-blooms/bloom/bloom.go" (("spaolacci") "twmb")) #t))))) (propagated-inputs - (list go-github-com-twmb-murmur3 go-github-com-willf-bitset)) + (list go-github-com-twmb-murmur3 go-github-com-bits-and-blooms-bitset)) (synopsis "Bloom filters in Go") (description "This package provides a Go implementation of bloom filters, based on murmurhash.") - (home-page "https://github.com/willf/bloom") + (home-page "https://github.com/bits-and-blooms/bitset") (license license:bsd-2))) +(define-public go-github-com-willf-bloom + (deprecated-package "go-github-com-willf-bloom" go-github-com-bits-and-blooms-bloom)) + (define-public go-golang-org-rainycape-unidecode (let ((commit "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c") (revision "1")) -- cgit v1.2.3 From d51fb5ed3452235e12d8654e70dec0f121da0a90 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 5 Nov 2023 09:04:32 +0300 Subject: gnu: Add go-github-com-quic-go-qtls-go1-20. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-quic-go-qtls-go1-20): New variable. Change-Id: Id7b4bfc88e446e974af31026c7717dc732cd09a6 Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a6f0092e85..46d9b056d8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7693,6 +7693,32 @@ (define-public go-github-com-cheekybits-genny (home-page "https://github.com/cheekybits/genny/") (license license:expat))) +(define-public go-github-com-quic-go-qtls-go1-20 + (package + (name "go-github-com-quic-go-qtls-go1-20") + (version "0.3.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/quic-go/qtls-go1-20") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/quic-go/qtls-go1-20" + #:go go-1.20)) + (propagated-inputs (list go-golang-org-x-crypto go-golang-org-x-sys)) + (synopsis "TLS 1.3 for QUIC") + (description + "Go standard library TLS 1.3 implementation, modified for QUIC. For +Go 1.20.") + (home-page "https://github.com/quic-go/qtls-go1-20") + (license license:expat))) + (define-public go-github-com-quic-go-quic-go (package (name "go-github-com-quic-go-quic-go") -- cgit v1.2.3 From 3f8d50ecbdcf87d7f6cfeda5b1fddc3d506dd31c Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 5 Nov 2023 09:17:10 +0300 Subject: gnu: Add go-github-com-quic-go-qpack. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-quic-go-qpack): New variable. Change-Id: I1ef8e677367a9a863897bfe884259782076e75fc Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 46d9b056d8..e8df68de18 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7719,6 +7719,39 @@ (define-public go-github-com-quic-go-qtls-go1-20 (home-page "https://github.com/quic-go/qtls-go1-20") (license license:expat))) +(define-public go-github-com-quic-go-qpack + (package + (name "go-github-com-quic-go-qpack") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/quic-go/qpack") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00mjz445hhx4yar5l8p21bpp4d06jyg2ajw0ax7bh64d37l4kx39")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/quic-go/qpack" + ;; Tests require ginkgo v2. + #:tests? #f + #:go go-1.20)) + (propagated-inputs (list go-github-com-onsi-gomega + go-github-com-onsi-ginkgo + go-golang-org-x-net)) + (synopsis "Minimal QPACK (RFC 9204) implementation for Go") + (description + "A minimal QPACK (RFC 9204) implementation in Go. It is minimal in the sense +that it doesn't use the dynamic table at all, but just the static table and (Huffman +encoded) string literals. Wherever possible, it reuses code from the +@url{https://github.com/golang/net/tree/master/http2/hpack, HPACK implementation in +the Go standard library}.") + (home-page "https://github.com/quic-go/qpack") + (license license:expat))) + (define-public go-github-com-quic-go-quic-go (package (name "go-github-com-quic-go-quic-go") -- cgit v1.2.3 From eea7dffd80f8ff6642846e07d0b23a5075c31cf3 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 5 Nov 2023 21:01:17 +0300 Subject: gnu: Add go-golang-org-x-sys-0.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-golang-org-x-sys-0.8): New variable. (go-github-com-quic-go-qtls-go1-20) [propagated-inputs]: Use "go-golang-org-x-sys-0.8". Change-Id: I5e79b909e1f670a20e66bf2a9a06009737c45028 Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e8df68de18..7f563b2296 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4092,6 +4092,24 @@ (define-public go-golang-org-x-sys (home-page "https://go.googlesource.com/sys") (license license:bsd-3)))) +;; XXX: This version is required for "go-github-com-quic-go-qtls-go1-20". +(define-public go-golang-org-x-sys-0.8 + (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78") + (revision "0")) + (package + (inherit go-golang-org-x-sys) + (name "go-golang-org-x-sys") + (version (git-version "0.8.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sys") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))))) + (define-public go-golang-org-x-text (package (name "go-golang-org-x-text") @@ -7711,7 +7729,8 @@ (define-public go-github-com-quic-go-qtls-go1-20 (list #:import-path "github.com/quic-go/qtls-go1-20" #:go go-1.20)) - (propagated-inputs (list go-golang-org-x-crypto go-golang-org-x-sys)) + (propagated-inputs (list go-golang-org-x-crypto + go-golang-org-x-sys-0.8)) (synopsis "TLS 1.3 for QUIC") (description "Go standard library TLS 1.3 implementation, modified for QUIC. For -- cgit v1.2.3 From 76a5f0eacd08279f2e4330d9d70e4a0c300554a3 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 5 Nov 2023 21:28:26 +0300 Subject: gnu: Add go-golang-org-x-net-0.17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-golang-org-x-net-0.17): New variable. Change-Id: Ie301f84c6ced9d96d6d9f685facedb4b88d30f78 Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7f563b2296..082b445ab8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3989,6 +3989,23 @@ (define-public go-golang-org-x-net (home-page "https://go.googlesource.com/net") (license license:bsd-3)))) +(define-public go-golang-org-x-net-0.17 + (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd") + (revision "0")) + (package + (inherit go-golang-org-x-net) + (name "go-golang-org-x-net") + (version (git-version "0.17.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9"))))))) + (define-public go-golang-org-x-net-html (package (inherit go-golang-org-x-net) -- cgit v1.2.3 From 0ed050f31ae856263b22122d2e0171041dd78edb Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Tue, 7 Nov 2023 23:36:26 +0300 Subject: gnu: go-github-com-quic-go-quic-go: Update to 0.39.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-quic-go-quic-go): Update to 0.39.3. [propagated-inputs]: Rewrite input packages to replace old "go-golang-org-x-sys" with "go-golang-org-x-sys-0.8". Add "go-golang-org-x-sys-0.8". Change-Id: Ia8d9f79d582a8a5a5b0d10638a1a1c00a104b06e Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 082b445ab8..ead9622d8c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7791,7 +7791,7 @@ (define-public go-github-com-quic-go-qpack (define-public go-github-com-quic-go-quic-go (package (name "go-github-com-quic-go-quic-go") - (version "0.14.4") + (version "0.39.3") (source (origin (method git-fetch) (uri (git-reference @@ -7800,25 +7800,29 @@ (define-public go-github-com-quic-go-quic-go (file-name (git-file-name name version)) (sha256 (base32 - "04l3gqbc3gh079n8vgnrsf8ypgv8sl63xjf28jqfrb45v2l73vyz")))) + "0acabl3cz48nxpggc5s7fwxpmr5amyi09jygn5m5xxkkbhqs2cxq")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/quic-go/quic-go" - ;; XXX More packages required... - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-repository-path - (lambda _ - (substitute* (find-files "src/github.com/quic-go/quic-go/" ".*\\.go|.*\\.mod") - (("lucas-clemente") - "quic-go"))))))) + (list #:import-path "github.com/quic-go/quic-go" + ;; XXX More packages required... + #:tests? #f + #:go go-1.20)) (propagated-inputs - (list go-golang-org-x-crypto - go-github-com-cheekybits-genny - go-github-com-marten-seemann-chacha20 - go-github-com-marten-seemann-qtls - go-github-com-golang-protobuf-proto)) + (let ((p (package-input-rewriting + `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8)) + #:deep? #true))) + (cons go-golang-org-x-sys-0.8 + (map p + (list go-github-com-quic-go-qtls-go1-20 + go-github-com-quic-go-qpack + go-golang-org-x-crypto + go-github-com-cheekybits-genny + go-github-com-marten-seemann-chacha20 + go-github-com-golang-protobuf-proto + go-golang-org-x-crypto + go-golang-org-x-exp + go-golang-org-x-net + go-golang-org-x-sync))))) (synopsis "QUIC in Go") (description "This package provides a Go language implementation of the QUIC network protocol.") -- cgit v1.2.3 From 98da3707b68f5b0c50997bf56662778e4aef039a Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Tue, 7 Nov 2023 23:40:53 +0300 Subject: gnu: yggdrasil: Update to 0.5.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (yggdrasil): Update to 0.5.2. [propagated-inputs]: Rewrite inputs to replace "go-golang-org-x-sys" with "go-golang-org-x-sys-0.8". Use "go-golang-org-x-sys-0.8". Add "go-github-com-bits-and-blooms-bitset", "go-github-com-bits-and-blooms-bloom", "go-github-com-quic-go-quic-go", and "go-github-com-hjson-hjson-go". * gnu/packages/patches/yggdrasil-extra-config.patch: Update. Change-Id: I3c411524e589f0af52eaa90230810148f6ad4e31 Signed-off-by: Ludovic Courtès --- gnu/packages/networking.scm | 62 +++++----- gnu/packages/patches/yggdrasil-extra-config.patch | 134 +++++++--------------- 2 files changed, 78 insertions(+), 118 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 994ce6a96a..6b415076e8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -4407,7 +4408,7 @@ (define-public ngtcp2 (define-public yggdrasil (package (name "yggdrasil") - (version "0.4.7") + (version "0.5.2") (source (origin (method git-fetch) @@ -4418,8 +4419,8 @@ (define-public yggdrasil (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "01mllfrsr55lnfivxwa57cfrjas6w4shsvx9k81pw8jixc124myk")) - (patches (search-patches "yggdrasil-extra-config.patch")))) + (base32 "0ahgb94s30sq1wwyc8h53mjj3j43ifr0aanj8262rsm6rqk04kzq")) + (patches (search-patches "yggdrasil-extra-config.patch")))) (build-system go-build-system) (arguments (list #:import-path "github.com/yggdrasil-network/yggdrasil-go" @@ -4445,32 +4446,37 @@ (define-public yggdrasil (list "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasil" "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl" "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys")))))))) - ;; https://github.com/kardianos/minwinsvc is windows only (propagated-inputs - (list ;;("go-golang-zx2c4-com-wireguard-windows" - ;; ,go-golang-zx2c4-com-wireguard-windows) - go-golang-zx2c4-com-wireguard - go-golang-org-x-text - go-golang-org-x-sys - go-golang-org-x-net - go-golang-org-x-crypto - go-golang-org-x-tools - go-netns - go-netlink - go-github-com-olekukonko-tablewriter - go-github-com-mitchellh-mapstructure - go-github-com-mattn-go-runewidth - go-github-com-mattn-go-isatty - go-github-com-mattn-go-colorable - go-github-com-kardianos-minwinsvc - go-github-com-hjson-hjson-go - go-github-com-hashicorp-go-syslog - go-github-com-gologme-log - go-github-com-fatih-color - go-github-com-cheggaaa-pb-v3 - go-github-com-vividcortex-ewma - go-github-com-arceliar-phony - go-github-com-arceliar-ironwood)) + (let ((p (package-input-rewriting + `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8)) + #:deep? #true))) + (cons go-golang-org-x-sys-0.8 + (map p + (list go-golang-zx2c4-com-wireguard + go-golang-org-x-text + go-golang-org-x-net + go-golang-org-x-crypto + go-golang-org-x-tools + go-netns + go-netlink + go-github-com-bits-and-blooms-bitset + go-github-com-bits-and-blooms-bloom + go-github-com-quic-go-quic-go + go-github-com-hjson-hjson-go + go-github-com-olekukonko-tablewriter + go-github-com-mitchellh-mapstructure + go-github-com-mattn-go-runewidth + go-github-com-mattn-go-isatty + go-github-com-mattn-go-colorable + go-github-com-kardianos-minwinsvc + go-github-com-hjson-hjson-go + go-github-com-hashicorp-go-syslog + go-github-com-gologme-log + go-github-com-fatih-color + go-github-com-cheggaaa-pb-v3 + go-github-com-vividcortex-ewma + go-github-com-arceliar-phony + go-github-com-arceliar-ironwood))))) (home-page "https://yggdrasil-network.github.io/blog.html") (synopsis "Experiment in scalable routing as an encrypted IPv6 overlay network") diff --git a/gnu/packages/patches/yggdrasil-extra-config.patch b/gnu/packages/patches/yggdrasil-extra-config.patch index 7934e2b50f..44c58a8fbd 100644 --- a/gnu/packages/patches/yggdrasil-extra-config.patch +++ b/gnu/packages/patches/yggdrasil-extra-config.patch @@ -1,108 +1,62 @@ -From 779f980451d20079b34812f7006f2d7230738ad0 Mon Sep 17 00:00:00 2001 -From: csepp -Date: Wed, 3 Nov 2021 21:14:54 +0100 +From 5aeabc1a8a8c5ecea3f5d0b7bcfa0aa0767ac92d Mon Sep 17 00:00:00 2001 +Message-ID: <5aeabc1a8a8c5ecea3f5d0b7bcfa0aa0767ac92d.1699726745.git.avityazev@posteo.org> +From: Aleksandr Vityazev +Date: Sat, 11 Nov 2023 19:50:46 +0300 Subject: [PATCH] add extra config file option to yggdrasil command This is useful in Guix and Nix, because one config file can come from the world-readable store and another can be placed directly into /etc with much stricter permissions. --- - cmd/yggdrasil/main.go | 29 ++++++++++++++++++++++------- - 1 file changed, 22 insertions(+), 7 deletions(-) + cmd/yggdrasil/main.go | 12 ++++++++++++ + src/config/config.go | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go -index 58b8230..b9df98a 100644 +index a225755..3f53dda 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go -@@ -43,11 +43,12 @@ type node struct { - admin *admin.AdminSocket - } - --func readConfig(log *log.Logger, useconf bool, useconffile string, normaliseconf bool) *config.NodeConfig { -+func readConfig(log *log.Logger, useconf bool, useconffile string, extraconffile string, normaliseconf bool) *config.NodeConfig { - // Use a configuration file. If -useconf, the configuration will be read - // from stdin. If -useconffile, the configuration will be read from the - // filesystem. - var conf []byte -+ var extraconf []byte - var err error - if useconffile != "" { - // Read the file from the filesystem -@@ -59,6 +60,21 @@ func readConfig(log *log.Logger, useconf bool, useconffile string, normaliseconf - if err != nil { - panic(err) - } -+ if extraconffile != "" { -+ extraconf, err = os.ReadFile(extraconffile); -+ } -+ if err != nil { -+ panic(err) -+ } -+ // Generate a new configuration - this gives us a set of sane defaults - -+ // then parse the configuration we loaded above on top of it. The effect -+ // of this is that any configuration item that is missing from the provided -+ // configuration will use a sane default. -+ cfg := defaults.GenerateConfig() -+ var confs [2][]byte -+ confs[0]=conf -+ confs[1]=extraconf -+ for _, conf := range confs { if len(conf)>0 { - // If there's a byte order mark - which Windows 10 is now incredibly fond of - // throwing everywhere when it's converting things into UTF-16 for the hell - // of it - remove it and decode back down into UTF-8. This is necessary -@@ -72,11 +88,6 @@ func readConfig(log *log.Logger, useconf bool, useconffile string, normaliseconf - panic(err) - } - } -- // Generate a new configuration - this gives us a set of sane defaults - -- // then parse the configuration we loaded above on top of it. The effect -- // of this is that any configuration item that is missing from the provided -- // configuration will use a sane default. -- cfg := defaults.GenerateConfig() - var dat map[string]interface{} - if err := hjson.Unmarshal(conf, &dat); err != nil { - panic(err) -@@ -136,6 +147,7 @@ func readConfig(log *log.Logger, useconf bool, useconffile string, normaliseconf - if err = mapstructure.Decode(dat, &cfg); err != nil { - panic(err) - } -+ }} - return cfg - } - -@@ -192,6 +204,7 @@ type yggArgs struct { - getaddr bool - getsnet bool - useconffile string -+ extraconffile string - logto string - loglevel string - } -@@ -200,6 +213,7 @@ func getArgs() yggArgs { +@@ -42,6 +42,7 @@ func main() { genconf := flag.Bool("genconf", false, "print a new config to stdout") useconf := flag.Bool("useconf", false, "read HJSON/JSON config from stdin") useconffile := flag.String("useconffile", "", "read HJSON/JSON config from specified file path") + extraconffile := flag.String("extraconffile", "", "extra (usually private) HJSON/JSON config from specified file path") normaliseconf := flag.Bool("normaliseconf", false, "use in combination with either -useconf or -useconffile, outputs your configuration normalised") + exportkey := flag.Bool("exportkey", false, "use in combination with either -useconf or -useconffile, outputs your private key in PEM format") confjson := flag.Bool("json", false, "print configuration from -genconf or -normaliseconf as JSON instead of HJSON") - autoconf := flag.Bool("autoconf", false, "automatic mode (dynamic IP, peer with IPv6 neighbors)") -@@ -213,6 +227,7 @@ func getArgs() yggArgs { - genconf: *genconf, - useconf: *useconf, - useconffile: *useconffile, -+ extraconffile: *extraconffile, - normaliseconf: *normaliseconf, - confjson: *confjson, - autoconf: *autoconf, -@@ -265,7 +280,7 @@ func run(args yggArgs, ctx context.Context, done chan struct{}) { - cfg = defaults.GenerateConfig() - case args.useconffile != "" || args.useconf: - // Read the configuration from either stdin or from the filesystem -- cfg = readConfig(logger, args.useconf, args.useconffile, args.normaliseconf) -+ cfg = readConfig(logger, args.useconf, args.useconffile, args.extraconffile, args.normaliseconf) - // If the -normaliseconf option was specified then remarshal the above - // configuration and print it back to stdout. This lets the user update - // their configuration file with newly mapped names (like above) or to +@@ -137,6 +138,17 @@ func main() { + return + } + ++ if *extraconffile !="" { ++ f, err := os.Open(*extraconffile) ++ if err != nil { ++ panic(err) ++ } ++ if _, err := cfg.ReadFrom(f); err != nil { ++ panic(err) ++ } ++ _ = f.Close() ++ } ++ + privateKey := ed25519.PrivateKey(cfg.PrivateKey) + publicKey := privateKey.Public().(ed25519.PublicKey) + +diff --git a/src/config/config.go b/src/config/config.go +index e899a35..76b9ec8 100644 +--- a/src/config/config.go ++++ b/src/config/config.go +@@ -112,7 +112,7 @@ func (cfg *NodeConfig) ReadFrom(r io.Reader) (int64, error) { + // then parse the configuration we loaded above on top of it. The effect + // of this is that any configuration item that is missing from the provided + // configuration will use a sane default. +- *cfg = *GenerateConfig() ++ // *cfg = *GenerateConfig() + if err := cfg.UnmarshalHJSON(conf); err != nil { + return n, err + } + +base-commit: b759683b76985665b5218346abab35f08d9f4d38 -- -2.33.1 +2.41.0 -- cgit v1.2.3 From 9501d5388d0452eb7ce14baceef1c7ac90333de8 Mon Sep 17 00:00:00 2001 From: Jaeme Sifat Date: Sat, 11 Nov 2023 23:22:42 -0500 Subject: gnu: yt-dlp: Update to 2023.10.13. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (yt-dlp): Update to 2023.10.13. Change-Id: I69da19ce8141fce99bb41daf6fe1892e5d6a9736 Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 341f77cdc3..e9b2a17851 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -66,6 +66,7 @@ ;;; Copyright © 2023 Ott Joon ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Saku Laesvuori +;;; Copyright © 2023 Jaeme Sifat ;;; ;;; This file is part of GNU Guix. ;;; @@ -2683,7 +2684,7 @@ (define-public youtube-dl (define-public yt-dlp (package/inherit youtube-dl (name "yt-dlp") - (version "2023.09.24") + (version "2023.10.13") (source (origin (method git-fetch) @@ -2692,7 +2693,7 @@ (define-public yt-dlp (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15ngsg3cadf2bv700fa1k5az5xpsm0wqr0cixbz8fcbhwdflfq6f")))) + (base32 "1cy8cpqwq6yfsbrnln3qqp9lsjckn20m6w7b890ha7jahyir5m1n")))) (arguments (substitute-keyword-arguments (package-arguments youtube-dl) ((#:tests? _) (not (%current-target-system))) -- cgit v1.2.3 From 18c3d347f5b24767093b13ece16df2b90c7894ad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Nov 2023 09:55:37 +0200 Subject: gnu: vim-vader: Use vim-build-system. * gnu/packages/vim.scm (vim-vader)[build-system]: Switch to the vim-build-system. [arguments]: Remove install-plan. Add plugin-name. (vim-coqtail)[arguments]: Adjust reference to vim-vader. Change-Id: I8210054e062b608706ee37a77f60969948b1c3b5 --- gnu/packages/vim.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 61ae6ffc68..2dc59af83d 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -492,8 +492,9 @@ (define-public vim-coqtail (display "Running Vim unit tests.\n") (let* ((vim-vader (assoc-ref (or native-inputs inputs) "vim-vader")) - (vader-path (string-append vim-vader - "/share/vim/vimfiles"))) + (vader-path (string-append + vim-vader + "/share/vim/vimfiles/pack/guix/start/vader"))) (with-directory-excursion "tests/vim" (setenv "VADER_PATH" vader-path) (invoke "vim" "-E" "-Nu" "vimrc" @@ -1505,15 +1506,9 @@ (define-public vim-vader (sha256 (base32 "179dbbqdyl6qf6jdb6kdazn3idz17m1h2n88rlggb1wnly74vjin")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("ftdetect" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")) + '(#:plugin-name "vader" #:phases (modify-phases %standard-phases (add-before 'install 'check -- cgit v1.2.3 From 1abeb6c907c17107bfba6aa11b58bda74433657b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Nov 2023 09:56:45 +0200 Subject: gnu: vim-coqtail: Use vim-build-system. * gnu/packages/vim.scm (vim-coqtail)[build-system]: Switch to the vim-build-system. [arguments]: Remove install-plan. Add plugin-name. Adjust custom 'check phase to refer to vim-full. [native-inputs]: Use 'old-style' package references to be able to specify vim-full. Change-Id: Iae3877738032a5583320245f63775f187c40fb6a --- gnu/packages/vim.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 2dc59af83d..1e204b9533 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -467,16 +467,9 @@ (define-public vim-coqtail (sha256 (base32 "0av2m075n6z05ah9ndrgnp9s16yrz6n2lj0igd9fh3c5k41x5xks")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("ftdetect" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("indent" "share/vim/vimfiles/") - ("python" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")) + '(#:plugin-name "coqtail" #:phases (modify-phases %standard-phases (add-before 'install 'check @@ -497,17 +490,20 @@ (define-public vim-coqtail "/share/vim/vimfiles/pack/guix/start/vader"))) (with-directory-excursion "tests/vim" (setenv "VADER_PATH" vader-path) - (invoke "vim" "-E" "-Nu" "vimrc" + (invoke (string-append + (assoc-ref (or native-inputs inputs) "vim-full") + "/bin/vim") + "-E" "-Nu" "vimrc" "-c" "Vader! *.vader"))) ;; Remove __pycache__ files generated during testing so that ;; they don't get installed. (delete-file-recursively "python/__pycache__"))))))) (native-inputs - (list coq-for-coqtail - python-pytest - vim-full ;; Plugin needs Python 3. - vim-vader)) + `(("coq-for-coqtail" ,coq-for-coqtail) + ("python-pytest" ,python-pytest) + ("vim-full" ,vim-full) ; Plugin needs Python 3. + ("vim-vader" ,vim-vader))) (propagated-inputs (list coq coq-ide-server)) (synopsis "Interactive Coq proofs in Vim") (description "Coqtail enables interactive Coq proof development in Vim -- cgit v1.2.3 From 5bad11773004273bb29688bb3a8db4c5e2eedb14 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Fri, 24 Nov 2023 22:22:05 -0800 Subject: gnu: parallel: Update to 20231122. * gnu/packages/parallel.scm (parallel): Update to 20231122. Change-Id: Ia4a42fee8ce484845801b6e738a85f67169fae79 Signed-off-by: Efraim Flashner --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index f3af1680b0..92ff023a6e 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -64,14 +64,14 @@ (define-module (gnu packages parallel) (define-public parallel (package (name "parallel") - (version "20231022") + (version "20231122") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "1316ydijavz41078c99mbrbaddnshspbs8nsbm5qlyah317vkwlk")) + (base32 "1qpa3dhmdddw7l5906y8ck8rnri66kqkxcbxhsnj058pmbw9qb42")) (snippet '(begin (use-modules (guix build utils)) -- cgit v1.2.3 From 767d4d1faecfcc40dbdb61b75dd9a7a434873037 Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Sun, 19 Nov 2023 21:19:37 +0900 Subject: gnu: Add vim-srcery-vim. * gnu/packages/vim.scm (vim-srcery-vim): New variable. Change-Id: If53bdae6783af5500f517c4941babb3bdb6522e7 Signed-off-by: Efraim Flashner --- gnu/packages/vim.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 1e204b9533..dee6d24ba4 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2022, 2023 Luis Henrique Gomes Higino ;;; Copyright © 2023 Charles Jackson ;;; Copyright © 2023 Foundation Devices, Inc. +;;; Copyright © 2023 Nguyễn Gia Phong ;;; ;;; This file is part of GNU Guix. ;;; @@ -1529,3 +1530,27 @@ (define-public vim-vader be integrated with @acronym{CI, Continuous Integration} pipelines to automate testing and is compatible with Vim and Neovim.") (license license:expat)))) ;; Specified in README.md. + +(define-public vim-srcery-vim + (package + (name "vim-srcery-vim") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/srcery-colors/srcery-vim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nwk81y9j5ljjm3k19kf1zmscdxiis4mwan026wv7cqp7f9qhxlr")))) + (build-system vim-build-system) + (arguments + (list #:plugin-name "srcery" + #:mode "opt")) + (home-page "https://srcery.sh") + (synopsis "Dark colorscheme for gvim and vim") + (description + "Srcery is a color scheme with clearly defined contrasting colors +and a slightly earthy tone.") + (license license:expat))) -- cgit v1.2.3 From 513bf164592e2b44e3e556cc5099a19bd6977790 Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Sun, 19 Nov 2023 22:19:19 +0900 Subject: gnu: Add vim-jedi-vim. * gnu/packages/vim.scm (vim-jedi-vim): New variable. Change-Id: I2656837686866961266b093cd6b4a4d528f5f684 Signed-off-by: Efraim Flashner --- gnu/packages/vim.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index dee6d24ba4..9debed0b86 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1531,6 +1531,28 @@ (define-public vim-vader automate testing and is compatible with Vim and Neovim.") (license license:expat)))) ;; Specified in README.md. +(define-public vim-jedi-vim + (package + (name "vim-jedi-vim") + (version "0.11.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/davidhalter/jedi-vim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03fj7f5cpchrdmz9szal6fdg05wdwb0j6260nnyp37nmpcpn13yc")))) + (build-system vim-build-system) + (arguments (list #:plugin-name "jedi-vim")) + (propagated-inputs (list python-jedi)) + (home-page "https://github.com/davidhalter/jedi-vim") + (synopsis "Jedi autocompletion library for Vim") + (description + "@code{jedi-vim} is a VIM binding to the autocompletion library Jedi.") + (license license:expat))) + (define-public vim-srcery-vim (package (name "vim-srcery-vim") -- cgit v1.2.3 From c34b630c99a21fac1a37369c2272aa650c9b1b90 Mon Sep 17 00:00:00 2001 From: Filip Lajszczak Date: Sat, 25 Nov 2023 19:12:22 +0000 Subject: gnu: Add guile-algorithms Guile port of racket-algorithms * gnu/packages/guile-xyz.scm (guile-algorithms): New variable. Change-Id: I53e5b130f96ce10e52622fcdb35b9d0bbe28b108 Signed-off-by: Mathieu Othacehe --- gnu/packages/guile-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 7326c1b65b..557589d2bb 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1373,6 +1373,31 @@ (define-public guile-aa-tree convenient nested tree operations.") (license license:gpl3+))) +(define-public guile-algorithms + (package + (name "guile-algorithms") + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git@git.sr.ht/~filiplajszczak/guile-algorithms") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1a4ffnnhw92gqphjji5ajy3xfaqzww7xv3h8p82gkawx0rqvj5ni")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake pkg-config texinfo)) + (inputs (list guile-3.0)) + (synopsis "Guile port of racket-algorithms") + (description + "Guile port of @url{https://docs.racket-lang.org/algorithms/index.html, +racket-algorithms}, a package containing useful algorithms borrowed from other +programming languages).") + (home-page "https://guile-algorithms.lajszczak.dev/") + (license license:gpl3+))) + (define-public guile-aws (let ((commit "f32bea12333e1054b97ab50e58a72636edabb5b7") (revision "1")) -- cgit v1.2.3 From fbdcb31e13194c73db2b6578b2163fb194dc5002 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 Nov 2023 14:16:27 -0800 Subject: gnu: diffoscope: Update to 252. * gnu/packages/diffoscope.scm (diffoscope): Update to 252. Signed-off-by: Mathieu Othacehe --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 5ab54de0e9..1ac5aff719 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -74,7 +74,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") - (version "251") + (version "252") (source (origin (method git-fetch) @@ -83,7 +83,7 @@ (define-public diffoscope (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1200kzwqyw2m298z8rfbiiziprz4s1n176z42xyziwc6mbx8m09z")))) + (base32 "1hnsnqpr0v9siqja1wxm64wv0vjacg6j9ph9n4xsiaarpndj1b4r")))) (build-system python-build-system) (arguments (list -- cgit v1.2.3 From f423f0fb5bf3da9cf6b54a21653d3bbac561d3d1 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Thu, 23 Nov 2023 17:26:36 -0500 Subject: gnu: qpwgraph: Update to 0.6.0. * gnu/packages/audio.scm (qpwgraph): Update to 0.6.0. Change-Id: Ib9a20a12f8f4516e8e61340f962536a94a2a81dc Signed-off-by: Mathieu Othacehe --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7c49ba1841..e4fe4c2da7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -6320,7 +6320,7 @@ (define-public odio-sacd (define-public qpwgraph (package (name "qpwgraph") - (version "0.5.3") + (version "0.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -6329,7 +6329,7 @@ (define-public qpwgraph (file-name (git-file-name name version)) (sha256 (base32 - "1i9p8gqm9swa2szr7i8rf3dhqxlaqjslb6yd5s9z1rs1jdb9lhp7")))) + "17jl347rwagdyx6pgnp83l1ffhlyfl0s4jf7ii2i1j3s1m9sz7y0")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ; no tests -- cgit v1.2.3 From 48af3de85b27909cc3f1a376c8640518346a9ca5 Mon Sep 17 00:00:00 2001 From: mtekman Date: Thu, 23 Nov 2023 16:52:28 +0100 Subject: gnu: fftw: Update to 3.3.10 * gnu/packages/algebra.scm (fftw): Update to 3.3.10 Change-Id: Icd6e199aa4e863f0d5c0883326a02e2991b811d3 Signed-off-by: Mathieu Othacehe --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c0fe75ddfd..c454c69164 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -736,14 +736,14 @@ (define-public kiss-fft-for-extempore (define-public fftw (package (name "fftw") - (version "3.3.8") + (version "3.3.10") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.fftw.org/pub/fftw/fftw-" version".tar.gz")) (sha256 (base32 - "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1")))) + "0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 176440c056fdde6da98b11720989b1ed060ec97c Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 22 Nov 2023 21:05:35 +0800 Subject: gnu: ucsim: Update to 0.8.2. * gnu/packages/embedded.scm (ucsim): Update to 0.8.2. Change-Id: Id1a18ef918b28b75311a01f512a3bbfdb545cd41 Signed-off-by: Mathieu Othacehe --- gnu/packages/embedded.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index af2cab1e67..313675814a 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1592,7 +1592,7 @@ (define-public ebusd (define-public ucsim (package (name "ucsim") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append @@ -1601,7 +1601,7 @@ (define-public ucsim "ucsim_" version "_orig.tar.gz")) (sha256 (base32 - "0qyrrna2ssvwla15al183r9zqnqdxxlqawyhx9c86a10m8q8qqlz")))) + "1zdvzfhdsbydyyjy5rf2934bn06skdlnky6l9ngbp2k645g0ynlh")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3