From 2cbe684e9554e149e08e1b93cefd880e58672e61 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Jan 2013 06:24:05 +0100 Subject: nixpkgs: Move packageOverrides into ../overrides. This currently just to clearly separate these from the nixpkgs configuration and will be refined further in upcoming commits. Signed-off-by: aszlig --- nixpkgs/config.nix | 284 +------------------------------------------------ overrides/default.nix | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 287 insertions(+), 283 deletions(-) create mode 100644 overrides/default.nix diff --git a/nixpkgs/config.nix b/nixpkgs/config.nix index 366b97ee..cfb30f26 100644 --- a/nixpkgs/config.nix +++ b/nixpkgs/config.nix @@ -7,8 +7,6 @@ let }; collection = import ../collections/aszlig.nix pkgs; in pkgs.lib.mapAttrsToList genAszligEnv collection; - - tkabberRev = 2009; in { pulseaudio = true; chromium.enableGoogleTalkPlugin = true; @@ -16,285 +14,5 @@ in { firefox.jre = true; - packageOverrides = pkgs: with pkgs; let p = { - aszligEnv = (buildEnv { - name = "aszlig-env"; - paths = aszligCollections (pkgs // p); - }); - - pulseaudio = pulseaudio.override { - useSystemd = true; - }; - - kernelSourceAszlig = { - version = "3.8.0-rc3"; - src = pkgs.fetchgit { - url = /home/aszlig/linux; - rev = "ecf02a607bd801e742d7bb35c6e40f7ca15edf03"; - sha256 = "19ad666ms61s55730sh2n2lp9dsn439lnr7cypdma978mx27aj7v"; - }; - }; - - blop = stdenv.mkDerivation rec { - name = "blop-${version}"; - version = "0.2.8"; - - configureFlags = [ - "--with-ladspa-prefix=${ladspaH}" - "--with-ladspa-plugin-dir=$(out)/lib/ladspa" - ]; - - src = fetchurl { - url = "mirror://sourceforge/blop/${name}.tar.gz"; - sha256 = "02iymw84dml8glyqgx1mxq4fz2fifgi1jca28hx2r3a2mi7i71vy"; - }; - }; - - libCMT = stdenv.mkDerivation rec { - name = "libcmt-${version}"; - version = "1.16"; - - buildInputs = [ ladspaH ]; - - setSourceRoot = '' - sourceRoot=cmt/src - ''; - - makeFlags = [ - "INSTALL_PLUGINS_DIR=$(out)/lib/ladspa" - ]; - - preInstall = '' - mkdir -p "$out/lib/ladspa" - ''; - - src = fetchurl { - url = "http://www.ladspa.org/download/cmt_src_${version}.tgz"; - sha256 = "0dan83pvljij3972bv214balc26p9fgw40i2d5y0x7lbd5z1saji"; - }; - }; - - tkabber = lib.overrideDerivation tkabber (o: { - name = "tkabber-1.0pre"; - src = fetchsvn { - url = "http://svn.xmpp.ru/repos/tkabber/trunk/tkabber"; - rev = tkabberRev; - sha256 = "0lfh3bapqsfw142bndp11x7cs9crrcccw242lgwlh103r9gs123s"; - }; - }); - - tkabber_plugins = lib.overrideDerivation tkabber_plugins (o: { - name = "tkabber-plugins-1.0pre"; - src = fetchsvn { - url = "http://svn.xmpp.ru/repos/tkabber/trunk/tkabber-plugins"; - rev = tkabberRev; - sha256 = "181jxd7iwpcl7wllwciqshzznahdw69fy7r604gj4m2kq6qmynqf"; - }; - }); - - w3m = w3m.override { - graphicsSupport = true; - }; - - netrw = netrw.override { - checksumType = "mhash"; - }; - - kernelEnv = myEnvFun { - name = "kernel"; - extraCmds = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses" - ''; - buildInputs = [ - stdenv ncurses - ]; - }; - - testChromiumBuild = let - buildChannels = [ "stable" "beta" "dev" ]; - buildChromium = chan: chromium.override { - channel = chan; - gnomeSupport = true; - gnomeKeyringSupport = true; - proprietaryCodecs = true; - cupsSupport = true; - pulseSupport = true; - }; - in stdenv.mkDerivation { - name = "test-chromium-build"; - - buildCommand = let - chanResults = lib.flip map buildChannels (chan: '' - echo "Build result for ${chan}: ${buildChromium chan}" - ''); - in '' - echo "Builds finished, the following derivations have been built:" - ${lib.concatStrings chanResults} - false - ''; - }; - - catapultEnv = myEnvFun { - name = "catapult"; - buildInputs = [ - stdenv python pil - pythonPackages.matplotlib - pythonPackages.django - pythonPackages.sqlite3 - pythonPackages.markdown - pythonPackages.MySQL_python - pythonPackages.setuptools - ]; - }; - - hetznerEnv = myEnvFun { - name = "hetzner"; - buildInputs = [ - stdenv python - pythonPackages.pexpect - ]; - }; - - rdwarfEnv = myEnvFun { - name = "rdwarf"; - buildInputs = [ - stdenv python - pythonPackages.numpy - pythonPackages.pyaudio - pythonPackages.curses - ]; - }; - - pvolctrl = stdenv.mkDerivation rec { - name = "pvolctrl-0.23"; - - unpackPhase = let - baseurl = "https://sites.google.com/site/guenterbartsch/blog/" - + "volumecontrolutilityforpulseaudio/"; - makefile = fetchurl { - url = baseurl + "Makefile"; - sha256 = "0l2ffvb617csk6h29y64v6ywhpcp7la6vvcip1w4nq0yry6jhrqz"; - }; - source = fetchurl { - url = baseurl + "pvolctrl.c"; - sha256 = "0vcd5dlw9l47jpabwmmzdvlkn67fz55dr3sryyh56sl263mibjda"; - }; - in '' - mkdir -p "${name}" - sed -e 's|/usr/bin/||' "${makefile}" > "${name}/Makefile" - sed -e 's/PA_VOLUME_MAX/PA_VOLUME_NORM/ - /avg_vol += (avg_vol \* vol_mod) \/ 100;/ { - s/(avg_vol/((int)PA_VOLUME_NORM/ - } - /if (vol_mod)/i \ - if (info->name == NULL || strncmp(info->name, "combined", 8) != 0) \ - return;' "${source}" > "${name}/pvolctrl.c" - sourceRoot="${name}" - ''; - - installPhase = '' - install -D -T pvolctrl "$out/bin/pvolctrl" - ''; - - buildInputs = [ pkgconfig pulseaudio ]; - }; - - librxtx_java = stdenv.mkDerivation rec { - name = "rxtx-${version}"; - version = "2.1-7r2"; - - buildInputs = [ unzip jdk ]; - - NIX_CFLAGS_COMPILE = "-DUTS_RELEASE=\"3.8.0\""; - - makeFlags = [ - "JHOME=$(out)/lib/java" - "RXTX_PATH=$(out)/lib" - ]; - - preInstall = '' - mkdir -p "$out/lib/java" - ''; - - src = fetchurl { - url = "http://rxtx.qbang.org/pub/rxtx/${name}.zip"; - sha256 = "1nfxdbiamr8dmls4zbdcdk4hf916gnr1jmcpb1kpc1b1m193inri"; - }; - }; - - axbo_research = stdenv.mkDerivation rec { - name = "axbo-research-${version}"; - version = "2.0.18"; - - buildInputs = [ jre p.librxtx_java ]; - - unpackCmd = let - fontconfigFile = makeFontsConf { - fontDirectories = lib.singleton dejavu_fonts; - }; - in '' - datalen="$(sed -n 's/^.*totalDataLength=\([0-9]\+\).*$/\1/p' "$src")" - installer_offset="$(sed -n 's/^ *tail *-c *\([0-9]\+\).*$/\1/p' "$src")" - - installer_dir="$(mktemp -d)" - mkdir -p "$installer_dir" - tail -c "$installer_offset" "$src" | tar xz -C "$installer_dir" - - cat > "$installer_dir/responses" < "$out/bin/axbo-research" < "${name}/Makefile" + sed -e 's/PA_VOLUME_MAX/PA_VOLUME_NORM/ + /avg_vol += (avg_vol \* vol_mod) \/ 100;/ { + s/(avg_vol/((int)PA_VOLUME_NORM/ + } + /if (vol_mod)/i \ + if (info->name == NULL || strncmp(info->name, "combined", 8) != 0) \ + return;' "${source}" > "${name}/pvolctrl.c" + sourceRoot="${name}" + ''; + + installPhase = '' + install -D -T pvolctrl "$out/bin/pvolctrl" + ''; + + buildInputs = [ pkgconfig pulseaudio ]; + }; + + librxtx_java = stdenv.mkDerivation rec { + name = "rxtx-${version}"; + version = "2.1-7r2"; + + buildInputs = [ unzip jdk ]; + + NIX_CFLAGS_COMPILE = "-DUTS_RELEASE=\"3.8.0\""; + + makeFlags = [ + "JHOME=$(out)/lib/java" + "RXTX_PATH=$(out)/lib" + ]; + + preInstall = '' + mkdir -p "$out/lib/java" + ''; + + src = fetchurl { + url = "http://rxtx.qbang.org/pub/rxtx/${name}.zip"; + sha256 = "1nfxdbiamr8dmls4zbdcdk4hf916gnr1jmcpb1kpc1b1m193inri"; + }; + }; + + axbo_research = stdenv.mkDerivation rec { + name = "axbo-research-${version}"; + version = "2.0.18"; + + buildInputs = [ jre p.librxtx_java ]; + + unpackCmd = let + fontconfigFile = makeFontsConf { + fontDirectories = lib.singleton dejavu_fonts; + }; + in '' + datalen="$(sed -n 's/^.*totalDataLength=\([0-9]\+\).*$/\1/p' "$src")" + installer_offset="$(sed -n 's/^ *tail *-c *\([0-9]\+\).*$/\1/p' "$src")" + + installer_dir="$(mktemp -d)" + mkdir -p "$installer_dir" + tail -c "$installer_offset" "$src" | tar xz -C "$installer_dir" + + cat > "$installer_dir/responses" < "$out/bin/axbo-research" <