diff --git a/pkgs/development/compilers/factor-lang/0.100.nix b/pkgs/development/compilers/factor-lang/0.100.nix new file mode 100644 index 000000000000..64751dad76a9 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/0.100.nix @@ -0,0 +1,9 @@ +{ callPackage, fetchurl }: + +callPackage ./unwrapped.nix (rec { + version = "0.100"; + src = fetchurl { + url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; + hash = "sha256-ei1x6mgEoDVe1mKfoWSGC9RgZCONovAPYfIdAlOGi+0="; + }; +}) diff --git a/pkgs/development/compilers/factor-lang/0.99.nix b/pkgs/development/compilers/factor-lang/0.99.nix new file mode 100644 index 000000000000..88c234213af9 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/0.99.nix @@ -0,0 +1,9 @@ +{ callPackage, fetchurl }: + +callPackage ./unwrapped.nix (rec { + version = "0.99"; + src = fetchurl { + url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; + sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e"; + }; +}) diff --git a/pkgs/development/compilers/factor-lang/unwrapped.nix b/pkgs/development/compilers/factor-lang/unwrapped.nix index 8d7b6dae6661..a8b733a0a2bd 100644 --- a/pkgs/development/compilers/factor-lang/unwrapped.nix +++ b/pkgs/development/compilers/factor-lang/unwrapped.nix @@ -8,16 +8,16 @@ ncurses, tzdata, unzip, + + # Version-specific attributes + version, + src, }: stdenv.mkDerivation (finalAttrs: { pname = "factor-lang"; - version = "0.99"; - src = fetchurl { - url = "https://downloads.factorcode.org/releases/${finalAttrs.version}/factor-src-${finalAttrs.version}.zip"; - sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e"; - }; + inherit src version; patches = [ # Use full path to image while bootstrapping diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a732d145d65..ccc01130c6bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9272,8 +9272,17 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon OpenGL; }; - factorPackages = callPackage ./factor-packages.nix { }; - factor-lang = factorPackages.factor-lang; + factorPackages-0_99 = callPackage ./factor-packages.nix { + factor-unwrapped = callPackage ../development/compilers/factor-lang/0.99.nix { }; + }; + factorPackages-0_100 = callPackage ./factor-packages.nix { + factor-unwrapped = callPackage ../development/compilers/factor-lang/0.100.nix { }; + }; + factorPackages = factorPackages-0_100; + + factor-lang-0_99 = factorPackages-0_99.factor-lang; + factor-lang-0_100 = factorPackages-0_100.factor-lang; + factor-lang = factor-lang-0_100; far2l = callPackage ../applications/misc/far2l { inherit (darwin.apple_sdk.frameworks) diff --git a/pkgs/top-level/factor-packages.nix b/pkgs/top-level/factor-packages.nix index eae05e694130..5ddc4ad86599 100644 --- a/pkgs/top-level/factor-packages.nix +++ b/pkgs/top-level/factor-packages.nix @@ -1,6 +1,7 @@ { lib, pkgs, + factor-unwrapped, overrides ? (self: super: { }), }: @@ -17,7 +18,7 @@ let { }; buildFactorVocab = callPackage ../development/compilers/factor-lang/mk-vocab.nix { }; - factor-unwrapped = callPackage ../development/compilers/factor-lang/unwrapped.nix { }; + inherit factor-unwrapped; factor-lang = callPackage ../development/compilers/factor-lang/wrapper.nix { }; factor-no-gui = callPackage ../development/compilers/factor-lang/wrapper.nix {