aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQyriad <qyriad@qyriad.me>2024-06-17 14:45:10 -0600
committerQyriad <qyriad@qyriad.me>2024-06-20 17:00:06 +0000
commite44dcd63c4d96807536cdcf2afb688a537cce9be (patch)
tree6f2a2de71aa296868f17434483f5e29724c4b39d
parent6515b1a4954131010a7b19acf98dc010dde647d0 (diff)
remove InstallableValueCommand class
Change-Id: Id12383f4741cba07159712700ebcfbe37e61560c
-rw-r--r--src/libcmd/command-installable-value.cc11
-rw-r--r--src/libcmd/command-installable-value.hh23
-rw-r--r--src/libcmd/meson.build2
-rw-r--r--src/nix/develop.cc2
4 files changed, 1 insertions, 37 deletions
diff --git a/src/libcmd/command-installable-value.cc b/src/libcmd/command-installable-value.cc
deleted file mode 100644
index 7e0c15eb8..000000000
--- a/src/libcmd/command-installable-value.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "command-installable-value.hh"
-
-namespace nix {
-
-void InstallableValueCommand::run(ref<Store> store, ref<Installable> installable)
-{
- auto installableValue = InstallableValue::require(installable);
- run(store, installableValue);
-}
-
-}
diff --git a/src/libcmd/command-installable-value.hh b/src/libcmd/command-installable-value.hh
deleted file mode 100644
index 7880d4119..000000000
--- a/src/libcmd/command-installable-value.hh
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-///@file
-
-#include "installable-value.hh"
-#include "command.hh"
-
-namespace nix {
-
-/**
- * An InstallableCommand where the single positional argument must be an
- * InstallableValue in particular.
- */
-struct InstallableValueCommand : InstallableCommand
-{
- /**
- * Entry point to this command
- */
- virtual void run(ref<Store> store, ref<InstallableValue> installable) = 0;
-
- void run(ref<Store> store, ref<Installable> installable) override;
-};
-
-}
diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build
index 3d92f36a4..73deb035c 100644
--- a/src/libcmd/meson.build
+++ b/src/libcmd/meson.build
@@ -1,6 +1,5 @@
libcmd_sources = files(
'built-path.cc',
- 'command-installable-value.cc',
'cmd-profiles.cc',
'command.cc',
'common-eval-args.cc',
@@ -18,7 +17,6 @@ libcmd_sources = files(
libcmd_headers = files(
'built-path.hh',
- 'command-installable-value.hh',
'cmd-profiles.hh',
'command.hh',
'common-eval-args.hh',
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 90bdf3bed..353bf0110 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -1,6 +1,6 @@
#include "eval.hh"
#include "installable-flake.hh"
-#include "command-installable-value.hh"
+#include "command.hh"
#include "common-args.hh"
#include "shared.hh"
#include "store-api.hh"