about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-03-22 19:20:48 +0200
committerGitHub <noreply@github.com>2023-03-22 19:20:48 +0200
commit2cc556e4fe2dd7bd36cc6e6cb4f7419228063b8f (patch)
tree6a5f7a5a6ff5e117ceced165b2c2113cbde24a49 /pkgs
parenteed3be2c599ce70bd427e5fdb3d43299f9bd6f76 (diff)
parentea97d50ff088aaa1169eebadccb0fbcba6ecafde (diff)
downloadnixlib-2cc556e4fe2dd7bd36cc6e6cb4f7419228063b8f.tar
nixlib-2cc556e4fe2dd7bd36cc6e6cb4f7419228063b8f.tar.gz
nixlib-2cc556e4fe2dd7bd36cc6e6cb4f7419228063b8f.tar.bz2
nixlib-2cc556e4fe2dd7bd36cc6e6cb4f7419228063b8f.tar.lz
nixlib-2cc556e4fe2dd7bd36cc6e6cb4f7419228063b8f.tar.xz
nixlib-2cc556e4fe2dd7bd36cc6e6cb4f7419228063b8f.tar.zst
nixlib-2cc556e4fe2dd7bd36cc6e6cb4f7419228063b8f.zip
Merge pull request #222564 from wegank/ogre-1-9-drop
ogre1_9: drop
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 62bb08e5bfba..bc364eac457c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1107,6 +1107,7 @@ mapAliases ({
   ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12
   odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
   ofp = throw "ofp is not compatible with odp-dpdk";
+  ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22
   olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
   opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
   opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8296a6798fa8..93ce980bee16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22613,7 +22613,6 @@ with pkgs;
 
   mygui = callPackage ../development/libraries/mygui {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
-    ogre = ogre1_9;
   };
 
   mythes = callPackage ../development/libraries/mythes { };
@@ -22767,7 +22766,6 @@ with pkgs;
   ogre = callPackage ../development/libraries/ogre {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
-  ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix { };
   ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix { };
 
   olm = callPackage ../development/libraries/olm { };