Commit b297018d authored by Elana Hashman's avatar Elana Hashman

Remove outdated patches

Rebase existing patches
parent 820d328c
......@@ -7,10 +7,10 @@ Subject: Build in offline mode with local repo
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/project.clj b/project.clj
index fc32d11..606d727 100644
index 45886f6..478409c 100644
--- a/project.clj
+++ b/project.clj
@@ -36,4 +36,6 @@
@@ -38,4 +38,6 @@
:offline (comp (partial not-any? identity)
(juxt :online :disabled))}
:source-paths ["leiningen-core/src" "src"]
......
......@@ -7,7 +7,7 @@ Subject: Update LEIN_JAR location to match installed jar
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/lein-pkg b/bin/lein-pkg
index 6f06ff9..de113fc 100644
index 8f33656..2bcdb05 100644
--- a/bin/lein-pkg
+++ b/bin/lein-pkg
@@ -43,7 +43,7 @@ LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-'-Xms64m -Xmx512m'}"
......
From: Elana Hashman <ehashman@debian.org>
Date: Thu, 21 Dec 2017 02:46:56 +0000
Date: Sun, 10 Feb 2019 18:24:53 +0000
Subject: Fix source directory in POM
---
leiningen-core/pom.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
leiningen-core/pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/leiningen-core/pom.xml b/leiningen-core/pom.xml
index eb05418..c82775e 100644
--- a/leiningen-core/pom.xml
+++ b/leiningen-core/pom.xml
@@ -19,13 +19,15 @@
<url/>
Index: leiningen-clojure/leiningen-core/pom.xml
===================================================================
--- leiningen-clojure.orig/leiningen-core/pom.xml
+++ leiningen-clojure/leiningen-core/pom.xml
@@ -17,10 +17,12 @@
<tag>9791484a9be46005c39cf3e51be44cad497b5586</tag>
</scm>
<build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<resources>
+ <resource>
<resource>
+ <directory>src</directory>
+ </resource>
<resource>
+ <resource>
<directory>resources</directory>
</resource>
</resources>
+ <testSourceDirectory>test</testSourceDirectory>
<testResources>
<testResource>
<directory>resources</directory>
From: Elana Hashman <ehashman@debian.org>
Date: Sun, 11 Feb 2018 16:16:45 -0500
Subject: Bump commons-io version
---
project.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project.clj b/project.clj
index 606d727..488f292 100644
--- a/project.clj
+++ b/project.clj
@@ -23,7 +23,7 @@
;; bump versions of various common transitive deps
[net.cgrand/parsley "0.9.3" :exclusions [org.clojure/clojure]]
[scout "0.1.1"]
- [commons-io "2.5"]]
+ [commons-io "2.6"]]
;; checkout-deps don't work with :eval-in :leiningen
:profiles {:dev {:resource-paths ["leiningen-core/dev-resources"]
:test-paths ["leiningen-core/test"]}
From: Elana Hashman <ehashman@debian.org>
Date: Sat, 14 Apr 2018 01:42:23 +0000
Subject: Make run script use Java 8
---
bin/lein-pkg | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/lein-pkg b/bin/lein-pkg
index de113fc..da662da 100644
--- a/bin/lein-pkg
+++ b/bin/lein-pkg
@@ -27,7 +27,10 @@ export LEIN_HOME="${LEIN_HOME:-"$HOME/.lein"}"
# Support $JAVA_OPTS for backwards-compatibility.
JVM_OPTS=${JVM_OPTS:-"$JAVA_OPTS"}
-JAVA_CMD=${JAVA_CMD:-"java"}
+
+# NOTE(Debian): Force Java 8 usage for performance and compatibility
+# See https://salsa.debian.org/clojure-team/leiningen-clojure/issues/1
+JAVA_CMD=${JAVA_CMD:-"/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin/java"}
for f in "/etc/leinrc" "$LEIN_HOME/leinrc" ".leinrc"; do
if [ -e "$f" ]; then
From: Elana Hashman <ehashman@debian.org>
Date: Sun, 24 Jun 2018 15:30:05 -0400
Subject: Upgrade clojure.tools.nrepl
---
leiningen-core/src/leiningen/core/project.clj | 2 +-
project.clj | 2 +-
resources/leiningen/bootclasspath-deps.clj | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj
index c27e361..1f30d8e 100644
--- a/leiningen-core/src/leiningen/core/project.clj
+++ b/leiningen-core/src/leiningen/core/project.clj
@@ -537,7 +537,7 @@
:test-selectors {:default (with-meta '(constantly true)
{:displace true})}
;; bump deps in leiningen's own project.clj with these
- :dependencies '[^:displace [org.clojure/tools.nrepl "0.2.12"
+ :dependencies '[^:displace [org.clojure/tools.nrepl "0.2.13"
:exclusions [org.clojure/clojure]]
^:displace [clojure-complete "0.2.4"
:exclusions [org.clojure/clojure]]]
diff --git a/project.clj b/project.clj
index 488f292..5352131 100644
--- a/project.clj
+++ b/project.clj
@@ -17,7 +17,7 @@
;; needed for uberjar
[commons-lang "2.6"]
;; needed for repl
- [org.clojure/tools.nrepl "0.2.12"]
+ [org.clojure/tools.nrepl "0.2.13"]
;; needed for change
[net.cgrand/sjacket "0.1.1" :exclusions [org.clojure/clojure]]
;; bump versions of various common transitive deps
diff --git a/resources/leiningen/bootclasspath-deps.clj b/resources/leiningen/bootclasspath-deps.clj
index 88034c5..527048a 100644
--- a/resources/leiningen/bootclasspath-deps.clj
+++ b/resources/leiningen/bootclasspath-deps.clj
@@ -54,7 +54,7 @@
org.apache.maven/maven-resolver-provider "3.5.0"
org.clojure/data.xml "0.0.8"
org.clojure/tools.macro "0.1.5"
- org.clojure/tools.nrepl "0.2.12"
+ org.clojure/tools.nrepl "0.2.13"
org.codehaus.plexus/plexus-component-annotations "1.7.1"
org.codehaus.plexus/plexus-interpolation "1.24"
org.codehaus.plexus/plexus-utils "3.0.24"
From: xtreak <tir.karthi@gmail.com>
Date: Mon, 5 Feb 2018 06:25:27 +0000
Subject: Bump version of reply and clojure-complete
---
leiningen-core/src/leiningen/core/project.clj | 2 +-
leiningen-core/test/leiningen/core/test/project.clj | 2 +-
resources/leiningen/bootclasspath-deps.clj | 2 +-
src/leiningen/repl.clj | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj
index 1f30d8e..f25bb13 100644
--- a/leiningen-core/src/leiningen/core/project.clj
+++ b/leiningen-core/src/leiningen/core/project.clj
@@ -539,7 +539,7 @@
;; bump deps in leiningen's own project.clj with these
:dependencies '[^:displace [org.clojure/tools.nrepl "0.2.13"
:exclusions [org.clojure/clojure]]
- ^:displace [clojure-complete "0.2.4"
+ ^:displace [clojure-complete "0.2.5"
:exclusions [org.clojure/clojure]]]
:checkout-deps-shares [:source-paths
:test-paths
diff --git a/leiningen-core/test/leiningen/core/test/project.clj b/leiningen-core/test/leiningen/core/test/project.clj
index 27d2131..dc80b8a 100755
--- a/leiningen-core/test/leiningen/core/test/project.clj
+++ b/leiningen-core/test/leiningen/core/test/project.clj
@@ -45,7 +45,7 @@
[clj-http/clj-http "3.4.1"]
[org.clojure/tools.nrepl "0.2.12"
:exclusions [[org.clojure/clojure]]]
- [clojure-complete/clojure-complete "0.2.4"
+ [clojure-complete/clojure-complete "0.2.5"
:exclusions [[org.clojure/clojure]]]],
:twelve 12 ; testing unquote
diff --git a/resources/leiningen/bootclasspath-deps.clj b/resources/leiningen/bootclasspath-deps.clj
index 527048a..2cad1ee 100644
--- a/resources/leiningen/bootclasspath-deps.clj
+++ b/resources/leiningen/bootclasspath-deps.clj
@@ -21,7 +21,7 @@
(pp/pprint))))
{
bultitude "0.2.8"
- clojure-complete "0.2.4"
+ clojure-complete "0.2.5"
com.cemerick/pomegranate "0.4.0-alpha1"
com.google.guava/guava "20.0"
com.hypirion/io "0.3.1"
diff --git a/src/leiningen/repl.clj b/src/leiningen/repl.clj
index 8f6dc6c..314ec1c 100644
--- a/src/leiningen/repl.clj
+++ b/src/leiningen/repl.clj
@@ -198,9 +198,9 @@
(def reply-profile
{:dependencies
- '[^:displace [reply "0.3.7"
+ '[^:displace [reply "0.3.8"
:exclusions [org.clojure/clojure ring/ring-core]]
- [clojure-complete "0.2.4"]]})
+ [clojure-complete "0.2.5"]]})
(defn- trampoline-repl [project port]
(let [init-option (get-in project [:repl-options :init])
0001-Build-in-offline-mode-with-local-repo.patch
0002-Fix-source-directory-in-POM.patch
0003-Update-LEIN_JAR-location-to-match-installed-jar.patch
0004-Bump-commons-io-version.patch
0005-Make-run-script-use-Java-8.patch
0006-Upgrade-clojure.tools.nrepl.patch
0007-Bump-version-of-reply-and-clojure-complete.patch
0002-Update-LEIN_JAR-location-to-match-installed-jar.patch
0003-Fix-source-directory-in-POM.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment