about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/user/aszlig/system/kernel.nix2
-rw-r--r--pkgs/beehive/default.nix17
-rw-r--r--pkgs/beehive/godeps.nix378
-rw-r--r--pkgs/blop/default.nix16
-rw-r--r--pkgs/default.nix17
-rw-r--r--pkgs/greybird-xfce-theme/default.nix26
-rw-r--r--pkgs/kernel/bfqsched/default.nix45
-rw-r--r--pkgs/kernel/linux-4.7.nix22
-rw-r--r--pkgs/libcmt/default.nix25
-rw-r--r--pkgs/sidplayfp/default.nix29
-rw-r--r--pkgs/tkabber-urgent-plugin/default.nix26
-rw-r--r--pkgs/twitchstream/default.nix112
12 files changed, 1 insertions, 714 deletions
diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix
index d0cdba84..afbbb759 100644
--- a/modules/user/aszlig/system/kernel.nix
+++ b/modules/user/aszlig/system/kernel.nix
@@ -10,7 +10,7 @@
       kernelPatches = lib.singleton {
         name = "bfq-v8r7";
         patch = ./bfq.patch;
-        extraConfig = (pkgs.vuizvui.kernel.bfqsched.extraConfig or "") + ''
+        extraConfig = ''
           IOSCHED_BFQ y
           DEFAULT_BFQ y
           DEFAULT_CFQ n
diff --git a/pkgs/beehive/default.nix b/pkgs/beehive/default.nix
deleted file mode 100644
index 7fcca398..00000000
--- a/pkgs/beehive/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ goPackages, lib, fetchFromGitHub, fetchhg, fetchgit }:
-
-goPackages.buildGoPackage {
-  name = "beehive";
-  goPackagePath = "github.com/muesli/beehive";
-  src = fetchFromGitHub {
-    owner = "muesli";
-    repo = "beehive";
-    rev = "74a7fc4927b8ef14b199254e04630c24f44429f7";
-    sha256 = "1clgc6245yb3yxqdc14xj0f8hc8v4b9hgkv22c89zp0n1by8xrqx";
-  };
-  buildInputs = lib.mapAttrsToList (name: val: val) (import ./godeps.nix {
-    inherit (goPackages) buildGoPackage;
-    inherit lib fetchFromGitHub fetchhg fetchgit;
-  });
-  meta.broken = true;
-}
diff --git a/pkgs/beehive/godeps.nix b/pkgs/beehive/godeps.nix
deleted file mode 100644
index a0e7526e..00000000
--- a/pkgs/beehive/godeps.nix
+++ /dev/null
@@ -1,378 +0,0 @@
-{ buildGoPackage, lib, fetchFromGitHub, fetchgit, fetchhg }:
-
-rec {
-  cascadia = buildGoPackage {
-    name = "cascadia";
-    goPackagePath = "code.google.com/p/cascadia";
-    src = fetchhg {
-      url = "https://code.google.com/p/cascadia";
-      rev = "5d796540e3cb93ea0556c897e6a3c7690f614d35";
-      sha256 = "1mxmj4vbh47j3nvmdqdah4fprkyww3pf8i9sy0zcar52bpa4j69c";
-    };
-    buildInputs = [ net ];
-  };
-
-  charset = buildGoPackage {
-    name = "go-charset";
-    goPackagePath = "code.google.com/p/go-charset";
-    src = fetchhg {
-      url = "https://code.google.com/p/go-charset";
-      rev = "ebbeafdc430eb6c7e44e9a730a38eaff4c56ba3a";
-      sha256 = "162jd0ryvwaj7bwxbdwrs1vi6ig3bhd6m4n16wf54frrzyqxh34p";
-    };
-  };
-
-  gonet = buildGoPackage {
-    name = "go.net";
-    goPackagePath = "code.google.com/p/go.net";
-    src = fetchhg {
-      url = "https://code.google.com/p/go.net";
-      rev = "937a34c9de13c766c814510f76bca091dee06028";
-      sha256 = "1f91yzjllw2pdk68yjvf8hjix4mrlqn7fh97h9n7qjy903rwnb9q";
-    };
-    buildInputs = [ net text ];
-  };
-
-  gomock = buildGoPackage {
-    name = "gomock";
-    goPackagePath = "code.google.com/p/gomock";
-    src = fetchgit {
-      url = "https://code.google.com/p/gomock";
-      rev = "e033c7513ca3d743bbb64df299bdec29e93fed03";
-      sha256 = "0vmpqibyx09bdqnqsy8g4xiw3hpw0j9kww7ak2z7fdzxpd9ly337";
-    };
-  };
-
-  anaconda = buildGoPackage {
-    name = "anaconda";
-    goPackagePath = "github.com/ChimeraCoder/anaconda";
-    src = fetchFromGitHub {
-      owner = "ChimeraCoder";
-      repo = "anaconda";
-      rev = "964821c05001e5a38dd234d681ce9a929858481a";
-      sha256 = "077fxb4iazsjfsbmj966ifias84agxbzip742w9cbc7fv1bpy085";
-    };
-    buildInputs = [ tokenbucket jsonpointer oauth ];
-  };
-
-  tokenbucket = buildGoPackage {
-    name = "tokenbucket";
-    goPackagePath = "github.com/ChimeraCoder/tokenbucket";
-    src = fetchFromGitHub {
-      owner = "ChimeraCoder";
-      repo = "tokenbucket";
-      rev = "c5a927568de7aad8a58127d80bcd36ca4e71e454";
-      sha256 = "1cyzlvk1mgdvdfmqsdsy5y2rflfz5q54a9rz9jylc2mg40c1d6dq";
-    };
-  };
-
-  gotumblr = buildGoPackage {
-    name = "gotumblr";
-    goPackagePath = "github.com/MariaTerzieva/gotumblr";
-    src = fetchFromGitHub {
-      owner = "MariaTerzieva";
-      repo = "gotumblr";
-      rev = "62f45d64049aeab0b3835351edc66704c7210f7a";
-      sha256 = "06bqc6c4j9g8l0xqhc9g5jmx4q6dq5jid5bpj4skca30gsqgldgr";
-    };
-    buildInputs = [ oauth1a ];
-  };
-
-  goquery = buildGoPackage {
-    name = "goquery";
-    goPackagePath = "github.com/PuerkitoBio/goquery";
-    src = fetchFromGitHub {
-      owner = "PuerkitoBio";
-      repo = "goquery";
-      rev = "4cf64c51f7e80d56d9ae2ffe7d684d3dd5dbd5d0";
-      sha256 = "1d6cl0qhfx9ngj3hn56mxwwy7yak62c5wxa77f7yfarql84r8h4n";
-    };
-    buildInputs = [ cascadia net ];
-  };
-
-  GoOse = buildGoPackage {
-    name = "GoOse";
-    goPackagePath = "github.com/advancedlogic/GoOse";
-    src = fetchFromGitHub {
-      owner = "advancedlogic";
-      repo = "GoOse";
-      rev = "e210b2436fec0a3ce1b5f9209ee3340314b408e2";
-      sha256 = "0sjqy295x9rn93b5k3r8hdbi5gjbdd3h2dn89v4nzpnzmlrfbc2c";
-    };
-    buildInputs = [ cascadia charset gojs-config goquery net latinx set ];
-  };
-
-  gojs-config = buildGoPackage {
-    name = "gojs-config";
-    goPackagePath = "github.com/advancedlogic/gojs-config";
-    src = fetchFromGitHub {
-      owner = "advancedlogic";
-      repo = "gojs-config";
-      rev = "bff36193fca8bd2f6269e8c4e8c723991fd20565";
-      sha256 = "1k0wgn3pj384sqai2c9dkv06j0z439i3xqzfl3kplb0wdf8a2vy0";
-    };
-  };
-
-  latinx = buildGoPackage {
-    name = "latinx";
-    goPackagePath = "github.com/bjarneh/latinx";
-    src = fetchFromGitHub {
-      owner = "bjarneh";
-      repo = "latinx";
-      rev = "4dfe9ba2a293f28a5e06fc7ffe56b1d71a47b8c8";
-      sha256 = "0lavz5m0dz1rxyl20var3xqj2ndcmai2v893p83pjwm4333yb5g0";
-    };
-  };
-
-  jsonpointer = buildGoPackage {
-    name = "go-jsonpointer";
-    goPackagePath = "github.com/dustin/go-jsonpointer";
-    src = fetchFromGitHub {
-      owner = "dustin";
-      repo = "go-jsonpointer";
-      rev = "75939f54b39e7dafae879e61f65438dadc5f288c";
-      sha256 = "1vcv5xb6v6akbbi71q4srfla311s4p9kspqya2h40x8fxx00lkxp";
-    };
-    propagatedBuildInputs = [ gojson ];
-  };
-
-  gojson = buildGoPackage {
-    name = "gojson";
-    goPackagePath = "github.com/dustin/gojson";
-    src = fetchFromGitHub {
-      owner = "dustin";
-      repo = "gojson";
-      rev = "af16e0e771e2ed110f2785564ae33931de8829e4";
-      sha256 = "0626n6a5hwb0zwi6dwsmqdv2g5fwzsfx22rbxscaydpb90b6qnin";
-    };
-  };
-
-  restful = buildGoPackage {
-    name = "go-restful";
-    goPackagePath = "github.com/emicklei/go-restful";
-    src = fetchFromGitHub {
-      owner = "emicklei";
-      repo = "go-restful";
-      rev = "7ef8ec372029a3112fdb94a53b1ca8eedf666e67";
-      sha256 = "0rrpa9xiqkzapn6axjl19nnhxk0ljjq20a8jpam80hkzw4waa955";
-    };
-    postPatch = ''
-      rm -rf examples
-    '';
-    buildInputs = [ schema ];
-  };
-
-  goirc = buildGoPackage {
-    name = "goirc";
-    goPackagePath = "github.com/fluffle/goirc";
-    src = fetchFromGitHub {
-      owner = "fluffle";
-      repo = "goirc";
-      rev = "0cac69d2eec69bb08bb29b776d045a78b9699791";
-      sha256 = "0iba19rslsyww3qsf9d4ncdxjjz7pv8k36ar5s1i6f4fwv42d56q";
-    };
-    buildInputs = [ glog golog gomock ];
-  };
-
-  golog = buildGoPackage {
-    name = "golog";
-    goPackagePath = "github.com/fluffle/golog";
-    src = fetchFromGitHub {
-      owner = "fluffle";
-      repo = "golog";
-      rev = "3b86dae249b53d7dc2d9e817ff019fa01a155b06";
-      sha256 = "0b8fzkk9bshkfsnbx2nq6dn0dcngsh5awpym98sinkkfwywvlq2f";
-    };
-    buildInputs = [ gomock ];
-  };
-
-  oauth = buildGoPackage {
-    name = "go-oauth";
-    goPackagePath = "github.com/garyburd/go-oauth";
-    src = fetchFromGitHub {
-      owner = "garyburd";
-      repo = "go-oauth";
-      rev = "fa02955a8929c2f007c533fbdfb8ddc91bb6a731";
-      sha256 = "0zx9azdhjxf18fk4y3hnp70cz75iyllqfvfxma02i8f63q364d94";
-    };
-    postPatch = ''
-      rm -rf examples
-    '';
-  };
-
-  glog = buildGoPackage {
-    name = "glog";
-    goPackagePath = "github.com/golang/glog";
-    src = fetchFromGitHub {
-      owner = "golang";
-      repo = "glog";
-      rev = "44145f04b68cf362d9c4df2182967c2275eaefed";
-      sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq";
-    };
-  };
-
-  protobuf = buildGoPackage {
-    name = "protobuf";
-    goPackagePath = "github.com/golang/protobuf";
-    src = fetchFromGitHub {
-      owner = "golang";
-      repo = "protobuf";
-      rev = "f7137ae6b19afbfd61a94b746fda3b3fe0491874";
-      sha256 = "05n1ws6y9qpp3imxjvl3jnknq6kca2vc5g475fqr2l67ap3w5lwk";
-    };
-    subPackages = [ "proto" "protoc-gen-go" ];
-  };
-
-  schema = buildGoPackage {
-    name = "schema";
-    goPackagePath = "github.com/gorilla/schema";
-    src = fetchFromGitHub {
-      owner = "gorilla";
-      repo = "schema";
-      rev = "c8422571edf3131506bab7df27e18980fe2598d5";
-      sha256 = "10czpd111l834aam52bh1cxv31pq4h8mi1w994v4848rmbw3jpp4";
-    };
-  };
-
-  dbus = buildGoPackage {
-    name = "go.dbus";
-    goPackagePath = "github.com/guelfey/go.dbus";
-    src = fetchFromGitHub {
-      owner = "guelfey";
-      repo = "go.dbus";
-      rev = "f6a3a2366cc39b8479cadc499d3c735fb10fbdda";
-      sha256 = "15rnpvclg4b3cblcxwwgkdfgamhigiyla0s1rwhfjraqhn94r3ph";
-    };
-    postPatch = ''
-      rm -rf _examples
-    '';
-  };
-
-  web = buildGoPackage {
-    name = "web";
-    goPackagePath = "github.com/hoisie/web";
-    src = fetchFromGitHub {
-      owner = "hoisie";
-      repo = "web";
-      rev = "5a66d0fa07a54688eba8fa506576a78a942ef243";
-      sha256 = "1h4ary4ac51xznr41996k3xqlclm3r5mjba71y6anfwdrhaa2qf1";
-    };
-    buildInputs = [ gonet ];
-    postPatch = ''
-      rm -rf examples
-    '';
-  };
-
-  goserial = buildGoPackage {
-    name = "goserial";
-    goPackagePath = "github.com/huin/goserial";
-    src = fetchFromGitHub {
-      owner = "huin";
-      repo = "goserial";
-      rev = "7b90efdb22b1c168a57b998b2780cf541b2c4740";
-      sha256 = "05ha3yvhvbfrbxlqi8x1fwcliginw0vxhh76mh6vycn9n7yjpacy";
-    };
-  };
-
-  rss = buildGoPackage {
-    name = "go-pkg-rss";
-    goPackagePath = "github.com/jteeuwen/go-pkg-rss";
-    src = fetchFromGitHub {
-      owner = "jteeuwen";
-      repo = "go-pkg-rss";
-      rev = "2382fc0262cb000be19e9042cdbc8459105b4f00";
-      sha256 = "0rss5sj128qwai60wpkm5cy2q8d9yfakdm4pqb8p4lhgpq26g05h";
-    };
-    buildInputs = [ xmlx ];
-  };
-
-  xmlx = buildGoPackage {
-    name = "go-pkg-xmlx";
-    goPackagePath = "github.com/jteeuwen/go-pkg-xmlx";
-    src = fetchFromGitHub {
-      owner = "jteeuwen";
-      repo = "go-pkg-xmlx";
-      rev = "cf505b97c711dd1c5a4682f68ea04dd35e385b8f";
-      sha256 = "01pdjndl1i0p7lr8svi1j0f79zyl36s0xn7yb8d8yziksbczbcrj";
-    };
-  };
-
-  oauth1a = buildGoPackage {
-    name = "oauth1a";
-    goPackagePath = "github.com/kurrik/oauth1a";
-    src = fetchFromGitHub {
-      owner = "kurrik";
-      repo = "oauth1a";
-      rev = "fc2542bc5f2532ed4a437960d2d51ff6e18a5cb6";
-      sha256 = "1v9zsn80y5x5fklc7q8rxixjrh5g01rsdlz247lgf3rag0hb3d39";
-    };
-  };
-
-  xmpp = buildGoPackage {
-    name = "go-xmpp";
-    goPackagePath = "github.com/mattn/go-xmpp";
-    src = fetchFromGitHub {
-      owner = "mattn";
-      repo = "go-xmpp";
-      rev = "8b13d0ad771420685f85ed09d8e9bf81757e7e20";
-      sha256 = "022all0cphxmrg015jzfsqd5xd5nli7fpw32wx6ql79s4rsy3bwb";
-    };
-    postPatch = ''
-      rm -rf _example
-    '';
-  };
-
-  goefa = buildGoPackage {
-    name = "goefa";
-    goPackagePath = "github.com/michiwend/goefa";
-    src = fetchFromGitHub {
-      owner = "michiwend";
-      repo = "goefa";
-      rev = "381f3d7b77fc04d9a81d2bc9e3e6d2fc742757b1";
-      sha256 = "1aiiafbpvw2xlvjgh27mfljd3d0j443iz7sp9w9w3109ay1q2gk4";
-    };
-    buildInputs = [ charset ];
-  };
-
-  hue = buildGoPackage {
-    name = "go.hue";
-    goPackagePath = "github.com/muesli/go.hue";
-    src = fetchFromGitHub {
-      owner = "muesli";
-      repo = "go.hue";
-      rev = "8aefcc693cafb5b2b4ef8ca8d51ab880849e8c12";
-      sha256 = "158q3g5rg9wra1wxkvyb1c2v868gp9mslhf6gmbifj516lsb1agi";
-    };
-  };
-
-  net = buildGoPackage {
-    name = "net";
-    goPackagePath = "golang.org/x/net";
-    src = fetchgit {
-      url = "https://go.googlesource.com/net";
-      rev = "97d8e4e174133a4d1d2171380e510eb4dea8f5ea";
-      sha256 = "0jydngilxhgw8f1zgz11hbjk87bhj0jpar89a2py1pii4ncx9w04";
-    };
-    buildInputs = [ text ];
-  };
-
-  text = buildGoPackage {
-    name = "text";
-    goPackagePath = "golang.org/x/text";
-    src = fetchgit {
-      url = "https://go.googlesource.com/text";
-      rev = "26df76be81cdb060ed9820481a0d67b2d0b04ac2";
-      sha256 = "1vmgzzi0r1idjfgfwibq2r3xlnab3w2v6nmm3c5l2bb994w376gn";
-    };
-  };
-
-  set = buildGoPackage {
-    name = "set.v0";
-    goPackagePath = "gopkg.in/fatih/set.v0";
-    src = fetchgit {
-      url = "https://gopkg.in/fatih/set.v0";
-      rev = "27c40922c40b43fe04554d8223a402af3ea333f3";
-      sha256 = "1d8yz8p4jvyqvmpim40x5y7kj91c5hcc5hbmxhv0j32ifz01nacl";
-    };
-  };
-}
diff --git a/pkgs/blop/default.nix b/pkgs/blop/default.nix
deleted file mode 100644
index 6f1f49c5..00000000
--- a/pkgs/blop/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, ladspaH }:
-
-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";
-  };
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index f991f9f5..1c9b40cb 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -10,46 +10,29 @@ let
 
     aacolorize = callPackage ./aacolorize { };
     axbo = callPackage ./axbo { };
