From 094ffb2b08d20f1b20aa62dd87921dc3ed7cbb4e Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 11:00:45 +0800 Subject: [PATCH 1/3] add orc 0.4.17 --- pkgs/development/compilers/orc/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/compilers/orc/default.nix diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix new file mode 100644 index 00000000000..25abd8f3e85 --- /dev/null +++ b/pkgs/development/compilers/orc/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "orc-0.4.17"; + + src = fetchurl { + url = "http://code.entropywave.com/download/orc/${name}.tar.gz"; + sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg"; + }; + + meta = { + description = "The Oil Runtime Compiler"; + homepage = "http://code.entropywave.com/orc/"; + platform = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2488f3339f5..0080661c1d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2763,6 +2763,8 @@ let ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { }; + orc = callPackage ../development/compilers/orc { }; + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; From 8e023d078cb2071edf2f5fd9fa5f9308ad05e5e3 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 12:07:57 +0800 Subject: [PATCH 2/3] orc: add missing license (bsd3) --- pkgs/development/compilers/orc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 25abd8f3e85..fbb25effdec 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "The Oil Runtime Compiler"; homepage = "http://code.entropywave.com/orc/"; + license = stdenv.lib.license.bsd3; platform = stdenv.lib.platforms.linux; }; } From 5f4fc730b12aba77bf02abeb494e45640192804b Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 15:14:12 +0800 Subject: [PATCH 3/3] add myself to maintainers list, keep it sorted orc: add myself as a maintainer --- pkgs/development/compilers/orc/default.nix | 1 + pkgs/lib/maintainers.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index fbb25effdec..c7582d0a90d 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { homepage = "http://code.entropywave.com/orc/"; license = stdenv.lib.license.bsd3; platform = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.iyzsong ]; }; } diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index ab76e2018c0..354bf39aea5 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -24,9 +24,10 @@ goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; iElectric = "Domen Kozar "; - lovek323 = "Jason O'Conal "; + iyzsong = "Song Wenwu "; jcumming = "Jack Cummings "; kkallio = "Karn Kallio "; + lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; mornfall = "Petr Ročkai ";