From 38c5e4fc677df90070e9ca9a4e2e9829e1244344 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 5 Oct 2008 18:37:09 +0000 Subject: [PATCH] moved pysqlite into PYTHON MODULES section svn path=/nixpkgs/trunk/; revision=12964 --- .../{libraries => python-modules}/pysqlite/builder.sh | 0 .../{libraries => python-modules}/pysqlite/default.nix | 0 pkgs/top-level/all-packages.nix | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/{libraries => python-modules}/pysqlite/builder.sh (100%) rename pkgs/development/{libraries => python-modules}/pysqlite/default.nix (100%) diff --git a/pkgs/development/libraries/pysqlite/builder.sh b/pkgs/development/python-modules/pysqlite/builder.sh similarity index 100% rename from pkgs/development/libraries/pysqlite/builder.sh rename to pkgs/development/python-modules/pysqlite/builder.sh diff --git a/pkgs/development/libraries/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix similarity index 100% rename from pkgs/development/libraries/pysqlite/default.nix rename to pkgs/development/python-modules/pysqlite/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdcea07d0b31..3976ad87b5fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4592,6 +4592,10 @@ let inherit fetchurl stdenv setuptools mesa freeglut pil python; }; + pysqlite = import ../development/python-modules/pysqlite { + inherit stdenv fetchurl python sqlite; + }; + pythonSip = builderDefsPackage (selectVersion ../development/python-modules/python-sip "4.7.4") { inherit python; }; @@ -7695,10 +7699,6 @@ let sqlite subversion pysqlite; }; - pysqlite = import ../development/libraries/pysqlite { - inherit stdenv fetchurl python sqlite; - }; - wine = import ../misc/emulators/wine { inherit fetchurl stdenv flex bison mesa ncurses libpng libjpeg alsaLib lcms xlibs freetype