ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 21:18:28 +03:00
Code Issues Projects Releases Wiki Activity

file-roller: Move from gnome scope to top-level

Browse Source
This commit is contained in:
Jan Tojnar 2024-06-13 23:31:15 +02:00
parent b91d4ead2a
commit 85a1179dab
8 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/file-roller.nix
View File

@ -14,7 +14,7 @@ in {
enable = lib.mkEnableOption "File Roller, an archive manager for GNOME";
package = lib.mkPackageOption pkgs [ "gnome" "file-roller" ] { };
package = lib.mkPackageOption pkgs "file-roller" { };
};

2
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -231,7 +231,7 @@ in
(mkIf serviceCfg.apps.enable {
programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility);
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [
# cinnamon team apps

2
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -433,7 +433,7 @@ in
# enable that program module if the package hasn't been excluded
# through `environment.gnome.excludePackages`
programs.evince.enable = notExcluded pkgs.gnome.evince;
programs.file-roller.enable = notExcluded pkgs.gnome.file-roller;
programs.file-roller.enable = notExcluded pkgs.file-roller;
programs.geary.enable = notExcluded pkgs.gnome.geary;
programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility;
programs.seahorse.enable = notExcluded pkgs.gnome.seahorse;

2
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -285,7 +285,7 @@ in
(mkIf serviceCfg.apps.enable {
programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince);
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
environment.systemPackages = utils.removePackagesByName ([
pkgs.gnome.gnome-font-viewer

1
pkgs/desktops/gnome/apps/file-roller/default.nix → pkgs/by-name/fi/file-roller/package.nix
View File

@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
updateScript = gnome.updateScript {
packageName = "file-roller";
attrPath = "gnome.file-roller";
};
};

4
pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
View File

@ -7,7 +7,7 @@
, glib
, gtk3
, nemo
, gnome
, file-roller
, cinnamon-translations
}:
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/nemo-fileroller.c \
--replace "file-roller" "${lib.getExe gnome.file-roller}" \
--replace "file-roller" "${lib.getExe file-roller}" \
--replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale"
'';

3
pkgs/desktops/gnome/default.nix
View File

@ -141,8 +141,6 @@ lib.makeScope pkgs.newScope (self: with self; {
cheese = callPackage ./apps/cheese { };
file-roller = callPackage ./apps/file-roller { };
ghex = callPackage ./apps/ghex { };
gnome-boxes = callPackage ./apps/gnome-boxes { };
@ -251,6 +249,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27
gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27
file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13.
gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13.
gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13.
gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13.

6
pkgs/desktops/pantheon/default.nix
View File

@ -103,9 +103,7 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { };
file-roller-contract = callPackage ./desktop/file-roller-contract {
inherit (gnome) file-roller;
};
file-roller-contract = callPackage ./desktop/file-roller-contract { };
gala = callPackage ./desktop/gala { };
@ -240,7 +238,7 @@ lib.makeScope pkgs.newScope (self: with self; {
extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01
file-roller = pkgs.gnome.file-roller; # added 2022-03-12
file-roller = pkgs.file-roller; # added 2022-03-12
gnome-bluetooth-contract = throw "pantheon.gnome-bluetooth-contract has been removed, abandoned by upstream."; # added 2022-06-30