From 699e081a6007e2552dc6c8fe8d2150cbf6fe7e1a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 4 Oct 2019 20:19:34 +0200
Subject: [PATCH 1/2] Revert "nodejs-11_x: remove"

This reverts commit 3a12434b93f0360e924621be590675dabc5977cf.

The commit broke eval since the removed attribute is still in use.
---
 nixos/doc/manual/release-notes/rl-1909.xml             |  5 -----
 .../applications/version-management/sourcehut/core.nix |  6 +++---
 pkgs/development/web/nodejs/v11.nix                    | 10 ++++++++++
 pkgs/top-level/all-packages.nix                        |  4 ++++
 4 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/web/nodejs/v11.nix

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 79f8edcc81a5..c93d5706de4d 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -930,11 +930,6 @@
        Please use the fork <literal>cawbird</literal> instead which has been adapted to the API changes and is still maintained.
      </para>
    </listitem>
-   <listitem>
-     <para>
-      The <literal>nodejs-11_x</literal> package has been removed as it's EOLed by upstream.
-     </para>
-   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index 4b12d66a3a2d..f20ede9db05d 100644
--- a/pkgs/applications/version-management/sourcehut/core.nix
+++ b/pkgs/applications/version-management/sourcehut/core.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, fetchNodeModules, buildPythonPackage
 , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests
 , sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic
-, sassc, nodejs
+, sassc, nodejs-11_x
 , writeText }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   node_modules = fetchNodeModules {
     src = "${src}/srht";
-    nodejs = nodejs;
+    nodejs = nodejs-11_x;
     sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p";
   };
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     sassc
-    nodejs
+    nodejs-11_x
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix
new file mode 100644
index 000000000000..7b60a3772d3c
--- /dev/null
+++ b/pkgs/development/web/nodejs/v11.nix
@@ -0,0 +1,10 @@
+{ callPackage, openssl, enableNpm ? true }:
+
+let
+  buildNodejs = callPackage ./nodejs.nix { inherit openssl; };
+in
+  buildNodejs {
+    inherit enableNpm;
+    version = "11.15.0";
+    sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76";
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f96c3532d68..c7dd797324ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4412,6 +4412,10 @@ in
   nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
     enableNpm = false;
   };
+  nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { };
+  nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix {
+    enableNpm = false;
+  };
   nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { };
   nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
     enableNpm = false;

From 28e8f30daecb8cf48dc95de36011378e76daa0fd Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 23 Sep 2019 15:13:39 +0200
Subject: [PATCH 2/2] sage: add pager to environment

Temporary fixup while waiting for an upstream fix.

(cherry picked from commit cbe12344ca9315ee10fd0f7749561840921f1a00)
---
 pkgs/applications/science/math/sage/sage-env.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 8fd69f62171a..0b67b3cff12b 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -44,6 +44,7 @@
 , gsl
 , ntl
 , jdk
+, less
 }:
 
 # This generates a `sage-env` shell file that will be sourced by sage on startup.
@@ -92,6 +93,7 @@ let
     rubiks
     flintqs
     jdk # only needed for `jmol` which may be replaced in the future
+    less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
   ]
   ));
 in