From f9852b29a4be48f098d8342f53116e89efef3472 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 4 Nov 2021 13:51:52 -0400 Subject: [PATCH] remove stale minecraft-atlauncher and voltron pkgs --- pkgs/minecraft-atlauncher/default.nix | 22 ------------- pkgs/voltron/default.nix | 46 --------------------------- pkgs/voltron/scruffington.nix | 15 --------- 3 files changed, 83 deletions(-) delete mode 100644 pkgs/minecraft-atlauncher/default.nix delete mode 100644 pkgs/voltron/default.nix delete mode 100644 pkgs/voltron/scruffington.nix diff --git a/pkgs/minecraft-atlauncher/default.nix b/pkgs/minecraft-atlauncher/default.nix deleted file mode 100644 index 4977088..0000000 --- a/pkgs/minecraft-atlauncher/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl, writeShellScript, jre8, buildFHSUserEnv }: -let - name = "minecraft-atlauncher"; - version = "3.4.0.2"; - - atJar = fetchurl { - url = "https://github.com/ATLauncher/ATLauncher/releases/download/${version}/ATLauncher-${version}.jar"; - sha256 = "5bf55ba0134e2bfbd99cf1b720cf24eb296bf2875af117fd6a845f5a408a60f4"; - }; - -in -buildFHSUserEnv { - inherit name; - targetPkgs = pkgs: [ pkgs.alsaLib ]; - runScript = writeShellScript name '' - set -ex - installPath=~/.atlauncher - mkdir -p "$installPath" - cd "$installPath" - exec ${jre8}/bin/java -jar "${atJar}" --working-dir "$installPath" - ''; -} diff --git a/pkgs/voltron/default.nix b/pkgs/voltron/default.nix deleted file mode 100644 index 27b76b9..0000000 --- a/pkgs/voltron/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, callPackage -, fetchFromGitHub -, gdb -, makeWrapper -, python3 -}: -let - python = python3; - - voltron = python.pkgs.buildPythonPackage rec { - pname = "voltron"; - version = "d9fef0bb4073d434c54415d55a1b5da92cb84696"; - - src = fetchFromGitHub { - owner = "snare"; - repo = pname; - rev = version; - sha256 = "0cc4q9fn1lgqfdxy8l2800izqqwlbs9zw4yab2dk9i5b686xyc6i"; - }; - - propagatedBuildInputs = with python.pkgs; [ - blessed - flask-restful - pygments - pysigset - requests-unixsocket - (callPackage ./scruffington.nix { python = python; }) - ]; - - doCheck = false; - }; - -in -stdenv.mkDerivation { - name = "voltron-commands"; - phases = [ "installPhase" ]; - buildInputs = [ makeWrapper python ]; - installPhase = '' - mkdir -p "$out/bin" - ln -s ${voltron}/bin/voltron "$out/bin/vol" - makeWrapper "${gdb}/bin/gdb" "$out/bin/voldb" \ - --add-flags "-x $(toPythonPath ${voltron})/voltron/entry.py" \ - --suffix PYTHONPATH : "${python.pkgs.makePythonPath [ voltron ]}" - ''; -} diff --git a/pkgs/voltron/scruffington.nix b/pkgs/voltron/scruffington.nix deleted file mode 100644 index 30e4bfe..0000000 --- a/pkgs/voltron/scruffington.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ fetchFromGitHub, python }: - -python.pkgs.buildPythonPackage rec { - pname = "scruffington"; - version = "0.3.8.2"; - - propagatedBuildInputs = with python.pkgs; [ six pyyaml nose ]; - - src = fetchFromGitHub { - owner = "snare"; - repo = "scruffy"; - rev = "v${version}"; - sha256 = "1v5zq0m0pm0pccsa8qgdi0z74vh8m1ylshxvgmj3ml87p4vd3haw"; - }; -}