Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.03] treewide: remove torch and related packages; add throw aliases #83596

Merged
merged 2 commits into from
Mar 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions pkgs/development/libraries/loadcaffe/default.nix

This file was deleted.

19 changes: 0 additions & 19 deletions pkgs/development/libraries/torch-hdf5/default.nix

This file was deleted.

38 changes: 0 additions & 38 deletions pkgs/development/libraries/torch/default.nix

This file was deleted.

63 changes: 0 additions & 63 deletions pkgs/tools/graphics/fast-neural-doodle/default.nix

This file was deleted.

28 changes: 0 additions & 28 deletions pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh

This file was deleted.

5 changes: 0 additions & 5 deletions pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh

This file was deleted.

58 changes: 0 additions & 58 deletions pkgs/tools/graphics/neural-style/default.nix

This file was deleted.

25 changes: 0 additions & 25 deletions pkgs/tools/graphics/neural-style/neural-style.sh

This file was deleted.

11 changes: 9 additions & 2 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ mapAliases ({
etcdctl = etcd; # added 2018-04-25
exfat-utils = exfat; # 2015-09-11
facette = throw "facette has been removed."; # added 2020-01-06
fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
ffadoFull = ffado; # added 2018-05-01
firefox-esr-wrapper = firefox-esr; # 2016-01
firefox-wrapper = firefox; # 2016-01
Expand Down Expand Up @@ -241,6 +242,7 @@ mapAliases ({
links = links2; # added 2016-01-31
linux_rpi0 = linux_rpi1;
linuxPackages_rpi0 = linuxPackages_rpi1;
loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28
lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31
lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
Expand Down Expand Up @@ -287,10 +289,11 @@ mapAliases ({
networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
nix-review = nixpkgs-review; # added 2019-12-22
neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # added 2020-03-28
nfsUtils = nfs-utils; # added 2014-12-06
nginxUnstable = nginxMainline; # added 2018-04-25
nilfs_utils = nilfs-utils; # added 2018-04-25
nix-review = nixpkgs-review; # added 2019-12-22
nmap_graphical = nmap-graphical; # added 2017-01-19
nologin = shadow; # added 2018-04-25
nxproxy = nx-libs; # added 2019-02-15
Expand Down Expand Up @@ -464,10 +467,14 @@ mapAliases ({
tftp_hpa = tftp-hpa; # added 2015-04-03
tomcat85 = tomcat8; # added 2020-03-11
torbrowser = tor-browser-bundle-bin; # added 2017-04-05
transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28
torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28
torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28
torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28
trang = jing-trang; # added 2018-04-25
transmission_gtk = transmission-gtk; # added 2018-01-06
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
truecrypt = veracrypt; # added 2018-10-24
tshark = wireshark-cli; # added 2018-04-25
ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
Expand Down
15 changes: 0 additions & 15 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3195,11 +3195,6 @@ in

fakechroot = callPackage ../tools/system/fakechroot { };

fast-neural-doodle = callPackage ../tools/graphics/fast-neural-doodle {
inherit (python27Packages) numpy scipy h5py scikitlearn python
pillow;
};

fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { };

fanficfare = callPackage ../tools/text/fanficfare { };
Expand Down Expand Up @@ -5220,8 +5215,6 @@ in

netcdffortran = callPackage ../development/libraries/netcdf-fortran { };

neural-style = callPackage ../tools/graphics/neural-style {};

nco = callPackage ../development/libraries/nco { };

ncftp = callPackage ../tools/networking/ncftp { };
Expand Down Expand Up @@ -13265,8 +13258,6 @@ in

live555 = callPackage ../development/libraries/live555 { };

loadcaffe = callPackage ../development/libraries/loadcaffe {};

log4cpp = callPackage ../development/libraries/log4cpp { };

log4cxx = callPackage ../development/libraries/log4cxx { };
Expand Down Expand Up @@ -14483,12 +14474,6 @@ in

tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };

torch = callPackage ../development/libraries/torch {
openblas = openblasCompat;
};

torch-hdf5 = callPackage ../development/libraries/torch-hdf5 {};

totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { };

tpm2-tss = callPackage ../development/libraries/tpm2-tss { };
Expand Down