From 7c2a459244b0592fa36184c193193dde8d033297 Mon Sep 17 00:00:00 2001 From: kyren Date: Tue, 8 Nov 2022 08:31:21 -0500 Subject: [PATCH] aseprite: drop free version and alias to unfree version The free version of Aseprite has a maintained fork, LibreSprite which is already packaged in nixpkgs. The only really useful version of Aseprite vs LibreSprite is the unfree version, and the free version will never receive updates. --- .../manual/release-notes/rl-2311.section.md | 2 ++ .../editors/aseprite/allegro-glibc-2.30.patch | 8 ------ .../applications/editors/aseprite/default.nix | 28 ++++++------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 5 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index dd7b57022ccd..e9597e6b7224 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -151,6 +151,8 @@ - The `go-ethereum` package has been updated to v1.12.0. This drops support for proof-of-work. Its GraphQL API now encodes all numeric values as hex strings and the GraphQL UI is updated to version 2.0. The default database has changed from `leveldb` to `pebble` but `leveldb` can be forced with the --db.engine=leveldb flag. The `checkpoint-admin` command was [removed along with trusted checkpoints](https://github.com/ethereum/go-ethereum/pull/27147). +- The `aseprite-unfree` package has been upgraded from 1.2.16.3 to 1.2.40. The free version of aseprite has been dropped because it is EOL and the package attribute now points to the unfree version. A maintained fork of the last free version of Aseprite, named 'LibreSprite', is available in the `libresprite` package. + - The default `kops` version is now 1.27.0 and support for 1.24 and older has been dropped. - `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. diff --git a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch deleted file mode 100644 index 94c70da276c9..000000000000 --- a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt -index 4909ff1..02fa145 100644 ---- a/src/she/CMakeLists.txt -+++ b/src/she/CMakeLists.txt -@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND) - add_definitions(-DUSE_MOUSE_POLLER) -+ add_definitions(-DALLEGRO_NO_FIX_ALIASES) - endif() diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 99a1c8adec43..36415d076d9d 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -2,7 +2,6 @@ , curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , harfbuzzFull, glib, fontconfig, pcre , libX11, libXext, libXcursor, libXxf86vm, libGL, libXi -, unfree ? false , cmark }: @@ -15,41 +14,34 @@ let in stdenv.mkDerivation rec { pname = "aseprite"; - version = if unfree then "1.2.40" else "1.1.7"; + version = "1.2.40"; src = fetchFromGitHub { owner = "aseprite"; repo = "aseprite"; rev = "v${version}"; fetchSubmodules = true; - hash = if unfree - then "sha256-KUdJA6HTAKrLT8xrwFikVDbc5RODysclcsEyQekMRZo=" - else "sha256-sRFuuY6cmVRE7myelGREMrzaQ09Olq74XP8uoS1NpD0="; + hash = "sha256-KUdJA6HTAKrLT8xrwFikVDbc5RODysclcsEyQekMRZo="; }; nativeBuildInputs = [ - cmake pkg-config - ] ++ lib.optionals unfree [ ninja ]; + cmake pkg-config ninja + ]; buildInputs = [ curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib libX11 libXext libXcursor libXxf86vm - ] ++ lib.optionals unfree [ cmark harfbuzzFull glib fontconfig pcre skia libGL libXi ]; - patches = lib.optionals (!unfree) [ - ./allegro-glibc-2.30.patch - ] ++ lib.optionals unfree [ + patches = [ ./shared-libwebp.patch ./shared-skia-deps.patch ]; - postPatch = if (!unfree) then '' - sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-" - '' else '' + postPatch = '' sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" ''; @@ -64,9 +56,6 @@ stdenv.mkDerivation rec { "-DUSE_SHARED_PIXMAN=ON" "-DUSE_SHARED_TINYXML=ON" "-DUSE_SHARED_ZLIB=ON" - "-DWITH_DESKTOP_INTEGRATION=ON" - "-DWITH_WEBP_SUPPORT=ON" - ] ++ lib.optionals unfree [ "-DUSE_SHARED_CMARK=ON" "-DUSE_SHARED_HARFBUZZ=ON" "-DUSE_SHARED_WEBP=ON" @@ -99,7 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.aseprite.org/"; description = "Animated sprite editor & pixel art tool"; - license = if unfree then licenses.unfree else licenses.gpl2; + license = licenses.unfree; longDescription = ''Aseprite is a program to create animated sprites. Its main features are: @@ -113,8 +102,7 @@ stdenv.mkDerivation rec { - Multiple editors support. - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - Onion skinning. - '' + lib.optionalString unfree - '' + This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/ Consider supporting the developer: https://aseprite.org/#buy ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 70b39b5c52b7..2fb5821d9100 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -96,6 +96,7 @@ mapAliases ({ arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 arora = throw "arora has been removed"; # Added 2020-09-09 asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 + aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 asterisk_13 = throw "asterisk_13: Asterisk 13 is end of life and has been removed"; # Added 2022-04-06 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ac765789580..588e96587f9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30556,7 +30556,6 @@ with pkgs; asap = callPackage ../tools/audio/asap { }; aseprite = callPackage ../applications/editors/aseprite { }; - aseprite-unfree = aseprite.override { unfree = true; }; assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { };