diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2023-07-05 03:07:20 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2023-07-05 14:56:27 +0200 |
commit | 6bbcd65c4486d09395e37ce10fbbcb9b3f58c371 (patch) | |
tree | c2ddfd339769d2ba7b0c748d371d3580b79026ba | |
parent | ca73307a6699e193caafc949d587e88b9bf55e83 (diff) | |
download | nixpkgs-6bbcd65c4486d09395e37ce10fbbcb9b3f58c371.tar nixpkgs-6bbcd65c4486d09395e37ce10fbbcb9b3f58c371.tar.gz nixpkgs-6bbcd65c4486d09395e37ce10fbbcb9b3f58c371.tar.bz2 nixpkgs-6bbcd65c4486d09395e37ce10fbbcb9b3f58c371.tar.lz nixpkgs-6bbcd65c4486d09395e37ce10fbbcb9b3f58c371.tar.xz nixpkgs-6bbcd65c4486d09395e37ce10fbbcb9b3f58c371.tar.zst nixpkgs-6bbcd65c4486d09395e37ce10fbbcb9b3f58c371.zip |
gedit: Move out of GNOME
It has been moved out of GNOME core in favour of gnome-text-editor. And it is not much of a GNOME app anymore either, using custom gtksourceview fork.
-rw-r--r-- | nixos/tests/noto-fonts.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/gedit/correct-gir-lib-path.patch (renamed from pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/gedit/default.nix (renamed from pkgs/desktops/gnome/apps/gedit/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 4 insertions, 3 deletions
diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix index 0515f16d101..893522df24f 100644 --- a/nixos/tests/noto-fonts.nix +++ b/nixos/tests/noto-fonts.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { nodes.machine = { imports = [ ./common/x11.nix ]; - environment.systemPackages = [ pkgs.gnome.gedit ]; + environment.systemPackages = [ pkgs.gedit ]; fonts = { enableDefaultFonts = false; fonts = with pkgs;[ diff --git a/pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch b/pkgs/applications/editors/gedit/correct-gir-lib-path.patch index b3689e42066..b3689e42066 100644 --- a/pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch +++ b/pkgs/applications/editors/gedit/correct-gir-lib-path.patch diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index 3d79656d258..3d79656d258 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 62af89161e7..3b827dcb276 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -150,8 +150,6 @@ lib.makeScope pkgs.newScope (self: with self; { file-roller = callPackage ./apps/file-roller { }; - gedit = callPackage ./apps/gedit { }; - ghex = callPackage ./apps/ghex { }; gnome-boxes = callPackage ./apps/gnome-boxes { }; @@ -263,6 +261,7 @@ lib.makeScope pkgs.newScope (self: with self; { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. empathy = throw "The ‘gnome.empathy’ package was removed as it is unmaintained and no longer launches due to libsoup3 migration."; # added 2023-01-20 + gedit = pkgs.gedit; # added 2023-07-05 gnome-desktop = throw "The ‘gnome.gnome-desktop’ alias was removed. Please use ‘pkgs.gnome-desktop’ directly."; # converted to throw on 2022-10-26 gnome-todo = pkgs.endeavour; # added 2022-07-30 libgnome-games-support = throw "The ‘gnome.libgnome-games-support’ alias was removed. Please use ‘pkgs.libgnome-games-support’ directly."; # converted to throw on 2022-10-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39d0d69d75e..d27bb4d134b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39004,6 +39004,8 @@ with pkgs; guile = guile_2_0; }; + gedit = callPackage ../applications/editors/gedit { }; + gerbv = callPackage ../applications/science/electronics/gerbv { cairo = cairo.override { x11Support = true; }; }; |