mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Fix the cleanup-induced problems

Browse source 
svn path=/nixpkgs/trunk/; revision=18554
This commit is contained in:
Michael Raskin 2009-11-23 12:21:34 +00:00
parent 0df5c155c6
commit bbd6e56d69
5 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/flup/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, setuptools }: { stdenv, fetchurl, python, setuptools, ... }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flup-r2311"; name = "flup-r2311";
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
buildInputs = [ python setuptools ]; buildInputs = [ python setuptools ];
phaseNames = ["addInputs" "createPythonInstallationTarget" "installPythonPackage"];
meta = { meta = {
description = "FastCGI Python module set"; description = "FastCGI Python module set";
}; };

12
pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel, perl }: { stdenv, fetchurl, kernel, perl, fullDepEntry, ... }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kqemu-1.4.0pre1"; name = "kqemu-1.4.0pre1";
@ -10,17 +10,19 @@ stdenv.mkDerivation rec {
buildInputs = [perl]; buildInputs = [perl];
configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; configureFlags = [''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
preConfigure = '' preConfigure = fullDepEntry (''
sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kern sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh sed -e '/depmod/d' -i install.sh
cat install.sh cat install.sh
''; # */ '') ["minInit" "doUnpack"];
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
meta = { meta = {
description = "Kernel module for Qemu acceleration"; description = "Kernel module for Qemu acceleration";

4
pkgs/tools/networking/socat/2.0.0-b3.nix
View file

@ -1,4 +1,8 @@
args : with args; args : with args;
let
version = "2.0.0-b3";
patches = [];
in
rec { rec {
src = /* Here a fetchurl expression goes */ src = /* Here a fetchurl expression goes */
fetchurl { fetchurl {

2
pkgs/tools/security/bmrsa/11.nix
View file

@ -4,7 +4,7 @@ let
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
fullDepEntry = args.fullDepEntry; fullDepEntry = args.fullDepEntry;
version = lib.attrByPath ["version"] "" args; version = "11";
buildInputs = with args; [ buildInputs = with args; [
unzip unzip
]; ];

10
pkgs/top-level/all-packages.nix
View file

@ -1375,6 +1375,10 @@ let
inherit fetchurl stdenv openssl; inherit fetchurl stdenv openssl;
}; };
socat2pre = builderDefsPackage ../tools/networking/socat/2.0.0-b3.nix {
inherit fetchurl stdenv openssl;
};
sudo = import ../tools/security/sudo { sudo = import ../tools/security/sudo {
inherit fetchurl stdenv coreutils pam groff; inherit fetchurl stdenv coreutils pam groff;
}; };
@ -4710,7 +4714,7 @@ let
inherit fetchurl stdenv python db4; inherit fetchurl stdenv python db4;
}; };
flup = import ../development/python-modules/flup { flup = builderDefsPackage ../development/python-modules/flup {
inherit fetchurl stdenv; inherit fetchurl stdenv;
python = python25; python = python25;
setuptools = setuptools.passthru.function {python = python25;}; setuptools = setuptools.passthru.function {python = python25;};
@ -5518,8 +5522,8 @@ let
inherit fetchurl stdenv kernel ncurses fxload; inherit fetchurl stdenv kernel ncurses fxload;
}; };
kqemu = import ../os-specific/linux/kqemu/1.4.0pre1.nix { kqemu = builderDefsPackage ../os-specific/linux/kqemu/1.4.0pre1.nix {
inherit fetchurl stdenv kernel perl; inherit kernel perl;
}; };
splashutils = splashutils =