swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #292320 from pongo1231/distrobox-1.7.0

Browse source 
distrobox: 1.6.0.1 -> 1.7.1
This commit is contained in:
Weijia Wang 2024-03-30 23:28:12 +01:00 committed by GitHub
parent b31887d86c 489c200664
commit 77f944385a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
pkgs/applications/virtualization/distrobox/always-mount-nix.patch
View file

@ -1,137 +0,0 @@
diff --git a/distrobox-create b/distrobox-create
index 64e9911..136659d 100755
--- a/distrobox-create
+++ b/distrobox-create
@@ -74,6 +74,10 @@ unshare_ipc=0
unshare_netns=0
unshare_process=0
unshare_devsys=0
+
+self_dir="$(dirname "$(realpath "$0")")"
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
+
# Use cd + dirname + pwd so that we do not have relative paths in mount points
# We're not using "realpath" here so that symlinks are not resolved this way
# "realpath" would break situations like Nix or similar symlink based package
@@ -98,6 +102,7 @@ version="1.6.0.1"
# priority over system defaults
# leave priority to environment variables.
config_files="
+ $nix_config_file
/usr/share/distrobox/distrobox.conf
/usr/share/defaults/distrobox/distrobox.conf
/usr/etc/distrobox/distrobox.conf
diff --git a/distrobox-enter b/distrobox-enter
index 6d8998a..bb05437 100755
--- a/distrobox-enter
+++ b/distrobox-enter
@@ -75,10 +75,14 @@ skip_workdir=0
verbose=0
version="1.6.0.1"
+self_dir="$(dirname "$(realpath "$0")")"
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
+
# Source configuration files, this is done in an hierarchy so local files have
# priority over system defaults
# leave priority to environment variables.
config_files="
+ $nix_config_file
/usr/share/distrobox/distrobox.conf
/usr/share/defaults/distrobox/distrobox.conf
/usr/etc/distrobox/distrobox.conf
diff --git a/distrobox-generate-entry b/distrobox-generate-entry
index 3243691..6a7910a 100755
--- a/distrobox-generate-entry
+++ b/distrobox-generate-entry
@@ -45,10 +45,14 @@ icon_default="${HOME}/.local/share/icons/terminal-distrobox-icon.svg"
verbose=0
version="1.6.0.1"
+self_dir="$(dirname "$(realpath "$0")")"
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
+
# Source configuration files, this is done in an hierarchy so local files have
# priority over system defaults
# leave priority to environment variables.
config_files="
+ $nix_config_file
/usr/share/distrobox/distrobox.conf
/usr/share/defaults/distrobox/distrobox.conf
/usr/etc/distrobox/distrobox.conf
diff --git a/distrobox-list b/distrobox-list
index aaec85e..235e529 100755
--- a/distrobox-list
+++ b/distrobox-list
@@ -44,10 +44,14 @@ verbose=0
version="1.6.0.1"
container_manager="autodetect"
+self_dir="$(dirname "$(realpath "$0")")"
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
+
# Source configuration files, this is done in an hierarchy so local files have
# priority over system defaults
# leave priority to environment variables.
config_files="
+ $nix_config_file
/usr/share/distrobox/distrobox.conf
/usr/share/defaults/distrobox/distrobox.conf
/usr/etc/distrobox/distrobox.conf
diff --git a/distrobox-rm b/distrobox-rm
index 702c1dd..2e37538 100755
--- a/distrobox-rm
+++ b/distrobox-rm
@@ -54,10 +54,14 @@ rm_home=0
response_rm_home="N"
version="1.6.0.1"
+self_dir="$(dirname "$(realpath "$0")")"
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
+
# Source configuration files, this is done in an hierarchy so local files have
# priority over system defaults
# leave priority to environment variables.
config_files="
+ $nix_config_file
/usr/share/distrobox/distrobox.conf
/usr/share/defaults/distrobox/distrobox.conf
/usr/etc/distrobox/distrobox.conf
diff --git a/distrobox-stop b/distrobox-stop
index fd17cc1..e0dbc8f 100755
--- a/distrobox-stop
+++ b/distrobox-stop
@@ -52,10 +52,14 @@ non_interactive=0
verbose=0
version="1.6.0.1"
+self_dir="$(dirname "$(realpath "$0")")"
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
+
# Source configuration files, this is done in an hierarchy so local files have
# priority over system defaults
# leave priority to environment variables.
config_files="
+ $nix_config_file
/usr/share/distrobox/distrobox.conf
/usr/share/defaults/distrobox/distrobox.conf
/usr/etc/distrobox/distrobox.conf
diff --git a/distrobox-upgrade b/distrobox-upgrade
index ab5e96f..dc8d295 100755
--- a/distrobox-upgrade
+++ b/distrobox-upgrade
@@ -39,10 +39,14 @@ rootful=0
verbose=0
version="1.6.0.1"
+self_dir="$(dirname "$(realpath "$0")")"
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
+
# Source configuration files, this is done in an hierarchy so local files have
# priority over system defaults
# leave priority to environment variables.
config_files="
+ $nix_config_file
/usr/share/distrobox/distrobox.conf
/usr/share/defaults/distrobox/distrobox.conf
/usr/etc/distrobox/distrobox.conf

7
pkgs/applications/virtualization/distrobox/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "distrobox";
version = "1.6.0.1";
version = "1.7.1";
src = fetchFromGitHub {
owner = "89luca89";
repo = "distrobox";
rev = finalAttrs.version;
hash = "sha256-UWrXpb20IHcwadPpwbhSjvOP1MBXic5ay+nP+OEVQE4=";
hash = "sha256-mSka8QyoLjnaVEP23TtyzbPTBHDlnrSomVZdfw4PPng=";
};
dontConfigure = true;
@ -16,9 +16,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
nativeBuildInputs = [ makeWrapper ];
# https://github.com/89luca89/distrobox/pull/1080
patches = [ ./always-mount-nix.patch ];
installPhase = ''
runHook preInstall