mirror of
https://codeberg.org/guix/guix.git
synced 2026-04-28 22:53:47 +00:00
Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
91bda669ab | ||
|
|
f384e4f25a | ||
|
|
86330b7344 | ||
|
|
d3a0108415 | ||
|
|
1a7e8d47e3 | ||
|
|
927469313c | ||
|
|
5043ec49c5 | ||
|
|
5660474bfa | ||
|
|
5bef6564ba | ||
|
|
c781426226 | ||
|
|
3699c4a4fe | ||
|
|
d1011b548f | ||
|
|
3814cc1da9 | ||
|
|
746add3f1b | ||
|
|
2fbb82a8a5 | ||
|
|
45cf15b751 |
@@ -341,7 +341,7 @@ runtime.")
|
||||
("java-jgit" ,java-jgit-4.2)
|
||||
("axoloti-runtime" ,axoloti-runtime)))
|
||||
(native-inputs
|
||||
(list ant zip ; for repacking the jar
|
||||
(list ant/java7 zip ; for repacking the jar
|
||||
unzip))
|
||||
(description
|
||||
"The Axoloti patcher offers a “patcher” environment similar to Pure Data
|
||||
@@ -647,7 +647,7 @@ This package provides the runtime.")
|
||||
("java-slf4j-api" ,java-slf4j-api)
|
||||
("ksoloti-runtime" ,ksoloti-runtime)))
|
||||
(native-inputs
|
||||
(list ant zip ;for repacking the jar
|
||||
(list ant/java7 zip ;for repacking the jar
|
||||
unzip))
|
||||
(description
|
||||
"Ksoloti is an environment for generating and processing digital audio.
|
||||
|
||||
@@ -9283,7 +9283,7 @@ VCF.")
|
||||
;; [testng] Exception in thread "main" java.lang.NoClassDefFoundError: com/beust/jcommander/ParameterException
|
||||
#:tests? #f
|
||||
#:jdk ,icedtea-8
|
||||
#:ant ,ant/java8
|
||||
#:ant ,ant
|
||||
;; This is only used for tests.
|
||||
#:make-flags
|
||||
(list "-Dsamjdk.intel_deflater_so_path=lib/jni/libIntelDeflater.so")
|
||||
@@ -9353,11 +9353,10 @@ VCF.")
|
||||
(list java-snappy-1
|
||||
java-commons-jexl-2
|
||||
java-cofoja
|
||||
ant/java8 ;for bzip2 support at runtime
|
||||
ant ;for bzip2 support at runtime
|
||||
zlib))
|
||||
(native-inputs
|
||||
`(("ant-apache-bcel" ,ant-apache-bcel)
|
||||
("ant-junit" ,ant-junit)
|
||||
("java-testng" ,java-testng)
|
||||
("java-commons-bcel" ,java-commons-bcel)
|
||||
("java-jcommander" ,java-jcommander)
|
||||
|
||||
@@ -412,7 +412,7 @@ similar to javadoc."))))
|
||||
(inherit base)
|
||||
(arguments
|
||||
`(;#:tests? #f;Requires spock-framework which is a circular dependency
|
||||
#:ant ,ant/java8; ant is actually a dependency of this package, and we need 1.10
|
||||
#:ant ,ant; ant is actually a dependency of this package, and we need 1.10
|
||||
,@(substitute-keyword-arguments arguments
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
@@ -431,8 +431,7 @@ similar to javadoc."))))
|
||||
("java-asm-analysis" ,java-asm-analysis-8)
|
||||
,@(package-inputs base)))
|
||||
(native-inputs
|
||||
`(("ant-junit" ,ant-junit)
|
||||
("groovy-bootstrap" ,groovy-bootstrap)
|
||||
`(("groovy-bootstrap" ,groovy-bootstrap)
|
||||
("groovy-xml" ,groovy-xml)
|
||||
("groovy-test" ,groovy-test)
|
||||
("groovy-tests-bootstrap" ,groovy-tests-bootstrap)
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
(inputs
|
||||
(list openblas))
|
||||
(native-inputs
|
||||
`(("ant" ,ant)
|
||||
`(("ant" ,ant/java7)
|
||||
("ruby" ,ruby) ; for configure script
|
||||
("gfortran" ,gfortran)
|
||||
("jdk" ,icedtea "jdk")))
|
||||
|
||||
@@ -1964,8 +1964,7 @@ OpenJDK.")
|
||||
(home-page "https://www.jetbrains.com/")
|
||||
(license license:gpl2+)))
|
||||
|
||||
|
||||
(define-public ant/java8
|
||||
(define-public ant
|
||||
(package
|
||||
(name "ant")
|
||||
(version "1.10.15")
|
||||
@@ -1980,15 +1979,12 @@ OpenJDK.")
|
||||
(snippet
|
||||
'(begin
|
||||
(for-each delete-file
|
||||
(find-files "lib/optional" "\\.jar$"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(find-files "lib/optional" "\\.jar$"))))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:modules '((srfi srfi-1)
|
||||
(guix build gnu-build-system)
|
||||
(guix build utils))
|
||||
#:tests? #f ;no "check" target
|
||||
#:ant ant/java7
|
||||
#:test-target "test"
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'remove-scripts
|
||||
@@ -1998,11 +1994,100 @@ OpenJDK.")
|
||||
(for-each delete-file
|
||||
(find-files "src/script"
|
||||
"(.*\\.(bat|cmd)|runant.*|antRun.*)"))))
|
||||
(add-after 'unpack 'link-test-dependencies
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(for-each (lambda (file)
|
||||
(symlink file
|
||||
(string-append "lib/optional/"
|
||||
(basename file))))
|
||||
(append
|
||||
(find-files (assoc-ref inputs "java-hamcrest-core")
|
||||
"\\.jar$")
|
||||
(find-files (assoc-ref inputs "java-hamcrest-library")
|
||||
"\\.jar$")
|
||||
(find-files (assoc-ref inputs "java-junit")
|
||||
"\\.jar$")))))
|
||||
(add-before 'build 'fix-test-failures
|
||||
(lambda _
|
||||
;; Failure because the directory does not exist
|
||||
(substitute* "src/etc/testcases/taskdefs/exec/exec-with-redirector.xml"
|
||||
(("/usr/bin") (getcwd)))
|
||||
;; Failure because it cannot read root's name in the build
|
||||
;; container
|
||||
(delete-file "src/tests/junit/org/apache/tools/ant/types/selectors/OwnedBySelectorTest.java")
|
||||
;; Cause timestamp issue when trying to rollback time by a few
|
||||
;; seconds.
|
||||
(for-each (lambda (file) (utime file 5000))
|
||||
(find-files "src/etc/testcases/taskdefs" "" #:directories? #t))))
|
||||
(delete 'bootstrap)
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
|
||||
(invoke "bash" "bootstrap.sh"
|
||||
(string-append "-Ddist.dir=" #$output))))
|
||||
(add-after 'build 'fix-executables-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(wrap-script (string-append #$output "/bin/ant")
|
||||
`("PATH" suffix
|
||||
(,(dirname (search-input-file inputs "/bin/sed"))
|
||||
,(dirname (search-input-file inputs "/bin/uname"))
|
||||
,(dirname (search-input-file inputs "/bin/which")))))
|
||||
(patch-shebang
|
||||
(string-append #$output "/bin/complete-ant-cmd.pl")
|
||||
(list (dirname (search-input-file inputs "/bin/perl"))))))
|
||||
(delete 'install))))
|
||||
(inputs
|
||||
(list coreutils-minimal
|
||||
guile-3.0/pinned
|
||||
java-hamcrest-core
|
||||
java-hamcrest-library
|
||||
java-junit
|
||||
perl
|
||||
sed
|
||||
which))
|
||||
(home-page "https://ant.apache.org")
|
||||
(synopsis "Build tool for Java")
|
||||
(description
|
||||
"Ant is a platform-independent build tool for Java. It is similar to
|
||||
make but is implemented using the Java language, requires the Java platform,
|
||||
and is best suited to building Java projects. Ant uses XML to describe the
|
||||
build process and its dependencies, whereas Make uses Makefile format.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
;; The 1.9.x series is the last that can be built with GCJ. The 1.10.x series
|
||||
;; requires Java 8.
|
||||
(define-public ant/java7
|
||||
(package
|
||||
(name "ant")
|
||||
(version "1.9.15")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/ant/source/apache-ant-"
|
||||
version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xy30f1w5gaqk6g3f0vw7ygix4rb6032qkcw42y4z8wd9jihgygd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((srfi srfi-1)
|
||||
(guix build gnu-build-system)
|
||||
(guix build utils))
|
||||
#:tests? #f ; no "check" target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'bootstrap)
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'remove-scripts
|
||||
;; Remove bat / cmd scripts for DOS as well as the antRun and runant
|
||||
;; wrappers.
|
||||
(lambda _
|
||||
(for-each delete-file
|
||||
(find-files "src/script"
|
||||
"(.*\\.(bat|cmd)|runant.*|antRun.*)"))))
|
||||
(replace 'build
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
|
||||
|
||||
;; Disable tests to avoid dependency on hamcrest-core, which needs
|
||||
;; Ant to build. This is necessary in addition to disabling the
|
||||
@@ -2011,9 +2096,10 @@ OpenJDK.")
|
||||
(substitute* "build.xml"
|
||||
(("depends=\"jars,test-jar") "depends=\"jars"))
|
||||
(invoke "bash" "bootstrap.sh"
|
||||
(string-append "-Ddist.dir=" #$output))))
|
||||
(string-append "-Ddist.dir="
|
||||
(assoc-ref outputs "out")))))
|
||||
(add-after 'build 'strip-jar-timestamps ;based on ant-build-system
|
||||
(lambda _
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(define (repack-archive jar)
|
||||
(let* ((dir (mkdtemp "jar-contents.XXXXXX"))
|
||||
(manifest (string-append dir "/META-INF/MANIFESTS.MF")))
|
||||
@@ -2039,11 +2125,11 @@ OpenJDK.")
|
||||
(apply invoke command)))))
|
||||
(for-each repack-archive
|
||||
(find-files
|
||||
(string-append #$output "/lib")
|
||||
(string-append (assoc-ref %outputs "out") "/lib")
|
||||
"\\.jar$"))))
|
||||
(delete 'install))))
|
||||
(native-inputs
|
||||
`(("jdk" ,icedtea-8 "jdk")
|
||||
`(("jdk" ,icedtea-7 "jdk")
|
||||
("zip" ,zip)
|
||||
("unzip" ,unzip)))
|
||||
(home-page "https://ant.apache.org")
|
||||
@@ -2055,131 +2141,12 @@ and is best suited to building Java projects. Ant uses XML to describe the
|
||||
build process and its dependencies, whereas Make uses Makefile format.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
;; The 1.9.x series is the last that can be built with GCJ. The 1.10.x series
|
||||
;; requires Java 8.
|
||||
(define-public ant
|
||||
(package (inherit ant/java8)
|
||||
(version "1.9.15")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/ant/source/apache-ant-"
|
||||
version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xy30f1w5gaqk6g3f0vw7ygix4rb6032qkcw42y4z8wd9jihgygd"))))
|
||||
;; XXX: we do this to avoid a rebuild. This mess will be cleaned up
|
||||
;; later.
|
||||
(arguments
|
||||
(substitute-keyword-arguments
|
||||
`(#:modules ((srfi srfi-1)
|
||||
(guix build gnu-build-system)
|
||||
(guix build utils))
|
||||
#:tests? #f ; no "check" target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'bootstrap)
|
||||
(delete 'configure)
|
||||
(add-before 'build 'define-java-environment-variables
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; First, set environment variables (eases debugging on -K).
|
||||
(setenv "JAVA_HOME" (assoc-ref inputs "jamvm"))
|
||||
(setenv "JAVACMD" (search-input-file inputs "/bin/jamvm"))
|
||||
(setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
|
||||
(setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
|
||||
(replace 'build
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Ant complains if this file doesn't exist.
|
||||
(setenv "HOME" "/tmp")
|
||||
(with-output-to-file "/tmp/.ant.properties"
|
||||
(lambda _ (display "")))
|
||||
|
||||
;; Use jikes instead of javac for <javac ...> tags in build.xml
|
||||
(setenv "ANT_OPTS" "-Dbuild.compiler=jikes")
|
||||
|
||||
;; jikes produces lots of warnings, but they are not very
|
||||
;; interesting, so we silence them.
|
||||
(setenv "$BOOTJAVAC_OPTS" "-nowarn")
|
||||
|
||||
;; Without these JamVM options the build may freeze.
|
||||
(substitute* "bootstrap.sh"
|
||||
(("^\"\\$\\{JAVACMD\\}\" " m)
|
||||
,@(if (string-prefix? "armhf" (or (%current-system)
|
||||
(%current-target-system)))
|
||||
`((string-append m "-Xnocompact "))
|
||||
`((string-append m "-Xnocompact -Xnoinlining ")))))
|
||||
|
||||
;; Disable tests because we are bootstrapping and thus don't have
|
||||
;; any of the dependencies required to build and run the tests.
|
||||
(substitute* "build.xml"
|
||||
(("depends=\"jars,test-jar\"") "depends=\"jars\""))
|
||||
(invoke "bash" "bootstrap.sh"
|
||||
(string-append "-Ddist.dir="
|
||||
(assoc-ref outputs "out")))))
|
||||
(add-after 'build 'strip-jar-timestamps ;based on ant-build-system
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(define (repack-archive jar)
|
||||
(let* ((dir (mkdtemp "jar-contents.XXXXXX"))
|
||||
(manifest (string-append dir "/META-INF/MANIFESTS.MF")))
|
||||
(with-directory-excursion dir
|
||||
(invoke "unzip" jar))
|
||||
(delete-file jar)
|
||||
;; XXX: copied from (gnu build install)
|
||||
(for-each (lambda (file)
|
||||
(let ((s (lstat file)))
|
||||
(unless (eq? (stat:type s) 'symlink)
|
||||
(utime file 0 0 0 0))))
|
||||
(find-files dir #:directories? #t))
|
||||
;; It is important that the manifest appears first.
|
||||
(with-directory-excursion dir
|
||||
(let* ((files (find-files "." ".*" #:directories? #t))
|
||||
;; To ensure that the reference scanner can
|
||||
;; detect all store references in the jars
|
||||
;; we disable compression with the "-0" option.
|
||||
(command (if (file-exists? manifest)
|
||||
`("zip" "-0" "-X" ,jar ,manifest
|
||||
,@files)
|
||||
`("zip" "-0" "-X" ,jar ,@files))))
|
||||
(apply invoke command)))))
|
||||
(for-each repack-archive
|
||||
(find-files
|
||||
(string-append (assoc-ref %outputs "out") "/lib")
|
||||
"\\.jar$"))))
|
||||
(delete 'install)))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'define-java-environment-variables)
|
||||
(add-after 'unpack 'remove-scripts
|
||||
;; Remove bat / cmd scripts for DOS as well as the antRun and runant
|
||||
;; wrappers.
|
||||
(lambda _
|
||||
(for-each delete-file
|
||||
(find-files "src/script"
|
||||
"(.*\\.(bat|cmd)|runant.*|antRun.*)"))
|
||||
#t))
|
||||
(replace 'build
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
|
||||
|
||||
;; Disable tests to avoid dependency on hamcrest-core, which needs
|
||||
;; Ant to build. This is necessary in addition to disabling the
|
||||
;; "check" phase, because the dependency on "test-jar" would always
|
||||
;; result in the tests to be run.
|
||||
(substitute* "build.xml"
|
||||
(("depends=\"jars,test-jar") "depends=\"jars"))
|
||||
(invoke "bash" "bootstrap.sh"
|
||||
(string-append "-Ddist.dir="
|
||||
(assoc-ref outputs "out")))))))))
|
||||
(native-inputs
|
||||
`(("jdk" ,icedtea-7 "jdk")
|
||||
("zip" ,zip)
|
||||
("unzip" ,unzip)))))
|
||||
|
||||
(define-public ant-apache-bcel
|
||||
(package
|
||||
(inherit ant/java8)
|
||||
(inherit ant)
|
||||
(name "ant-apache-bcel")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments ant/java8)
|
||||
(substitute-keyword-arguments (package-arguments ant)
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'unpack 'link-bcel
|
||||
@@ -2200,37 +2167,11 @@ build process and its dependencies, whereas Make uses Makefile format.")
|
||||
(delete-file-recursively bin)
|
||||
(delete-file-recursively lib))))))))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs ant/java8)
|
||||
(modify-inputs (package-inputs ant)
|
||||
(prepend java-commons-bcel)))))
|
||||
|
||||
(define-public ant-junit
|
||||
(package
|
||||
(inherit ant/java8)
|
||||
(name "ant-junit")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments ant/java8)
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'unpack 'link-junit
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(for-each (lambda (file)
|
||||
(symlink file
|
||||
(string-append "lib/optional/"
|
||||
(basename file))))
|
||||
(find-files (assoc-ref inputs "java-junit")
|
||||
"\\.jar$"))))
|
||||
(add-after 'build 'install
|
||||
(lambda _
|
||||
(let ((share (string-append #$output "/share/java"))
|
||||
(bin (string-append #$output "/bin"))
|
||||
(lib (string-append #$output "/lib")))
|
||||
(mkdir-p share)
|
||||
(install-file (string-append lib "/ant-junit.jar") share)
|
||||
(delete-file-recursively bin)
|
||||
(delete-file-recursively lib))))))))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs ant/java8)
|
||||
(prepend java-junit)))))
|
||||
(define-deprecated-package ant-junit
|
||||
ant)
|
||||
|
||||
(define-public libantlr3c
|
||||
(package
|
||||
@@ -3337,6 +3278,9 @@ is implemented.")
|
||||
`(;; Tests require junit
|
||||
#:tests? #f
|
||||
#:jar-name "qdox.jar"
|
||||
;; Explicitely use an ant version that includes the junit tasks, since
|
||||
;; it is a dependency of junit.
|
||||
#:ant ,ant/java7
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
@@ -3445,6 +3389,9 @@ documentation tools.")
|
||||
`(;; Tests require junit, which ultimately depends on this package.
|
||||
#:tests? #f
|
||||
#:build-target "jar"
|
||||
;; Explicitely use an ant version that includes the junit tasks, since
|
||||
;; it is a dependency of junit.
|
||||
#:ant ,ant/java7
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'do-not-use-bundled-asm
|
||||
@@ -3543,6 +3490,9 @@ testing frameworks, mocking libraries and UI validation rules.")
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; Tests require junit
|
||||
;; Explicitely use an ant version that includes the junit tasks, since
|
||||
;; it is a dependency of junit.
|
||||
#:ant ,ant/java7
|
||||
#:modules ((guix build ant-build-system)
|
||||
(guix build java-utils)
|
||||
(guix build utils)
|
||||
@@ -3628,6 +3578,9 @@ testing frameworks, mocking libraries and UI validation rules.")
|
||||
(native-inputs '())
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
;; Explicitely use an ant version that includes the junit tasks, since
|
||||
;; it is a dependency of junit.
|
||||
#:ant ,ant/java7
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
@@ -3669,7 +3622,7 @@ testing frameworks, mocking libraries and UI validation rules.")
|
||||
(define-public java-junit
|
||||
(package
|
||||
(name "java-junit")
|
||||
(version "4.12")
|
||||
(version "4.13.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -3678,7 +3631,7 @@ testing frameworks, mocking libraries and UI validation rules.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1j8avi91px1z8rjc89cfikwrvfifdmmsarwiyrcnr59ynvpz0v8h"))
|
||||
"1r7k4zzscc8019np3is3bzfigw8fxd6s3259cbhzzh02q6d5p9h3"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
@@ -3690,6 +3643,9 @@ testing frameworks, mocking libraries and UI validation rules.")
|
||||
`(#:jar-name "junit.jar"
|
||||
#:source-dir "src/main/java"
|
||||
#:test-dir "src/test"
|
||||
;; Explicitely use an ant version that includes the junit tasks, so
|
||||
;; we can run the tests.
|
||||
#:ant ,ant/java7
|
||||
#:test-exclude (list "**/SimpleTest.java" "**/StackTracesTest.java"
|
||||
"**/RuleChainTest.java" "**/TestWatchmanTest.java")
|
||||
#:phases
|
||||
@@ -3730,7 +3686,13 @@ sharing common test data, and test runners for running tests.")
|
||||
`(#:jar-name "junitparams.jar"
|
||||
#:source-dir "src/main/java"
|
||||
#:test-dir "src/test"
|
||||
#:test-exclude (list "**/SuperclassTest.java")))
|
||||
#:test-exclude (list
|
||||
;; Abstract class: no tests
|
||||
"**/SuperclassTest.java"
|
||||
;; Incompatible tests with junit 4.13.2
|
||||
"**/BeforeAfterClassTest.java"
|
||||
"**/FilterableTest.java"
|
||||
"**/RulesTest.java")))
|
||||
(inputs
|
||||
(list java-junit))
|
||||
(native-inputs
|
||||
@@ -5199,6 +5161,9 @@ complex transformations and code analysis tools.")
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
;; Explicitely use an ant version that includes the junit tasks, since
|
||||
;; it is a dependency of junit.
|
||||
#:ant ,ant/java7
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'unpack)
|
||||
@@ -5220,6 +5185,9 @@ including java-asm.")
|
||||
(properties '((hidden? . #t)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments java-asm)
|
||||
;; Explicitely use an ant version that includes the junit tasks, since
|
||||
;; it is a dependency of junit.
|
||||
((#:ant _ ant/java7) ant/java7)
|
||||
((#:tests? _) #f)))
|
||||
(native-inputs `())))
|
||||
|
||||
|
||||
@@ -488,7 +488,7 @@ with different rules and mechanics.")
|
||||
(define-public luanti-mineclonia
|
||||
(package
|
||||
(name "luanti-mineclonia")
|
||||
(version "0.120.1")
|
||||
(version "0.121.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -497,7 +497,7 @@ with different rules and mechanics.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"135xllkvdravry25y1f94wqn7nxb0pnrpn7xiagh2b5vjbajhdg4"))))
|
||||
"1c3x59iq04vfc0fa09z6g8davrr2vhdywppdbgyw64n7vk4f6br9"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
`(#:install-plan
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
|
||||
;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -20,98 +16,8 @@
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages nvi)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages dbm)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (guix utils))
|
||||
#:use-module (gnu packages text-editors)
|
||||
#:use-module (guix deprecation))
|
||||
|
||||
(define-public nvi
|
||||
(package
|
||||
(name "nvi")
|
||||
(version "1.81.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri ;; sites.google.coma/bostic.com/keithbostic/vi is stale.
|
||||
(string-append "http://harrier.slackbuilds.org/misc/nvi-" version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
|
||||
(patches (search-patches "nvi-assume-preserve-path.patch"
|
||||
"nvi-dbpagesize-binpower.patch"
|
||||
"nvi-add-function-prototypes.patch"
|
||||
"nvi-db4.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Create a wrapper for the configure script, make it executable.
|
||||
'(let ((conf-wrap (open-output-file "configure")))
|
||||
(display "#!/bin/sh" conf-wrap)
|
||||
(newline conf-wrap)
|
||||
(display
|
||||
"../nvi-1.81.6/dist/configure --srcdir=../nvi-1.81.6/dist $@"
|
||||
conf-wrap)
|
||||
(newline conf-wrap)
|
||||
(close-output-port conf-wrap)
|
||||
(chmod "configure" #o0755)
|
||||
|
||||
;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
|
||||
;; to the internal PTY allocation logic.
|
||||
(substitute* "ex/ex_script.c"
|
||||
(("#ifdef HAVE_SYS5_PTY")
|
||||
"#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))
|
||||
#t))))
|
||||
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:out-of-source? #t
|
||||
#:configure-flags
|
||||
#~'("--enable-widechar"
|
||||
#$@(if (%current-target-system)
|
||||
'("vi_cv_sprintf_count=yes")
|
||||
'()))
|
||||
#:make-flags
|
||||
#~(list
|
||||
;; Add CFLAGS to relax gcc-14's strictness.
|
||||
;; nvi's configure chokes on passing CFLAGS and ignores
|
||||
;; CFLAGS set in the environment.
|
||||
(string-append "CFLAGS=-g -O2"
|
||||
" -Wno-error=incompatible-pointer-types"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'configure 'fix-configure
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
;; Replace outdated config.sub and config.guess:
|
||||
(with-directory-excursion "dist"
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(chmod file #o755)
|
||||
(install-file
|
||||
(format #f "~a/share/automake-~a/~a"
|
||||
(assoc-ref (or native-inputs inputs)
|
||||
"automake")
|
||||
#$(version-major+minor
|
||||
(package-version automake))
|
||||
file)
|
||||
"."))
|
||||
'("config.sub" "config.guess"))))))))
|
||||
(inputs
|
||||
(list bdb ncurses))
|
||||
(native-inputs
|
||||
(list automake)) ;Up to date 'config.guess' and 'config.sub'.
|
||||
(synopsis "The Berkeley Vi Editor")
|
||||
(description
|
||||
"Vi is the original screen based text editor for Unix systems. It is
|
||||
considered the standard text editor, and is available on almost all Unix
|
||||
systems. Nvi is intended as a \"bug-for-bug compatible\" clone of the
|
||||
original BSD vi editor. As such, it doesn't have a lot of snazzy features as
|
||||
do some of the other vi clones such as elvis and vim. However, if all you
|
||||
want is vi, this is the one to get.")
|
||||
(home-page "https://sites.google.com/a/bostic.com/keithbostic/vi")
|
||||
(license bsd-3)))
|
||||
(define-deprecated/public-alias nvi
|
||||
(@ (gnu packages text-editors) nvi))
|
||||
|
||||
@@ -237,7 +237,7 @@ it.")
|
||||
(define-public trealla
|
||||
(package
|
||||
(name "trealla")
|
||||
(version "2.92.38")
|
||||
(version "2.92.41")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -246,7 +246,7 @@ it.")
|
||||
(url "https://github.com/trealla-prolog/trealla")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "12nv54j7rgh784lszgynw50k9h3la8b0d2si2bskfvydmpyk45pm"))
|
||||
(base32 "0ial37h0i9zjxgxvkai2vmaafn4djprliw0nzppnhwwy3jbcd14p"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
||||
@@ -1399,7 +1399,7 @@ defaults for 80% of the use cases.")
|
||||
(define-public forgejo-cli
|
||||
(package
|
||||
(name "forgejo-cli")
|
||||
(version "0.4.1")
|
||||
(version "0.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -1408,7 +1408,7 @@ defaults for 80% of the use cases.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1279cvdbgvl8yaqrxm8mg1swqn623xdfqjx13s9clrxp923zjrmm"))))
|
||||
(base32 "1x3v56my22lckrpkcnpmf90vrn8m45ysdn0k12dfssldr8cjxapa"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -410,6 +410,10 @@
|
||||
(crate-source "annotate-snippets" "0.12.11"
|
||||
"0whj5w2vwb9aqq61ymga0avpzqbl30jaggg3gjkjajpz902qbr0n"))
|
||||
|
||||
(define rust-annotate-snippets-0.12.15
|
||||
(crate-source "annotate-snippets" "0.12.15"
|
||||
"1xscyq9ss6xxldrkfnnpziqii6y9babd0wabz16yirwqkhzhlmwj"))
|
||||
|
||||
(define rust-annotate-snippets-0.6.1
|
||||
(crate-source "annotate-snippets" "0.6.1"
|
||||
"19x7ldklprdgf8pam8b3lfhrxqw5yldcvk5j0bw2agsajbj1q0n7"))
|
||||
@@ -5511,6 +5515,10 @@
|
||||
(crate-source "comrak" "0.39.1"
|
||||
"1xdw99s1a5nx11dwki667wkhddzplikcwwq7xpp3pz3i2yaspvrg"))
|
||||
|
||||
(define rust-comrak-0.52.0
|
||||
(crate-source "comrak" "0.52.0"
|
||||
"1hllxznr3qml847cn4a7msay1wpraxwvcr6npwpxb71ajdav5h5a"))
|
||||
|
||||
(define rust-concat-string-1.0.1
|
||||
(crate-source "concat-string" "1.0.1"
|
||||
"02c6hfxsvs1ff2j58f3qzr526w1yg8d2nf6yyjv81ixgbz5vwfbl"))
|
||||
@@ -9405,6 +9413,10 @@
|
||||
(crate-source "foreign-types-shared" "0.3.1"
|
||||
"0nykdvv41a3d4py61bylmlwjhhvdm0b3bcj9vxhqgxaxnp5ik6ma"))
|
||||
|
||||
(define rust-forgejo-api-0.10.0
|
||||
(crate-source "forgejo-api" "0.10.0"
|
||||
"0z9jq4r4qpcmpz5g7cmarzwrjr7ya782qj6bamcjywmx9s7s6mgq"))
|
||||
|
||||
(define rust-forgejo-api-0.4.1
|
||||
(crate-source "forgejo-api" "0.4.1"
|
||||
"0bc1m39g3i8mm70cf35hcqh898xpm2y4x819y8qfaaw6pnhg90pn"))
|
||||
@@ -15960,6 +15972,10 @@
|
||||
(crate-source "jemallocator" "0.5.4"
|
||||
"1g6k9ly6wxj53bp8lz9lg9nj4s662k6612jydw71aqwfkx53gpm0"))
|
||||
|
||||
(define rust-jetscii-0.5.3
|
||||
(crate-source "jetscii" "0.5.3"
|
||||
"0pppbawc1v6lshz6zi3d4bkz7xbalph9sd78a5299jd94kz45wa7"))
|
||||
|
||||
(define rust-jieba-rs-0.6.8
|
||||
(crate-source "jieba-rs" "0.6.8"
|
||||
"0glq71kil7hic6m3227w177nblwnqhxc6b9sdry8vb6kghsc3w4k"))
|
||||
@@ -17782,6 +17798,11 @@
|
||||
"1hdg7nqfjaygcqidyknldsva4i4zvirbgqc7j06c72m6w8llqbym"
|
||||
#:snippet '(for-each delete-file-recursively '("src/zlib" "src/zlib-ng"))))
|
||||
|
||||
(define rust-libz-sys-1.1.28
|
||||
(crate-source "libz-sys" "1.1.28"
|
||||
"08hyf9v85zifl3353xc7i5wr53v9b3scri856cmphl3gaxp24fpw"
|
||||
#:snippet '(for-each delete-file-recursively '("src/zlib" "src/zlib-ng"))))
|
||||
|
||||
(define rust-lifeguard-0.6.1
|
||||
(crate-source "lifeguard" "0.6.1"
|
||||
"09iwwy7888i1kfvbrgwpl4xv3pwsz1fbzx54djs3gnvmszdr9gl9"))
|
||||
@@ -21004,6 +21025,10 @@
|
||||
(crate-source "open" "5.3.3"
|
||||
"1g1403a17xfa136h6jshxkaa0yq2fh8sb404jycb369pzakp7fs3"))
|
||||
|
||||
(define rust-open-5.3.4
|
||||
(crate-source "open" "5.3.4"
|
||||
"1z9pbnc0lx1lqx1p74szfar7rv21shcggkjzyymmga19giqsnfwz"))
|
||||
|
||||
(define rust-opener-0.5.2
|
||||
(crate-source "opener" "0.5.2"
|
||||
"01ghahdn64lw4whj0p70vmzivrdlmca2629gplalq99pirkiag19"))
|
||||
@@ -21079,6 +21104,11 @@
|
||||
"1kwfn77qi342fr3hn1kxza6hslyma4ylszlcbg3a4vp1fln0074m"
|
||||
#:snippet '(delete-file-recursively "test")))
|
||||
|
||||
(define rust-openssl-0.10.77
|
||||
(crate-source "openssl" "0.10.77"
|
||||
"0zyqvaa85lvk77sn4jpgav8m5vjzdhyysh6ygpzpviqf6rp69r5z"
|
||||
#:snippet '(delete-file-recursively "test")))
|
||||
|
||||
(define rust-openssl-macros-0.1.0
|
||||
(crate-source "openssl-macros" "0.1.0"
|
||||
"0v3kgnzbadrf9c06q4cqmbjas53av73n5w7wwz3n0nb6257y80dm"))
|
||||
@@ -21183,8 +21213,22 @@
|
||||
;; Allow any version of bindgen.
|
||||
(("(bindgen = \\{ version =) \".*\"," _ bindgen)
|
||||
(string-append bindgen "\"*\",")))
|
||||
(copy-file "Cargo.toml.orig" "Cargo.toml")))
|
||||
)
|
||||
(copy-file "Cargo.toml.orig" "Cargo.toml"))))
|
||||
|
||||
(define rust-openssl-sys-0.9.113
|
||||
(crate-source "openssl-sys" "0.9.113"
|
||||
"0i765hvmis3mg1p3a88070ihaglghgrbzln6wibqf4a7p872qbxd"
|
||||
#:snippet
|
||||
#~(begin
|
||||
;; Remove dependency on boringssl and vendor openssl source.
|
||||
(substitute* "Cargo.toml.orig"
|
||||
(("vendored = .*") "vendored = []\n")
|
||||
((".*bssl.*") "")
|
||||
((".*openssl-src.*") "")
|
||||
;; Allow any version of bindgen.
|
||||
(("(bindgen = \\{ version =) \".*\"," _ bindgen)
|
||||
(string-append bindgen "\"*\",")))
|
||||
(copy-file "Cargo.toml.orig" "Cargo.toml"))))
|
||||
|
||||
(define rust-opentelemetry-0.17.0
|
||||
(crate-source "opentelemetry" "0.17.0"
|
||||
@@ -24527,6 +24571,10 @@
|
||||
(crate-source "rand_core" "0.10.0"
|
||||
"1flazfw1q1hbvadwzmaliplz0xnnjijdnbmzxnzdqplhfzb0z38c"))
|
||||
|
||||
(define rust-rand-core-0.10.1
|
||||
(crate-source "rand_core" "0.10.1"
|
||||
"0s9wiacxrr100icl7i41308gcj85nlcclrc5jx1jd6p10dhigf33"))
|
||||
|
||||
(define rust-rand-core-0.3.1
|
||||
(crate-source "rand_core" "0.3.1"
|
||||
"0jzdgszfa4bliigiy4hi66k7fs3gfwi2qxn8vik84ph77fwdwvvs"))
|
||||
@@ -26627,6 +26675,10 @@
|
||||
(crate-source "saphyr-parser" "0.0.6"
|
||||
"1xvadmva2dkvngglzv5wd8ji9yvwz4lfq9b3838qa6bbkysp3dsg"))
|
||||
|
||||
(define rust-saphyr-parser-bw-0.0.611
|
||||
(crate-source "saphyr-parser-bw" "0.0.611"
|
||||
"1qv9mbrzfl139kpja8rzn5ggqzs4zq1v6mkrjncdqxfv6g4c1pk7"))
|
||||
|
||||
(define rust-sapling-renderdag-0.1.0
|
||||
(crate-source "sapling-renderdag" "0.1.0"
|
||||
"0qbv8k698kiz8rpr63hn0m7g789pbmpmg7blql0hkgc7mffbizzd"))
|
||||
@@ -27586,6 +27638,10 @@
|
||||
(crate-source "serde_repr" "0.1.20"
|
||||
"1755gss3f6lwvv23pk7fhnjdkjw7609rcgjlr8vjg6791blf6php"))
|
||||
|
||||
(define rust-serde-saphyr-0.0.23
|
||||
(crate-source "serde-saphyr" "0.0.23"
|
||||
"054b1jq26cmwisjcrffxqlcxif20b7kcii60vwric6vslbkxzyq9"))
|
||||
|
||||
(define rust-serde-saphyr-0.0.7
|
||||
(crate-source "serde-saphyr" "0.0.7"
|
||||
"1plkh6siinnjs4nqsyk7bfdlcb2f7c5zd5bgax08fjdj0nasyxpx"))
|
||||
@@ -28820,6 +28876,10 @@
|
||||
(crate-source "ssh2-config" "0.5.4"
|
||||
"0sw698aaar25pici7xxdic36kxmnriy48zkd59h1yhgxfr191j17"))
|
||||
|
||||
(define rust-ssh2-config-0.7.0
|
||||
(crate-source "ssh2-config" "0.7.0"
|
||||
"173k7lvj2805z8v62k0810n2ksn0cny031q55bljf0b9afci7f2j"))
|
||||
|
||||
(define rust-ssri-9.2.0
|
||||
(crate-source "ssri" "9.2.0"
|
||||
"10lhj4z53v2mz0dk4wv2njf9zmzhbfdlw347835knsf95cy2nyns"))
|
||||
@@ -33332,6 +33392,10 @@
|
||||
(crate-source "uuid" "1.23.0"
|
||||
"1nbrzkdhwr4clshsks7flc2jq6lavjrsx65hyn63c9dd5vsbdj2s"))
|
||||
|
||||
(define rust-uuid-1.23.1
|
||||
(crate-source "uuid" "1.23.1"
|
||||
"0xlwg23rmsfl3gx98qsyzpl24pf4bs9wi3mqx5c6i319hyb4mmyx"))
|
||||
|
||||
(define rust-uuid-1.4.1
|
||||
(crate-source "uuid" "1.4.1"
|
||||
"17c68cmn8mgn3ll3zlyc7zsnvj5r281ybic9nd05r0j0aznsbnkr"))
|
||||
@@ -50785,7 +50849,9 @@
|
||||
rust-zerocopy-0.8.37
|
||||
rust-zerocopy-derive-0.8.37))
|
||||
(forgejo-cli =>
|
||||
(list rust-aho-corasick-1.1.4
|
||||
(list rust-ahash-0.8.12
|
||||
rust-aho-corasick-1.1.4
|
||||
rust-annotate-snippets-0.12.15
|
||||
rust-anstream-1.0.0
|
||||
rust-anstyle-1.0.14
|
||||
rust-anstyle-parse-1.0.0
|
||||
@@ -50798,46 +50864,53 @@
|
||||
rust-autocfg-1.5.0
|
||||
rust-base64-0.22.1
|
||||
rust-base64ct-1.8.3
|
||||
rust-bitflags-2.11.0
|
||||
rust-block-buffer-0.10.4
|
||||
rust-bitflags-2.11.1
|
||||
rust-block-buffer-0.12.0
|
||||
rust-bumpalo-3.20.2
|
||||
rust-bytes-1.11.1
|
||||
rust-caseless-0.2.2
|
||||
rust-cc-1.2.57
|
||||
rust-cc-1.2.60
|
||||
rust-cfg-if-1.0.4
|
||||
rust-clap-4.6.0
|
||||
rust-chacha20-0.10.0
|
||||
rust-clap-4.6.1
|
||||
rust-clap-builder-4.6.0
|
||||
rust-clap-complete-4.6.0
|
||||
rust-clap-derive-4.6.0
|
||||
rust-clap-complete-4.6.2
|
||||
rust-clap-derive-4.6.1
|
||||
rust-clap-lex-1.1.0
|
||||
rust-colorchoice-1.0.5
|
||||
rust-comrak-0.37.0
|
||||
rust-comrak-0.52.0
|
||||
rust-const-oid-0.10.2
|
||||
rust-convert-case-0.10.0
|
||||
rust-core-foundation-0.9.4
|
||||
rust-core-foundation-0.10.1
|
||||
rust-core-foundation-sys-0.8.7
|
||||
rust-cpufeatures-0.2.17
|
||||
rust-crossterm-0.28.1
|
||||
rust-cpufeatures-0.3.0
|
||||
rust-crossterm-0.29.0
|
||||
rust-crossterm-winapi-0.9.1
|
||||
rust-crypto-common-0.1.7
|
||||
rust-crypto-common-0.2.1
|
||||
rust-deranged-0.5.8
|
||||
rust-deunicode-1.6.2
|
||||
rust-digest-0.10.7
|
||||
rust-derive-more-2.1.1
|
||||
rust-derive-more-impl-2.1.1
|
||||
rust-digest-0.11.2
|
||||
rust-directories-6.0.0
|
||||
rust-dirs-6.0.0
|
||||
rust-dirs-sys-0.5.0
|
||||
rust-displaydoc-0.2.5
|
||||
rust-document-features-0.2.12
|
||||
rust-encoding-rs-0.8.35
|
||||
rust-encoding-rs-io-0.1.7
|
||||
rust-entities-1.0.1
|
||||
rust-equivalent-1.0.2
|
||||
rust-errno-0.3.14
|
||||
rust-eyre-0.6.12
|
||||
rust-fastrand-2.3.0
|
||||
rust-fastrand-2.4.1
|
||||
rust-find-msvc-tools-0.1.9
|
||||
rust-finl-unicode-1.4.0
|
||||
rust-fnv-1.0.7
|
||||
rust-foldhash-0.1.5
|
||||
rust-foreign-types-0.3.2
|
||||
rust-foreign-types-shared-0.1.1
|
||||
rust-forgejo-api-0.9.2
|
||||
rust-forgejo-api-0.10.0
|
||||
rust-form-urlencoded-1.2.2
|
||||
rust-futures-0.3.32
|
||||
rust-futures-channel-0.3.32
|
||||
@@ -50848,7 +50921,6 @@
|
||||
rust-futures-sink-0.3.32
|
||||
rust-futures-task-0.3.32
|
||||
rust-futures-util-0.3.32
|
||||
rust-generic-array-0.14.7
|
||||
rust-getrandom-0.2.17
|
||||
rust-getrandom-0.3.4
|
||||
rust-getrandom-0.4.2
|
||||
@@ -50856,85 +50928,87 @@
|
||||
rust-glob-0.3.3
|
||||
rust-h2-0.4.13
|
||||
rust-hashbrown-0.15.5
|
||||
rust-hashbrown-0.16.1
|
||||
rust-hashlink-0.10.0
|
||||
rust-hashbrown-0.17.0
|
||||
rust-heck-0.5.0
|
||||
rust-http-1.4.0
|
||||
rust-http-body-1.0.1
|
||||
rust-http-body-util-0.1.3
|
||||
rust-httparse-1.10.1
|
||||
rust-httpdate-1.0.3
|
||||
rust-hyper-1.8.1
|
||||
rust-hyper-rustls-0.27.7
|
||||
rust-hybrid-array-0.4.10
|
||||
rust-hyper-1.9.0
|
||||
rust-hyper-rustls-0.27.9
|
||||
rust-hyper-tls-0.6.0
|
||||
rust-hyper-util-0.1.20
|
||||
rust-icu-collections-2.1.1
|
||||
rust-icu-locale-core-2.1.1
|
||||
rust-icu-normalizer-2.1.1
|
||||
rust-icu-normalizer-data-2.1.1
|
||||
rust-icu-properties-2.1.2
|
||||
rust-icu-properties-data-2.1.2
|
||||
rust-icu-provider-2.1.1
|
||||
rust-icu-collections-2.2.0
|
||||
rust-icu-locale-core-2.2.0
|
||||
rust-icu-normalizer-2.2.0
|
||||
rust-icu-normalizer-data-2.2.0
|
||||
rust-icu-properties-2.2.0
|
||||
rust-icu-properties-data-2.2.0
|
||||
rust-icu-provider-2.2.0
|
||||
rust-id-arena-2.3.0
|
||||
rust-idna-1.1.0
|
||||
rust-idna-adapter-1.2.1
|
||||
rust-indenter-0.3.4
|
||||
rust-indexmap-2.13.0
|
||||
rust-indexmap-2.14.0
|
||||
rust-ipnet-2.12.0
|
||||
rust-iri-string-0.7.10
|
||||
rust-iri-string-0.7.12
|
||||
rust-is-docker-0.2.0
|
||||
rust-is-wsl-0.4.0
|
||||
rust-is-terminal-polyfill-1.70.2
|
||||
rust-itoa-1.0.18
|
||||
rust-jetscii-0.5.3
|
||||
rust-jobserver-0.1.34
|
||||
rust-js-sys-0.3.91
|
||||
rust-js-sys-0.3.95
|
||||
rust-leb128fmt-0.1.0
|
||||
rust-libc-0.2.183
|
||||
rust-libc-0.2.185
|
||||
rust-libgit2-sys-0.18.3+1.9.2
|
||||
rust-libredox-0.1.14
|
||||
rust-libredox-0.1.16
|
||||
rust-libssh2-sys-0.3.1
|
||||
rust-libz-sys-1.1.25
|
||||
rust-linux-raw-sys-0.4.15
|
||||
rust-libz-sys-1.1.28
|
||||
rust-linux-raw-sys-0.12.1
|
||||
rust-litemap-0.8.1
|
||||
rust-litemap-0.8.2
|
||||
rust-litrs-1.0.0
|
||||
rust-lock-api-0.4.14
|
||||
rust-log-0.4.29
|
||||
rust-memchr-2.8.0
|
||||
rust-mime-0.3.17
|
||||
rust-mime-guess-2.0.5
|
||||
rust-mio-1.1.1
|
||||
rust-mio-1.2.0
|
||||
rust-native-tls-0.2.18
|
||||
rust-nohash-hasher-0.2.0
|
||||
rust-num-conv-0.2.0
|
||||
rust-num-conv-0.2.1
|
||||
rust-num-traits-0.2.19
|
||||
rust-num-threads-0.1.7
|
||||
rust-once-cell-1.21.4
|
||||
rust-once-cell-polyfill-1.70.2
|
||||
rust-open-5.3.3
|
||||
rust-openssl-0.10.76
|
||||
rust-open-5.3.4
|
||||
rust-openssl-0.10.77
|
||||
rust-openssl-macros-0.1.1
|
||||
rust-openssl-probe-0.1.6
|
||||
rust-openssl-probe-0.2.1
|
||||
rust-openssl-sys-0.9.112
|
||||
rust-openssl-sys-0.9.113
|
||||
rust-option-ext-0.2.0
|
||||
rust-parking-lot-0.12.5
|
||||
rust-parking-lot-core-0.9.12
|
||||
rust-pathdiff-0.2.3
|
||||
rust-percent-encoding-2.3.2
|
||||
rust-phf-0.13.1
|
||||
rust-phf-codegen-0.13.1
|
||||
rust-phf-generator-0.13.1
|
||||
rust-phf-shared-0.13.1
|
||||
rust-pin-project-lite-0.2.17
|
||||
rust-pin-utils-0.1.0
|
||||
rust-pkg-config-0.3.32
|
||||
rust-potential-utf-0.1.4
|
||||
rust-pkg-config-0.3.33
|
||||
rust-potential-utf-0.1.5
|
||||
rust-powerfmt-0.2.0
|
||||
rust-ppv-lite86-0.2.21
|
||||
rust-prettyplease-0.2.37
|
||||
rust-proc-macro2-1.0.106
|
||||
rust-quote-1.0.45
|
||||
rust-r-efi-5.3.0
|
||||
rust-r-efi-6.0.0
|
||||
rust-rand-0.9.2
|
||||
rust-rand-chacha-0.9.0
|
||||
rust-rand-core-0.9.5
|
||||
rust-rand-0.10.1
|
||||
rust-rand-core-0.10.1
|
||||
rust-redox-syscall-0.5.18
|
||||
rust-redox-users-0.5.2
|
||||
rust-regex-1.12.3
|
||||
@@ -50942,37 +51016,37 @@
|
||||
rust-regex-syntax-0.8.10
|
||||
rust-reqwest-0.12.28
|
||||
rust-ring-0.17.14
|
||||
rust-rustix-0.38.44
|
||||
rust-rustc-hash-2.1.2
|
||||
rust-rustc-version-0.4.1
|
||||
rust-rustix-1.1.4
|
||||
rust-rustls-0.23.37
|
||||
rust-rustls-0.23.38
|
||||
rust-rustls-pki-types-1.14.0
|
||||
rust-rustls-webpki-0.103.10
|
||||
rust-rustls-webpki-0.103.12
|
||||
rust-rustversion-1.0.22
|
||||
rust-ryu-1.0.23
|
||||
rust-saphyr-parser-0.0.6
|
||||
rust-saphyr-parser-bw-0.0.611
|
||||
rust-schannel-0.1.29
|
||||
rust-scopeguard-1.2.0
|
||||
rust-security-framework-3.7.0
|
||||
rust-security-framework-sys-2.17.0
|
||||
rust-semver-1.0.27
|
||||
rust-semver-1.0.28
|
||||
rust-serde-1.0.228
|
||||
rust-serde-saphyr-0.0.7
|
||||
rust-serde-saphyr-0.0.23
|
||||
rust-serde-core-1.0.228
|
||||
rust-serde-derive-1.0.228
|
||||
rust-serde-json-1.0.149
|
||||
rust-serde-urlencoded-0.7.1
|
||||
rust-sha2-0.10.9
|
||||
rust-sha2-0.11.0
|
||||
rust-shlex-1.3.0
|
||||
rust-signal-hook-0.3.18
|
||||
rust-signal-hook-mio-0.2.5
|
||||
rust-signal-hook-registry-1.4.8
|
||||
rust-siphasher-1.0.2
|
||||
rust-slab-0.4.12
|
||||
rust-slug-0.1.6
|
||||
rust-smallvec-1.15.1
|
||||
rust-smallvec-2.0.0-alpha.12
|
||||
rust-socket2-0.6.3
|
||||
rust-soft-assert-0.1.1
|
||||
rust-ssh2-config-0.5.4
|
||||
rust-ssh2-config-0.7.0
|
||||
rust-stable-deref-trait-1.2.1
|
||||
rust-strsim-0.11.1
|
||||
rust-subtle-2.6.1
|
||||
@@ -50990,11 +51064,11 @@
|
||||
rust-time-0.3.47
|
||||
rust-time-core-0.1.8
|
||||
rust-time-macros-0.2.27
|
||||
rust-tinystr-0.8.2
|
||||
rust-tinystr-0.8.3
|
||||
rust-tinyvec-1.11.0
|
||||
rust-tinyvec-macros-0.1.1
|
||||
rust-tokio-1.50.0
|
||||
rust-tokio-macros-2.6.1
|
||||
rust-tokio-1.52.1
|
||||
rust-tokio-macros-2.7.0
|
||||
rust-tokio-native-tls-0.3.1
|
||||
rust-tokio-rustls-0.26.4
|
||||
rust-tokio-util-0.7.18
|
||||
@@ -51006,33 +51080,34 @@
|
||||
rust-tracing-core-0.1.36
|
||||
rust-try-lock-0.2.5
|
||||
rust-typed-arena-2.0.2
|
||||
rust-typenum-1.19.0
|
||||
rust-typenum-1.20.0
|
||||
rust-unicase-2.9.0
|
||||
rust-unicode-ident-1.0.24
|
||||
rust-unicode-normalization-0.1.25
|
||||
rust-unicode-segmentation-1.13.2
|
||||
rust-unicode-width-0.2.2
|
||||
rust-unicode-xid-0.2.6
|
||||
rust-unicode-categories-0.1.1
|
||||
rust-untrusted-0.9.0
|
||||
rust-url-2.5.8
|
||||
rust-urlencoding-2.1.3
|
||||
rust-utf8-iter-1.0.4
|
||||
rust-utf8parse-0.2.2
|
||||
rust-uuid-1.22.0
|
||||
rust-uuid-1.23.1
|
||||
rust-vcpkg-0.2.15
|
||||
rust-version-check-0.9.5
|
||||
rust-want-0.3.1
|
||||
rust-wasi-0.11.1+wasi-snapshot-preview1
|
||||
rust-wasip2-1.0.2+wasi-0.2.9
|
||||
rust-wasip2-1.0.3+wasi-0.2.9
|
||||
rust-wasip3-0.4.0+wasi-0.3.0-rc-2026-01-06
|
||||
rust-wasm-bindgen-0.2.114
|
||||
rust-wasm-bindgen-futures-0.4.64
|
||||
rust-wasm-bindgen-macro-0.2.114
|
||||
rust-wasm-bindgen-macro-support-0.2.114
|
||||
rust-wasm-bindgen-shared-0.2.114
|
||||
rust-wasm-bindgen-0.2.118
|
||||
rust-wasm-bindgen-futures-0.4.68
|
||||
rust-wasm-bindgen-macro-0.2.118
|
||||
rust-wasm-bindgen-macro-support-0.2.118
|
||||
rust-wasm-bindgen-shared-0.2.118
|
||||
rust-wasm-encoder-0.244.0
|
||||
rust-wasm-metadata-0.244.0
|
||||
rust-wasmparser-0.244.0
|
||||
rust-web-sys-0.3.91
|
||||
rust-web-sys-0.3.95
|
||||
rust-wildmatch-2.6.1
|
||||
rust-winapi-0.3.9
|
||||
rust-winapi-i686-pc-windows-gnu-0.4.0
|
||||
@@ -51042,7 +51117,6 @@
|
||||
rust-windows-result-0.4.1
|
||||
rust-windows-strings-0.5.1
|
||||
rust-windows-sys-0.52.0
|
||||
rust-windows-sys-0.59.0
|
||||
rust-windows-sys-0.61.2
|
||||
rust-windows-targets-0.52.6
|
||||
rust-windows-aarch64-gnullvm-0.52.6
|
||||
@@ -51054,22 +51128,23 @@
|
||||
rust-windows-x86-64-gnullvm-0.52.6
|
||||
rust-windows-x86-64-msvc-0.52.6
|
||||
rust-wit-bindgen-0.51.0
|
||||
rust-wit-bindgen-0.57.1
|
||||
rust-wit-bindgen-core-0.51.0
|
||||
rust-wit-bindgen-rust-0.51.0
|
||||
rust-wit-bindgen-rust-macro-0.51.0
|
||||
rust-wit-component-0.244.0
|
||||
rust-wit-parser-0.244.0
|
||||
rust-writeable-0.6.2
|
||||
rust-yoke-0.8.1
|
||||
rust-yoke-derive-0.8.1
|
||||
rust-zerocopy-0.8.47
|
||||
rust-zerocopy-derive-0.8.47
|
||||
rust-zerofrom-0.1.6
|
||||
rust-zerofrom-derive-0.1.6
|
||||
rust-writeable-0.6.3
|
||||
rust-yoke-0.8.2
|
||||
rust-yoke-derive-0.8.2
|
||||
rust-zerocopy-0.8.48
|
||||
rust-zerocopy-derive-0.8.48
|
||||
rust-zerofrom-0.1.7
|
||||
rust-zerofrom-derive-0.1.7
|
||||
rust-zeroize-1.8.2
|
||||
rust-zerotrie-0.2.3
|
||||
rust-zerovec-0.11.5
|
||||
rust-zerovec-derive-0.11.2
|
||||
rust-zerotrie-0.2.4
|
||||
rust-zerovec-0.11.6
|
||||
rust-zerovec-derive-0.11.3
|
||||
rust-zmij-1.0.21))
|
||||
(fragments =>
|
||||
(list rust-aes-0.8.4
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
|
||||
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
|
||||
;;; Copyright © 2015-2022, 2025 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
|
||||
;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
|
||||
@@ -42,6 +43,7 @@
|
||||
;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
|
||||
;;; Copyright © 2025 Junker <dk@junkeria.club>
|
||||
;;; Copyright © 2025 benjamin wil <hey@benjaminwil.info>
|
||||
;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2026 Ignatius Menzies <ignatius.menzies@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
@@ -92,6 +94,7 @@
|
||||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages datastructures)
|
||||
#:use-module (gnu packages dbm)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages enchant)
|
||||
#:use-module (gnu packages fontutils)
|
||||
@@ -987,6 +990,90 @@ justifying, auto-indentation, bracket matching, interactive search-and-replace
|
||||
(with regular expressions), and the editing of multiple files.")
|
||||
(license license:gpl3+))) ; some files are under GPLv2+
|
||||
|
||||
(define-public nvi
|
||||
(package
|
||||
(name "nvi")
|
||||
(version "1.81.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
;; The home-page does not provide the latest version.
|
||||
(uri (string-append "http://harrier.slackbuilds.org/misc/nvi-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
|
||||
(patches (search-patches "nvi-assume-preserve-path.patch"
|
||||
"nvi-dbpagesize-binpower.patch"
|
||||
"nvi-add-function-prototypes.patch"
|
||||
"nvi-db4.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Create a wrapper for the configure script, make it executable.
|
||||
#~(let ((conf-wrap (open-output-file "configure")))
|
||||
(display "#!/bin/sh" conf-wrap)
|
||||
(newline conf-wrap)
|
||||
(display
|
||||
"../nvi-1.81.6/dist/configure --srcdir=../nvi-1.81.6/dist $@"
|
||||
conf-wrap)
|
||||
(newline conf-wrap)
|
||||
(close-output-port conf-wrap)
|
||||
(chmod "configure" #o0755)
|
||||
|
||||
;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
|
||||
;; to the internal PTY allocation logic.
|
||||
(substitute* "ex/ex_script.c"
|
||||
(("#ifdef HAVE_SYS5_PTY")
|
||||
"#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:out-of-source? #t
|
||||
#:configure-flags
|
||||
#~'("--enable-widechar"
|
||||
#$@(if (%current-target-system)
|
||||
'("vi_cv_sprintf_count=yes")
|
||||
'()))
|
||||
#:make-flags
|
||||
#~(list
|
||||
;; Add CFLAGS to relax gcc-14's strictness.
|
||||
;; nvi's configure chokes on passing CFLAGS and ignores
|
||||
;; CFLAGS set in the environment.
|
||||
(string-append "CFLAGS=-g -O2"
|
||||
" -Wno-error=incompatible-pointer-types"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'configure 'fix-configure
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
;; Replace outdated config.sub and config.guess:
|
||||
(with-directory-excursion "dist"
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(chmod file #o755)
|
||||
(install-file
|
||||
(format #f "~a/share/automake-~a/~a"
|
||||
(assoc-ref (or native-inputs inputs)
|
||||
"automake")
|
||||
#$(version-major+minor
|
||||
(package-version automake))
|
||||
file)
|
||||
"."))
|
||||
'("config.sub" "config.guess"))))))))
|
||||
(inputs (list bdb ncurses))
|
||||
(native-inputs
|
||||
(list automake)) ;Up to date 'config.guess' and 'config.sub'.
|
||||
(synopsis "The Berkeley Vi Editor")
|
||||
(description
|
||||
"Vi is the original screen based text editor for Unix systems. It
|
||||
is considered the standard text editor, and is available on almost all
|
||||
Unix systems. Nvi is intended as a \"bug-for-bug compatible\" clone of
|
||||
the original BSD vi editor. As such, it doesn't have a lot of snazzy
|
||||
features as do some of the other vi clones such as elvis and vim.
|
||||
However, if all you want is vi, this is the one to get.")
|
||||
(home-page
|
||||
(string-append "https://sites.google.com/a/bostic.com/keithbostic/"
|
||||
"the-berkeley-vi-editor-home-page"))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public qemacs
|
||||
(package
|
||||
(name "qemacs")
|
||||
|
||||
@@ -4535,7 +4535,7 @@ read and write, and compatible with JSON.")
|
||||
(define-public labwc
|
||||
(package
|
||||
(name "labwc")
|
||||
(version "0.9.6")
|
||||
(version "0.9.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -4544,7 +4544,7 @@ read and write, and compatible with JSON.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0v8gv539jl8qnzjh9d91gpk03gn1xkc8i8xl33gs9k2x46fx1jyy"))))
|
||||
"12mm4w9djgh7q30lswhl1q1cxf6h0pf8xr744jkcyjcqqsavynpf"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config gettext-minimal scdoc))
|
||||
|
||||
@@ -62,7 +62,6 @@
|
||||
#:use-module (gnu packages less)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages nvi)
|
||||
#:use-module (gnu packages package-management)
|
||||
#:use-module (gnu packages pciutils)
|
||||
#:use-module (gnu packages texinfo)
|
||||
|
||||
Reference in New Issue
Block a user