s/pyroscope/pyrosimple

flake.lock

@@ -458,22 +458,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1659914493,
-        "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-21.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-wayland": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -525,7 +509,6 @@
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs",
         "nixpkgs-mozilla": "nixpkgs-mozilla",
-        "nixpkgs-stable": "nixpkgs-stable_2",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "timesync": "timesync"
       }

flake.nix

@@ -7,7 +7,6 @@
     emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
     nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
     nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-21.05";
     nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
     nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
     agenix.url = "github:ryantm/agenix";
@@ -22,7 +21,7 @@
     };
   };
   outputs = inputs@{ nixpkgs, home-manager, nixpkgs-mozilla, emacs-overlay
-                   , nixpkgs-wayland, nixpkgs-stable, nixos-hardware, agenix, flake-utils
+                   , nixpkgs-wayland, nixos-hardware, agenix, flake-utils
                      , nix-index-database, nix-npm-buildpackage, timesync
                    , self
     , ... }:
@@ -107,11 +106,6 @@
           (import ./pkgs)
           (import ./pkgs/mdr.nix)
           (final: prev: {
-            nixpkgs-stable = import nixpkgs-stable {
-              system = prev.stdenv.system;
-              config = { };
-              overlays = [ ];
-            };
             flake-inputs = inputs;
             nix-npm-buildpackage = nix-npm-buildpackage.legacyPackages."${final.system}";
           })

nixos/machines/frumar/default.nix

@@ -296,7 +296,7 @@
     magic-wormhole
     python3
     ranger
-    pyroscope
+    pyrosimple
     rtorrent
     jq
     mcrcon

pkgs/default.nix

@@ -3,8 +3,6 @@
   yori-cc = super.callPackage ./yori-cc.nix { };
 
   ftb = super.callPackage ./ftb.nix {};
-  # todo: python 2 -> 3
-  pyroscope = self.nixpkgs-stable.callPackage ./pyroscope {};
 
   yscripts = super.callPackage ../bin {};
   factorio = super.factorio.override {

pkgs/pyroscope/default.nix

@@ -1,52 +0,0 @@
-{ fetchurl, fetchFromGitHub, python2 }:
-let
-  python2Packages = (python2.override {
-    packageOverrides = self: super: {
-      platformdirs = with self; (super.buildPythonPackage rec {
-        pname = "platformdirs";
-        version = "2.0.2";
-        src = fetchFromGitHub {
-          owner = pname;
-          repo = pname;
-          rev = version;
-          sha256 = "04gjhd6msdbqq8xm7x2vwlgldrxvvrvi86yq7g81dxlpzcwdyay8";
-        };
-        SETUPTOOLS_SCM_PRETEND_VERSION = version;
-        nativeBuildInputs = [ setuptools-scm ];
-        doCheck = false;
-      });
-	    ProxyTypes = super.buildPythonPackage rec {
-	      pname = "ProxyTypes";
-        version = "0.10.0";
-        src = self.fetchPypi {
-          inherit pname version;
-	        sha256 = "11cr6c39vq9fky4c4h2ai2v2dva8fk4cfhaja0mrh4y9wzal3k42";
-        };
-	    };
-	    pyrobase = super.buildPythonApplication rec {
-        pname = "pyrobase";
-        version = "0.5.2";
-	      src = fetchFromGitHub {
-  	      repo = pname; owner = "pyroscope";
-          rev = "v${version}";
-  	      sha256 = "170lsls3dmhlfa5abk40l365pk8486w48vkxjgs3pnqnhpp67z18";
-	      };
-	      doCheck = false;
-	      buildInputs = with self;[six paver];
-	    };
-    };
-  }).pkgs;
-in
-with python2Packages;
-buildPythonApplication rec {
-  pname = "pyrocore";
-  version = "0.5.3";
-  src = fetchFromGitHub {
-  	repo = pname; owner = "pyroscope";
-    rev = "v${version}";
-  	sha256 = "0yg11nhrx8jzx8g09npf0pcpiscyh35nahhw473mir418plji5jw";
-  };
-  doCheck = false; # hmm
-  buildInputs = [paver];
-  propagatedBuildInputs = [six pyrobase ProxyTypes setuptools];
-}

pkgs/pyroscope/fix_readme.diff

@@ -1,13 +0,0 @@
-diff --git a/pavement.py b/pavement.py
-index 8b0fab6..c466ce4 100644
---- a/pavement.py
-+++ b/pavement.py
-@@ -54,7 +54,7 @@ project = dict(
-     zip_safe = True,
-     data_files = [
-         ("EGG-INFO", [
--            "README", "LICENSE", "debian/changelog",
-+            "README.rst", "LICENSE", "debian/changelog",
-         ]),
-     ],
-