-    # beehive = callPackage ./beehive { }; TODO get running again
-    blop = callPackage ./blop { };
     git-detach = callPackage ./git-detach { };
     grandpa = callPackage ./grandpa { };
-    greybird-xfce-theme = callPackage ./greybird-xfce-theme { };
     jmtpfs = pkgs.jmtpfs.override {
       libmtp = pkgs.libmtp.overrideDerivation (old: {
         patches = old.patches or [] ++ [ ./mtp-jolla.patch ];
       });
     };
     nixops = callPackage ./nixops { };
-    libCMT = callPackage ./libcmt { };
     librxtx_java = callPackage ./librxtx-java { };
     list-gamecontrollers = callPackage ./list-gamecontrollers { };
     lockdev = callPackage ./lockdev { };
     pvolctrl = callPackage ./pvolctrl { };
     santander = callPackage_i686 ./santander { };
     show-qr-code = callPackage ./show-qr-code { };
-    sidplayfp = callPackage ./sidplayfp { };
-    tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { };
     tomahawk = callPackage ./tomahawk {
       boost = pkgs.boost155;
     };
-    twitchstream = callPackage ./twitchstream { };
 
     games = import ./games {
       inherit pkgs;
       config = pkgs.config.vuizvui.games or null;
     };
 
-    kernel = {
-      bfqsched = callPackage ./kernel/bfqsched { };
-      linux_4_7 = callPackage ./kernel/linux-4.7.nix {
-        kernelPatches = [
-          pkgs.kernelPatches.bridge_stp_helper
-          pkgs.kernelPatches.cpu-cgroup-v2."4.7"
-        ];
-      };
-    };
-
     openlab = pkgs.recurseIntoAttrs {
       gitit = callPackage ./openlab/gitit { hlib = pkgs.haskell.lib; };
       stackenblocken = callPackage ./openlab/stackenblocken {};
diff --git a/pkgs/greybird-xfce-theme/default.nix b/pkgs/greybird-xfce-theme/default.nix
deleted file mode 100644
index 80b26e85..00000000
--- a/pkgs/greybird-xfce-theme/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation {
-  name = "greybird-xfce-theme";
-
-  src = fetchFromGitHub {
-    repo = "Greybird";
-    owner = "shimmerproject";
-    rev = "d0a50a8ea75f11d668229287e83189ef038a56f0";
-    sha256 = "08lf39qbx85ldxfh4qyj9fd42mbsg3vs2r0bg1csl6qx13lffiay";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p "$out/share/themes/Greybird"
-    cp -vrt "$out/share/themes/Greybird" \
-      gtk-* metacity-1 unity xfce-notify-4.0 xfwm4
-
-    for i in a11y compact; do
-      outdir="$out/share/themes/Greybird-$i/xfwm4"
-      mkdir -p "$outdir"
-      cp -vrt "$outdir" xfwm4-$i/*
-    done
-  '';
-}
diff --git a/pkgs/kernel/bfqsched/default.nix b/pkgs/kernel/bfqsched/default.nix
deleted file mode 100644
index 8449a7eb..00000000
--- a/pkgs/kernel/bfqsched/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  bfqVersion = "v8r4";
-  kernelVersion = "4.8.0";
-  version = "${kernelVersion}-${bfqVersion}";
-
-  baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches";
-
-  fetchPatch = { name, sha256 }: fetchurl {
-    url = "${baseURL}/${version}/${name}.patch";
-    inherit sha256;
-  };
-
-  allPatches = [
-    (fetchPatch {
-      name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.8.0";
-      sha256 = "0br6j334apx99kan71c6z5fnxhnv60j4rzpgzzi0jzlbn5lxkaqx";
-    })
-    (fetchPatch {
-      name = "0002-block-introduce-the-BFQ-v7r11-I-O-sched-to-be-ported";
-      sha256 = "1ll6pqj34bhf2mqhdcr12sw45j6wc00lf483r780yy6mjdw7mlf8";
-    })
-    (fetchPatch {
-      name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-to-";
-      sha256 = "1vqx3sggx1bjxi7fyj4fcfn89b0d6bqvz1ba9vggl37jqaqsazp4";
-    })
-    (fetchPatch {
-      name = "0004-Turn-BFQ-v7r11-into-BFQ-v8r4-for-4.8.0";
-      sha256 = "0nazr2mqqgaz2060c4wdj6xfcxp1mgp1iyz1qq68ydzg98q6xjf3";
-    })
-  ];
-
-  patch = stdenv.mkDerivation {
-    name = "bfqsched-${version}.patch";
-    inherit allPatches;
-    buildCommand = ''
-      cat $allPatches > "$out"
-    '';
-  };
-
-in {
-  name = "bfqsched-${version}";
-  inherit version patch;
-}
diff --git a/pkgs/kernel/linux-4.7.nix b/pkgs/kernel/linux-4.7.nix
deleted file mode 100644
index 5650b8d6..00000000
--- a/pkgs/kernel/linux-4.7.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, pkgs, ... } @ args:
-
-let
-  nixpkgs = import ../../nixpkgs-path.nix;
-  generic = "${nixpkgs}/pkgs/os-specific/linux/kernel/generic.nix";
-in import generic (args // rec {
-  version = "4.7.10";
-  extraMeta.branch = "4.7";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1p2r5d0jcrak9gxp0339g9z198x9laf09h08ck4jllhhaajrnicj";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/libcmt/default.nix b/pkgs/libcmt/default.nix
deleted file mode 100644
index e255ef25..00000000
--- a/pkgs/libcmt/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, ladspaH }:
-
-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";
-  };
-}
diff --git a/pkgs/sidplayfp/default.nix b/pkgs/sidplayfp/default.nix
deleted file mode 100644
index c06da466..00000000
--- a/pkgs/sidplayfp/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, alsaLib, libpulseaudio }:
-
-let
-  libsidplayfp = stdenv.mkDerivation rec {
-    name = "libsidplayfp-${version}";
-    version = "1.3.0";
-
-    src = fetchurl {
-      url = "mirror://sourceforge/sidplay-residfp/${name}.tar.gz";
-      sha256 = "1gd4pn445v3wzr95z1b8642w016dnhq2hi8dgpc9imxig4xhx47d";
-    };
-  };
-
-in stdenv.mkDerivation rec {
-  name = "sidplayfp-${version}";
-  version = "1.1.0.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/sidplay-residfp/${name}.tar.gz";
-    sha256 = "0m8gk4xw2g4s3rcc3qy7nw6i08ivijjnbf3b6s5y3ryysyjjmc50";
-  };
-
-  postPatch = ''
-    sed -i -e '/cerr.*\(Clear screen\|Move cursor\)/d' src/menu.cpp
-  '';
-
-  buildInputs = [ pkgconfig libsidplayfp alsaLib libpulseaudio ];
-}
-
diff --git a/pkgs/tkabber-urgent-plugin/default.nix b/pkgs/tkabber-urgent-plugin/default.nix
deleted file mode 100644
index b39e5ea8..00000000
--- a/pkgs/tkabber-urgent-plugin/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchsvn, xlibs }:
-
-stdenv.mkDerivation {
-  name = "tkabber-urgent-plugin";
-
-  src = fetchsvn {
-    url = "http://svn.xmpp.ru/repos/tkabber-3rd-party/trunk/plugins/urgent";
-    rev = 528;
-    sha256 = "1qr7i0559ad5y1l5h2gp8aix4nsfgm0bx7jqb030hgbxaw1xnbp5";
-  };
-
-  buildInputs = [ xlibs.libX11 ];
-
-  patchPhase = ''
-    sed -i -e 's|exec xwininfo|exec ${xlibs.xwininfo}/bin/xwininfo|' urgent.tcl
-  '';
-
-  buildPhase = ''
-    gcc -lX11 -o urgent urgent.c
-  '';
-
-  installPhase = ''
-    install -vd "$out/share/tkabber-plugins/urgent"
-    cp -vpt "$out/share/tkabber-plugins/urgent" urgent urgent.tcl
-  '';
-}
diff --git a/pkgs/twitchstream/default.nix b/pkgs/twitchstream/default.nix
deleted file mode 100644
index b6d0b523..00000000
--- a/pkgs/twitchstream/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{ stdenv, fetchurl, writeScriptBin, ffmpeg_2, libpulseaudio }:
-
-# FIXME: Clean up this whole file!
-
-with stdenv.lib;
-
-let
-  streams = {
-    dnyarri = {
-      width = 1920;
-      height = 1080;
-      monitor = 1;
-    };
-    mmrnmhrm = {
-      width = 1600;
-      height = 1280;
-      monitor = 1;
-    };
-  };
-
-  sumAttr = name: attrs: acc: acc + (getAttr name attrs);
-  maxAttr = name: attrs: acc: let
-    current = getAttr name attrs;
-  in if acc > current then acc else current;
-
-  fullwidth = fold (sumAttr "width") 0 (attrValues streams);
-  maxheight = fold (maxAttr "height") 0 (attrValues streams);
-
-  resolution = "1920x1080";
-  fps = 15;
-  quality = "slow";
-
-  encoder = let
-    aacenc = stdenv.mkDerivation rec {
-      name = "vo-aacenc-0.1.3";
-      src = fetchurl {
-        url = "mirror://sourceforge/opencore-amr/${name}.tar.gz";
-        sha256 = "0dhghm3c8pqrriwwyj5x9i0yf52fmdfijbgqqkvqvwarldvp86p5";
-      };
-    };
-    base = ffmpeg_2.override { x11grabSupport = true; };
-  in stdenv.lib.overrideDerivation base (attrs: {
-    configureFlags = attrs.configureFlags ++ [
-      "--enable-libpulse"
-      "--enable-version3"
-      "--enable-libvo-aacenc"
-    ];
-    preConfigure = ''
-      addPkgConfigPath "${libpulseaudio}"
-      addPkgConfigPath "${aacenc}"
-    '';
-    NIX_CFLAGS_COMPILE = "-I${aacenc}/include -L${aacenc}/lib";
-    buildInputs = attrs.buildInputs ++ [ libpulseaudio aacenc ];
-  });
-
-  script = let
-    combine = [
-      "color=c=black:s=1248x640 [surface]"
-      "[0:v] setpts=PTS-STARTPTS, scale=680x540 [left]"
-      "[1:v] setpts=PTS-STARTPTS, scale=568x640 [right]"
-      "[surface][left] overlay=0:0 [leftonly]"
-      "[leftonly][right] overlay=680:0 [out]"
-    ];
-  /*
-    combine = [
-      "color=c=black:s=${toString fullwidth}x${toString maxheight} [surface]"
-      "[surface][0:v] overlay=0:0 [leftonly]"
-      "[leftonly][1:v] overlay=${toString streams.dnyarri.width}:0 [out]"
-    ];
-  */
-    nop = x: "\\";
-  in ''
-    #!${stdenv.shell}
-    keyfile="$HOME/.twitch.key"
-    if [ ! -e "$keyfile" ]; then
-      echo "You need to put your streaming key into $keyfile!" >&2
-      echo "To obtain the key, please visit the following URL:" >&2
-      echo "http://www.twitch.tv/broadcast/dashboard/streamkey" >&2
-      exit 1
-    fi
-
-    ${encoder}/bin/ffmpeg -loglevel warning \
-      -f x11grab -s "${resolution}" -r "${toString fps}" -i "$DISPLAY+1920,0" \
-      -f pulse -ac 2 -i default \
-      -codec:v libx264 -s 1280x720 -preset:v fast -crf 24 -pix_fmt yuv420p \
-      -codec:a libvo_aacenc -ar 44100 -threads auto -b:a 128k -bufsize 8k \
-      -f flv "rtmp://live-fra.twitch.tv/app/$(< "$keyfile")" "$@"
-  '';
-
-  disabled = ''
-    ${encoder}/bin/ffmpeg \
-      -f x11grab -s "${resolution}" -r "${toString fps}" -i "$DISPLAY+1920,0" \
-      ${nop ''
-      -i 'tcp://dnyarri:7891?listen' \
-      ''}
-      -f pulse -ac 2 -i default \
-      ${nop ''
-      -filter_complex "${concatStringsSep "; " combine}" \
-      -map "[out]" -map 2:a,0:v \
-      -c:v libx264 -preset "${quality}" -s 1280x720 \
-                   -b 2500k -minrate 2500k -maxrate 2500k \
-                   -tune film -qscale:v 1 -threads:v 4 -crf 1 -tune animation \
-      -c:a libmp3lame -ar 44100 -qscale:a 1 -bufsize 512k -threads 4 \
-      -framerate "${toString fps}" \
-      -force_key_frames 2 -b 2500k -minrate 2500k -maxrate 2500k \
-      -g 2 -keyint_min 2 \
-      ''}
-      -c:v libx264 -preset fast -pix_fmt yuv420p -s 1280x800 -threads 0 \
-      -c:a libmp3lame -ab 128k -ar 44100 -threads 0 \
-      -f flv "rtmp://live-fra.twitch.tv/app/$(< "$keyfile")" "$@"
-  '';
-in writeScriptBin "twitchstream" script
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-06 11:25:55 +0000