fc.qemu: remove deprecated pre-ceph-Nautilus packages

flyingcircusio · Sep 13, 2023 · c38de5b · c38de5b
1 parent 6ce9d9f
commit c38de5b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 76 deletions.
diff --git a/nixos/lib/ceph-common.nix b/nixos/lib/ceph-common.nix
@@ -18,7 +18,7 @@ let
       ceph-client = pkgs.ceph-nautilus.ceph-client;
       # both the C lib and the python modules
       libceph = pkgs.ceph-nautilus.libceph;
-      fcQemu = pkgs.fc.qemu-py3.override {
+      fcQemu = pkgs.fc.qemu.override {
         inherit libceph ceph;
         qemu_ceph = qemu_ceph_versioned "nautilus";
       };

diff --git a/pkgs/fc/default.nix b/pkgs/fc/default.nix
@@ -38,16 +38,7 @@ rec {
   megacli = callPackage ./megacli { };
   multiping = callPackage ./multiping.nix {};
 
-  qemu-py2 = callPackage ./qemu/py2.nix {
-      version = "1.2-dev";
-      src = pkgs.fetchFromGitHub {
-        owner = "flyingcircusio";
-        repo = "fc.qemu";
-        rev = "bcf373c57a39bb373f45022cae4015221e9aa94f";
-        hash = "sha256-4rIwMzsYYvKGGybkFFu3z0D/RD8LXIJP5GG0oB9lxpc";
-      };
-  };
-  qemu-py3 = callPackage ./qemu/py3.nix rec {
+  qemu = callPackage ./qemu rec {
     version = "1.3.1";
     # src = /path/to/fc.qemu/checkout ; # development
     src = pkgs.fetchFromGitHub {

diff --git a/pkgs/fc/qemu/py3.nix → pkgs/fc/qemu/default.nix b/pkgs/fc/qemu/py3.nix → pkgs/fc/qemu/default.nix
diff --git a/pkgs/fc/qemu/py2.nix b/pkgs/fc/qemu/py2.nix