Skip to content

Commit

Permalink
Merge pull request #1015 from mitchmindtree/remove-nannou-new-nannou-…
Browse files Browse the repository at this point in the history
…pacakge

Remove old `nannou-new` and `nannou-package` crates
  • Loading branch information
mitchmindtree authored Mar 5, 2025
2 parents 6bd0014 + 1c75ec8 commit a88f731
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 1,238 deletions.
694 changes: 14 additions & 680 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ members = [
"nannou_audio",
"nannou_core",
"nannou_laser",
"nannou_new",
"nannou_osc",
"nannou_package",
"nannou_wgpu",
"nature_of_code",
"scripts/run_all_examples",
Expand Down
10 changes: 0 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,6 @@ The following nannou **libraries** are included within this repository.
| [**`nannou_osc`**](./nannou_osc) | [![Crates.io](https://img.shields.io/crates/v/nannou_osc.svg)](https://crates.io/crates/nannou_osc) [![docs.rs](https://docs.rs/nannou_osc/badge.svg)](https://docs.rs/nannou_osc/) | Simple OSC sender and receiver. |
| [**`nannou_wgpu`**](./nannou_wgpu) | [![Crates.io](https://img.shields.io/crates/v/nannou_wgpu.svg)](https://crates.io/crates/nannou_wgpu) [![docs.rs](https://docs.rs/nannou_wgpu/badge.svg)](https://docs.rs/nannou_wgpu/) | WGPU helpers and extensions. |

## Tools

A couple of tools are also included, though there some issues we would like to
address before we can recommend using them just yet!

| **Tool** | **Links** | **Description** |
| --- | --- | --- |
| [**`nannou_new`**](./nannou_new) | [![Crates.io](https://img.shields.io/crates/v/nannou_new.svg)](https://crates.io/crates/nannou_new) | A nannou project generator. |
| [**`nannou_package`**](./nannou_package) | [![Crates.io](https://img.shields.io/crates/v/nannou_package.svg)](https://crates.io/crates/nannou_package) | For packaging nannou apps for distribution. |

## Links

- [Website](https://www.nannou.cc/)
Expand Down
6 changes: 3 additions & 3 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
, libxkbcommon
, llvmPackages
, makeWrapper
, openssl
, pkg-config
, rustPlatform
, vulkan-loader
, vulkan-validation-layers
, xorg
, openssl
, stdenv
, udev
, XCURSOR_THEME ? "Adwaita"
Expand Down Expand Up @@ -42,11 +42,11 @@ rustPlatform.buildRustPackage rec {
];

buildInputs = ([
ffmpeg
# For filtering `cargo metadata` to get example names.
jq
# `nannou-new` needs this because of `cargo` dep. See #606.
# Needed by `reqwest`, used in `generative_design` wikipedia example.
openssl
ffmpeg
] ++ lib.optionals stdenv.isLinux [
alsa-lib
udev
Expand Down
16 changes: 0 additions & 16 deletions nannou_new/Cargo.toml

This file was deleted.

9 changes: 0 additions & 9 deletions nannou_new/README.md

This file was deleted.

258 changes: 0 additions & 258 deletions nannou_new/src/main.rs

This file was deleted.

17 changes: 0 additions & 17 deletions nannou_package/Cargo.toml

This file was deleted.

30 changes: 0 additions & 30 deletions nannou_package/README.md

This file was deleted.

Loading

0 comments on commit a88f731

Please # to comment.