movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

nautilus-python: Move from gnome scope to top-level

Browse source
This commit is contained in:
Jan Tojnar 2024-06-13 11:10:24 +02:00
parent 2be24442bb
commit 04393cdded
8 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/programs/nautilus-open-any-terminal.nix
View file

@ -19,7 +19,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnome.nautilus-python nautilus-python
nautilus-open-any-terminal nautilus-open-any-terminal
]; ];
programs.dconf = lib.optionalAttrs (cfg.terminal != null) { programs.dconf = lib.optionalAttrs (cfg.terminal != null) {

4
pkgs/applications/misc/collision/default.nix
View file

@ -5,7 +5,7 @@
, wrapGAppsHook4 , wrapGAppsHook4
, desktopToDarwinBundle , desktopToDarwinBundle
, gobject-introspection , gobject-introspection
, gnome , nautilus-python
, python3 , python3
, libadwaita , libadwaita
, openssl , openssl
@ -54,7 +54,7 @@ crystal.buildCrystalPackage rec {
libadwaita libadwaita
openssl openssl
libxml2 libxml2
gnome.nautilus-python nautilus-python
python3.pkgs.pygobject3 python3.pkgs.pygobject3
]; ];

4
pkgs/by-name/in/insync-nautilus/package.nix
View file

@ -3,7 +3,7 @@
fetchurl, fetchurl,
lib, lib,
dpkg, dpkg,
gnome, nautilus-python,
insync-emblem-icons, insync-emblem-icons,
}: }:
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ dpkg ]; nativeBuildInputs = [ dpkg ];
buildInputs = [ buildInputs = [
gnome.nautilus-python nautilus-python
insync-emblem-icons insync-emblem-icons
]; ];

4
pkgs/by-name/na/nautilus-open-in-blackbox/package.nix
View file

@ -1,4 +1,4 @@
{ python3, fetchFromGitHub, gnome, stdenv, lib }: { python3, fetchFromGitHub, nautilus-python, stdenv, lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nautilus-open-in-blackbox"; pname = "nautilus-open-in-blackbox";
version = "0.1.1"; version = "0.1.1";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
patches = [ ./paths.patch ]; patches = [ ./paths.patch ];
buildInputs = [ buildInputs = [
gnome.nautilus-python nautilus-python
python3.pkgs.pygobject3 python3.pkgs.pygobject3
]; ];

0
pkgs/desktops/gnome/misc/nautilus-python/fix-paths.patch → pkgs/by-name/na/nautilus-python/fix-paths.patch
View file

1
pkgs/desktops/gnome/misc/nautilus-python/default.nix → pkgs/by-name/na/nautilus-python/package.nix
View file

@ -52,7 +52,6 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome.${pname}";
}; };
}; };

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

@ -241,8 +241,6 @@ lib.makeScope pkgs.newScope (self: with self; {
metacity = callPackage ./misc/metacity { }; metacity = callPackage ./misc/metacity { };
nautilus-python = callPackage ./misc/nautilus-python { };
gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; };
pomodoro = callPackage ./misc/pomodoro { }; pomodoro = callPackage ./misc/pomodoro { };
@ -258,6 +256,7 @@ lib.makeScope pkgs.newScope (self: with self; {
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-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-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. 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.
nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13.
nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13.
#### Removals #### Removals
anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16 anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16

4
pkgs/tools/misc/nautilus-open-any-terminal/default.nix
View file

@ -4,8 +4,8 @@
, dconf , dconf
, fetchFromGitHub , fetchFromGitHub
, glib , glib
, gnome
, nautilus , nautilus
, nautilus-python
, gobject-introspection , gobject-introspection
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gtk3 , gtk3
@ -39,7 +39,7 @@ python3.pkgs.buildPythonPackage rec {
dbus dbus
dconf dconf
nautilus nautilus
gnome.nautilus-python nautilus-python
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
python3.pkgs.pygobject3 python3.pkgs.pygobject3