From 90181a4a3dae38cff9e138dda0f90636e72a3367 Mon Sep 17 00:00:00 2001
From: Jim Garrison <jim@garrison.cc>
Date: Sun, 18 Jan 2015 22:34:40 -0800
Subject: [PATCH] Don't overspecify the julia version
This is to bring the julia version information into accordance with
section 7.3.2 of the nixpkgs manual:
The version in the filename should leave out unnecessary detail.
For instance, if we keep the latest Firefox 2.0.x and 3.5.x
versions in Nixpkgs, they should be named firefox/2.0.nix and
firefox/3.5.nix, respectively (which, at a given point, might
contain versions 2.0.0.20 and 3.5.4).
Julia uses semantic versioning (http://semver.org), so the third
digit (the patch level) represents backwards-compatible bug fixes
only.
---
pkgs/development/compilers/julia/{0.2.1.nix => 0.2.nix} | 0
pkgs/development/compilers/julia/{0.3.5.nix => 0.3.nix} | 0
pkgs/top-level/all-packages.nix | 8 ++++----
3 files changed, 4 insertions(+), 4 deletions(-)
rename pkgs/development/compilers/julia/{0.2.1.nix => 0.2.nix} (100%)
rename pkgs/development/compilers/julia/{0.3.5.nix => 0.3.nix} (100%)
diff --git a/pkgs/development/compilers/julia/0.2.1.nix b/pkgs/development/compilers/julia/0.2.nix
similarity index 100%
rename from pkgs/development/compilers/julia/0.2.1.nix
rename to pkgs/development/compilers/julia/0.2.nix
diff --git a/pkgs/development/compilers/julia/0.3.5.nix b/pkgs/development/compilers/julia/0.3.nix
similarity index 100%
rename from pkgs/development/compilers/julia/0.3.5.nix
rename to pkgs/development/compilers/julia/0.3.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bcb526f3aeb..6cb0a4596bc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3572,23 +3572,23 @@ let
jikes = callPackage ../development/compilers/jikes { };
- julia021 = callPackage ../development/compilers/julia/0.2.1.nix {
+ julia02 = callPackage ../development/compilers/julia/0.2.nix {
liblapack = liblapack.override {shared = true;};
llvm = llvm_33;
openblas = openblas_0_2_2;
suitesparse = suitesparse_4_2;
};
- julia035 = let
+ julia03 = let
liblapack = liblapack_3_5_0.override {shared = true;};
- in callPackage ../development/compilers/julia/0.3.5.nix {
+ in callPackage ../development/compilers/julia/0.3.nix {
inherit liblapack;
suitesparse = suitesparse_4_2.override {
inherit liblapack;
};
llvm = llvm_33;
};
- julia = julia035;
+ julia = julia03;
lazarus = callPackage ../development/compilers/fpc/lazarus.nix {
fpc = fpc;