Remove the idea of "system dependencies"

Because we want to be able to work on different distros, we cannot have
a concept of "system dependencies", because each distro names their
packages differently.

The concept of installing stuff from a distro image can still be
accomplished easily via environment variables.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

4 files changed, 0 insertions, 104 deletions

diff --git a/src/package/dependency/mod.rs b/src/package/dependency/mod.rs
index 6d4cb81..248ebb4 100644
--- a/src/package/dependency/mod.rs
+++ b/src/package/dependency/mod.rs
@@ -12,12 +12,6 @@ pub use build::*;
 mod runtime;
 pub use runtime::*;
 
-mod system;
-pub use system::*;
-
-mod system_runtime;
-pub use system_runtime::*;
-
 pub trait StringEqual {
     fn str_equal(&self, s: &str) -> bool;
 }
diff --git a/src/package/dependency/system.rs b/src/package/dependency/system.rs
deleted file mode 100644
index 689f0d8..0000000
--- a/src/package/dependency/system.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use anyhow::Result;
-use serde::Deserialize;
-use serde::Serialize;
-
-use crate::package::PackageName;
-use crate::package::PackageVersionConstraint;
-use crate::package::dependency::ParseDependency;
-use crate::package::dependency::StringEqual;
-
-/// A dependency that can be installed from the system and is only required during build
-#[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
-#[serde(transparent)]
-pub struct SystemBuildDependency(String);
-
-impl AsRef<str> for SystemBuildDependency {
-    fn as_ref(&self) -> &str {
-        self.0.as_ref()
-    }
-}
-
-impl StringEqual for SystemBuildDependency {
-    fn str_equal(&self, s: &str) -> bool {
-        self.0 == s
-    }
-}
-
-impl ParseDependency for SystemBuildDependency {
-    fn parse_as_name_and_version(&self) -> Result<(PackageName, PackageVersionConstraint)> {
-        crate::package::dependency::parse_package_dependency_string_into_name_and_version(&self.0)
-    }
-}
-
diff --git a/src/package/dependency/system_runtime.rs b/src/package/dependency/system_runtime.rs
deleted file mode 100644
index 17ef5d5..0000000
--- a/src/package/dependency/system_runtime.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use anyhow::Result;
-use serde::Deserialize;
-use serde::Serialize;
-
-use crate::package::PackageName;
-use crate::package::PackageVersionConstraint;
-use crate::package::dependency::ParseDependency;
-use crate::package::dependency::StringEqual;
-
-/// A dependency that can be installed from the system and is required during runtime
-#[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
-#[serde(transparent)]
-pub struct SystemDependency(String);
-
-impl AsRef<str> for SystemDependency {
-    fn as_ref(&self) -> &str {
-        self.0.as_ref()
-    }
-}
-
-impl StringEqual for SystemDependency {
-    fn str_equal(&self, s: &str) -> bool {
-        self.0 == s
-    }
-}
-
-impl ParseDependency for SystemDependency {
-    fn parse_as_name_and_version(&self) -> Result<(PackageName, PackageVersionConstraint)> {
-        crate::package::dependency::parse_package_dependency_string_into_name_and_version(&self.0)
-    }
-}
-
diff --git a/src/package/package.rs b/src/package/package.rs
index 698b8b1..9e19079 100644
--- a/src/package/package.rs
+++ b/src/package/package.rs
@@ -73,30 +73,6 @@ impl Package {
         self.dependencies = dependencies;
     }
 
-    /// Get all dependencies of the package
-    ///
-    /// Either return the list of dependencies or, if available, run the dependencies_script to
-    /// read the dependencies from there.
-    pub fn get_all_dependencies<'a>(&'a self) -> impl Iterator<Item = Result<(PackageName, PackageVersionConstraint)>> + 'a {
-        self.get_system_dependencies().chain(self.get_self_packaged_dependencies())
-    }
-
-    pub fn get_system_dependencies<'a>(&'a self) -> impl Iterator<Item = Result<(PackageName, PackageVersionConstraint)>> + 'a {
-        let system_iter = self.dependencies()
-            .system()
-            .iter()
-            .cloned()
-            .map(|d| d.parse_as_name_and_version());
-
-        let system_runtime_iter = self.dependencies()
-            .system_runtime()
-            .iter()
-            .cloned()
-            .map(|d| d.parse_as_name_and_version());
-
-        system_iter.chain(system_runtime_iter)
-    }
-
     pub fn get_self_packaged_dependencies<'a>(&'a self) -> impl Iterator<Item = Result<(PackageName, PackageVersionConstraint)>> + 'a {
         let build_iter = self.dependencies()
             .build()
@@ -154,12 +130,6 @@ pub struct PackageFlags {
 #[derive(Clone, Debug, Serialize, Deserialize, Getters)]
 pub struct Dependencies {
     #[getset(get = "pub")]
-    system: Vec<SystemBuildDependency>,
-
-    #[getset(get = "pub")]
-    system_runtime: Vec<SystemDependency>,
-
-    #[getset(get = "pub")]
     build: Vec<BuildDependency>,
 
     #[getset(get = "pub")]
@@ -170,8 +140,6 @@ pub struct Dependencies {
 impl Dependencies {
     pub fn empty() -> Self {
         Dependencies {
-            system: vec![],
-            system_runtime: vec![],
             build: vec![],
             runtime: vec![],
         }
@@ -183,8 +151,6 @@ impl Dependencies {
 
     pub fn with_runtime_dependencies(runtime_dependencies: Vec<Dependency>) -> Self {
         Dependencies {
-            system: vec![],
-            system_runtime: vec![],
             build: vec![],
             runtime: runtime_dependencies,
         }