From 29cd3206f2095d7a6abd78d50601e3b7aff2aa81 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 1 Jan 2011 20:28:38 +0000 Subject: [PATCH] Adding ised svn path=/nixpkgs/trunk/; revision=25331 --- .../builder-defs/template-auto-callable.nix | 2 +- pkgs/tools/misc/ised/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/ised/default.nix diff --git a/pkgs/build-support/builder-defs/template-auto-callable.nix b/pkgs/build-support/builder-defs/template-auto-callable.nix index 1ff7ed0a96c..a94a96fe538 100644 --- a/pkgs/build-support/builder-defs/template-auto-callable.nix +++ b/pkgs/build-support/builder-defs/template-auto-callable.nix @@ -37,7 +37,7 @@ rec { ]; platforms = with a.lib.platforms; (abort "Specify platforms"); - license = "${abort ''Specify license''}"; + license = a.lib.licenses.(abort "Specify license"); }; passthru = { updateInfo = { diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix new file mode 100644 index 00000000000..f5f9112639c --- /dev/null +++ b/pkgs/tools/misc/ised/default.nix @@ -0,0 +1,47 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="ised"; + version="2.2.2"; + name="${baseName}-${version}"; + url="mirror://sf/project/ised/${name}.tar.bz2"; + hash="1nb1cnsbs2k3j9cy2kc2kg01rd7wf3jwxm62rwn1rjlc46nwdlmn"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "A numeric sequence editor"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.gpl3Plus; + }; + passthru = { + updateInfo = { + downloadPage = "ised.sf.net"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be1617cd5b0..5330733b730 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -790,6 +790,8 @@ let static = false; }; + ised = callPackage ../tools/misc/ised {}; + jdiskreport = callPackage ../tools/misc/jdiskreport { }; jfsrec = callPackage ../tools/filesystems/jfsrec { };