summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-03-04 21:50:20 +0100
committerPeter Simons <simons@cryp.to>2017-03-07 14:56:46 +0100
commitf4595fa555333e576682e61da84a56de5df73d3c (patch)
treee118b4f89808a0aa43a95a15070ba0298d170221
parent3dc4e12ff05fa885ee06c2e6024aca9b6ae5e471 (diff)
downloadnixpkgs-f4595fa555333e576682e61da84a56de5df73d3c.tar
nixpkgs-f4595fa555333e576682e61da84a56de5df73d3c.tar.gz
nixpkgs-f4595fa555333e576682e61da84a56de5df73d3c.tar.bz2
nixpkgs-f4595fa555333e576682e61da84a56de5df73d3c.tar.lz
nixpkgs-f4595fa555333e576682e61da84a56de5df73d3c.tar.xz
nixpkgs-f4595fa555333e576682e61da84a56de5df73d3c.tar.zst
nixpkgs-f4595fa555333e576682e61da84a56de5df73d3c.zip
r-modules: drop broken irkernel package set
We can no longer update that package set since, apparently, it has moved
to a different packaging scheme.
-rw-r--r--pkgs/development/r-modules/README.md3
-rw-r--r--pkgs/development/r-modules/default.nix9
-rwxr-xr-xpkgs/development/r-modules/generate-r-packages.R1
-rw-r--r--pkgs/development/r-modules/irkernel-packages.nix13
4 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index 0d9c1490d2b..5aa839b3b5a 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -94,9 +94,6 @@ mv cran-packages.nix.new cran-packages.nix
 
 Rscript generate-r-packages.R bioc  > bioc-packages.nix.new
 mv bioc-packages.nix.new bioc-packages.nix
-
-Rscript generate-r-packages.R irkernel  > irkernel-packages.nix.new
-mv irkernel-packages.nix.new irkernel-packages.nix
 ```
 
 `generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefor the renaming.
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index c37acf1076f..05016c326ef 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -38,7 +38,7 @@ let
     meta.broken = broken;
   });
 
-  # Templates for generating Bioconductor, CRAN and IRkernel packages
+  # Templates for generating Bioconductor and CRAN packages
   # from the name, version, sha256, and optional per-package arguments above
   #
   deriveBioc = mkDerive {
@@ -57,10 +57,6 @@ let
     mkHomepage = {name, snapshot}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/";
     mkUrls = {name, version, snapshot}: [ "http://mran.revolutionanalytics.com/snapshot/${snapshot}/src/contrib/${name}_${version}.tar.gz" ];
   };
-  deriveIRkernel = mkDerive {
-    mkHomepage = {name}: "https://irkernel.github.io/";
-    mkUrls = {name, version}: [ "http://irkernel.github.io/src/contrib/${name}_${version}.tar.gz" ];
-  };
 
   # Overrides package definitions with nativeBuildInputs.
   # For example,
@@ -222,8 +218,7 @@ let
   _self = import ./bioc-packages.nix { inherit self; derive = deriveBioc; } //
           import ./bioc-annotation-packages.nix { inherit self; derive = deriveBiocAnn; } //
           import ./bioc-experiment-packages.nix { inherit self; derive = deriveBiocExp; } //
-          import ./cran-packages.nix { inherit self; derive = deriveCran; } //
-          import ./irkernel-packages.nix { inherit self; derive = deriveIRkernel; };
+          import ./cran-packages.nix { inherit self; derive = deriveCran; };
 
   # tweaks for the individual packages and "in self" follow
 
diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R
index 9aec419c0f8..8dc3a50abec 100755
--- a/pkgs/development/r-modules/generate-r-packages.R
+++ b/pkgs/development/r-modules/generate-r-packages.R
@@ -10,7 +10,6 @@ mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/pa
                   , "bioc-annotation"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/annotation/src/contrib/")
                   , "bioc-experiment"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/experiment/src/contrib/")
                   , cran=paste0("http://mran.revolutionanalytics.com/snapshot/", snapshotDate, "/src/contrib/")
-                  , irkernel="http://irkernel.github.io/src/contrib/"
                   )
 
 mirrorType <- commandArgs(trailingOnly=TRUE)[1]
diff --git a/pkgs/development/r-modules/irkernel-packages.nix b/pkgs/development/r-modules/irkernel-packages.nix
deleted file mode 100644
index cef0af62e4f..00000000000
--- a/pkgs/development/r-modules/irkernel-packages.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is generated from generate-r-packages.R. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# Rscript generate-r-packages.R irkernel >new && mv new irkernel-packages.nix
-
-{ self, derive }:
-let derive2 = derive {};
-in with self; {
-  IRdisplay = derive2 { name="IRdisplay"; version="0.3"; sha256="0aa7v3x6s9jd5kzwfh4659gm3dqkmadbk40a0jdpm856mf9r5w6s"; depends=[base64enc repr]; };
-  IRkernel = derive2 { name="IRkernel"; version="0.5"; sha256="0v9f01j1ysadq2f8d4mpbimrspj7051cncl0rd1n97rb8wlb9rrf"; depends=[digest evaluate IRdisplay jsonlite repr rzmq uuid]; };
-  repr = derive2 { name="repr"; version="0.4"; sha256="1mhvslkxr5nkxiijapzm29jpmjnhhjs1v9s84xvhqpxlcav8dsn6"; depends=[]; };
-  rzmq = derive2 { name="rzmq"; version="0.7.7"; sha256="0cds9wsbfb7lhgfjjfisv1i3905ny7x3i2wbb1rcih03ba4a1ij3"; depends=[]; };
-}