Commit graph

2 commits

Author SHA1 Message Date
Vladimír Čunát dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Jim Garrison 90181a4a3d 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.
2015-01-19 09:35:18 -08:00
Renamed from pkgs/development/compilers/julia/0.2.1.nix (Browse further)