From 089ab038b86c7c1cda887528cdf42811d9a80f09 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 26 Aug 2023 04:20:00 +0000 Subject: [PATCH 1/5] earlybird: 1.25.0 -> 3.16.0 --- pkgs/tools/security/earlybird/default.nix | 20 ++++++++++++------- .../earlybird/fix-go.mod-dependency.patch | 13 ++++++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 pkgs/tools/security/earlybird/fix-go.mod-dependency.patch diff --git a/pkgs/tools/security/earlybird/default.nix b/pkgs/tools/security/earlybird/default.nix index eb13b38c158f..c7c16ab47d38 100644 --- a/pkgs/tools/security/earlybird/default.nix +++ b/pkgs/tools/security/earlybird/default.nix @@ -2,24 +2,30 @@ , buildGoModule , fetchFromGitHub }: -buildGoModule { + +buildGoModule rec { pname = "earlybird"; - version = "1.25.0"; + version = "3.16.0"; src = fetchFromGitHub { owner = "americanexpress"; repo = "earlybird"; - # According to the GitHub repo, the latest version *is* 1.25.0, but they - # tagged it as "refs/heads/main-2" - rev = "4f365f1c02972dc0a68a196a262912d9c4325b21"; - sha256 = "UZXHYBwBmb9J1HrE/htPZcKvZ+7mc+oXnUtzgBmBgN4="; + rev = "v${version}"; + hash = "sha256-qSW8O13UW5L2eVsqIuqOguhCyZBPqevZ9fJ7qkraa7M="; }; - vendorSha256 = "oSHBR1EvK/1+cXqGNCE9tWn6Kd/BwNY3m5XrKCAijhA="; + patches = [ + ./fix-go.mod-dependency.patch + ]; + + vendorHash = "sha256-ktsQvWc0CTnqOer+9cc0BddrQp0F3Xk7YJP3jxfuw1w="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more"; homepage = "https://github.com/americanexpress/earlybird"; + changelog = "https://github.com/americanexpress/earlybird/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch b/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch new file mode 100644 index 000000000000..fb1cf4afdabc --- /dev/null +++ b/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch @@ -0,0 +1,13 @@ +--- a/go.mod ++++ b/go.mod +@@ -42,8 +42,9 @@ require ( + github.com/src-d/gcfg v1.4.0 // indirect + github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect + github.com/xanzy/ssh-agent v0.2.1 // indirect +- golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect ++ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/sys v0.0.0-20220906165534-d0df966e6959 // indirect ++ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + google.golang.org/protobuf v1.23.0 // indirect + gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect From eeaa0526a32383470a2160fa598237b3623a5d68 Mon Sep 17 00:00:00 2001 From: kyren Date: Tue, 8 Nov 2022 08:18:32 -0500 Subject: [PATCH 2/5] aseprite-unfree: 1.2.16.3 -> 1.2.40 Also updates aseprite skia fork and skia deps, includes the following patches from AUR: - shared-libwebp.patch - shared-skia-deps.patch --- .../applications/editors/aseprite/default.nix | 38 +++++++-------- .../editors/aseprite/shared-libwebp.patch | 47 +++++++++++++++++++ .../editors/aseprite/shared-skia-deps.patch | 21 +++++++++ .../editors/aseprite/skia-deps.nix | 12 ++--- .../editors/aseprite/skia-make-deps.sh | 2 +- pkgs/applications/editors/aseprite/skia.nix | 31 +++++------- 6 files changed, 106 insertions(+), 45 deletions(-) create mode 100644 pkgs/applications/editors/aseprite/shared-libwebp.patch create mode 100644 pkgs/applications/editors/aseprite/shared-skia-deps.patch diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 58342ab1393a..99a1c8adec43 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config +{ stdenv, lib, callPackage, fetchFromGitHub, cmake, ninja, pkg-config , curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , harfbuzzFull, glib, fontconfig, pcre -, libX11, libXext, libXcursor, libXxf86vm, libGL +, libX11, libXext, libXcursor, libXxf86vm, libGL, libXi , unfree ? false , cmark }: @@ -15,16 +15,16 @@ let in stdenv.mkDerivation rec { pname = "aseprite"; - version = if unfree then "1.2.16.3" else "1.1.7"; + version = if unfree then "1.2.40" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; repo = "aseprite"; rev = "v${version}"; fetchSubmodules = true; - sha256 = if unfree - then "16yn7y9xdc5jd50cq7bmsm320gv23pp71lr8hg2nmynzc8ibyda8" - else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; + hash = if unfree + then "sha256-KUdJA6HTAKrLT8xrwFikVDbc5RODysclcsEyQekMRZo=" + else "sha256-sRFuuY6cmVRE7myelGREMrzaQ09Olq74XP8uoS1NpD0="; }; nativeBuildInputs = [ @@ -37,24 +37,20 @@ stdenv.mkDerivation rec { ] ++ lib.optionals unfree [ cmark harfbuzzFull glib fontconfig pcre - skia libGL + skia libGL libXi ]; - patches = if !unfree then [ + patches = lib.optionals (!unfree) [ ./allegro-glibc-2.30.patch - ] else [ - (fetchpatch { - url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; - sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; - }) - (fetchpatch { - url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch"; - sha256 = "1vwn8ivap1pzdh444sdvvkndp55iz146nhmd80xbm8cyzn3qmg91"; - }) + ] ++ lib.optionals unfree [ + ./shared-libwebp.patch + ./shared-skia-deps.patch ]; - postPatch = '' + postPatch = if (!unfree) then '' sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-" + '' else '' + sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" ''; cmakeFlags = [ @@ -73,15 +69,17 @@ stdenv.mkDerivation rec { ] ++ lib.optionals unfree [ "-DUSE_SHARED_CMARK=ON" "-DUSE_SHARED_HARFBUZZ=ON" - # Aseprite needs internal freetype headers. - "-DUSE_SHARED_FREETYPE=OFF" + "-DUSE_SHARED_WEBP=ON" # Disable libarchive programs. "-DENABLE_CAT=OFF" "-DENABLE_CPIO=OFF" "-DENABLE_TAR=OFF" # UI backend. + "-DLAF_WITH_EXAMPLES=OFF" "-DLAF_OS_BACKEND=skia" + "-DENABLE_DESKTOP_INTEGRATION=ON" "-DSKIA_DIR=${skia}" + "-DSKIA_LIBRARY_DIR=${skia}/out/Release" ]; postInstall = '' diff --git a/pkgs/applications/editors/aseprite/shared-libwebp.patch b/pkgs/applications/editors/aseprite/shared-libwebp.patch new file mode 100644 index 000000000000..20191f46b8b1 --- /dev/null +++ b/pkgs/applications/editors/aseprite/shared-libwebp.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af077f6..fed17ff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) + option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) + option(USE_SHARED_FREETYPE "Use shared FreeType library" off) + option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) ++option(USE_SHARED_WEBP "Use your installed copy of webp" off) + option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) + option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) + option(ENABLE_NEWS "Enable the news in Home tab" on) +@@ -328,14 +351,17 @@ add_subdirectory(laf) + # libwebp + if(ENABLE_WEBP) + # Use libwebp from Skia +- if(LAF_BACKEND STREQUAL "skia") ++ if(USE_SHARED_WEBP) ++ find_library(WEBP_LIBRARY NAMES webp) ++ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux) ++ find_library(WEBPMUX_LIBRARY NAMES webpmux) ++ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) ++ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) ++ else() + find_library(WEBP_LIBRARIES webp + NAMES libwebp # required for Windows + PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) + set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src") +- else() +- set(WEBP_LIBRARIES webp webpdemux libwebpmux) +- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) + endif() + include_directories(${WEBP_INCLUDE_DIR}) + endif() +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index 4839d4097c..e8c3e83cbc 100644 +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -32,7 +32,7 @@ if(NOT USE_SHARED_GIFLIB) + add_subdirectory(giflib) + endif() + +-if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia") ++if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia" AND NOT USE_SHARED_WEBP) + set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") + add_subdirectory(libwebp) + endif() \ No newline at end of file diff --git a/pkgs/applications/editors/aseprite/shared-skia-deps.patch b/pkgs/applications/editors/aseprite/shared-skia-deps.patch new file mode 100644 index 000000000000..a6ab472bbe95 --- /dev/null +++ b/pkgs/applications/editors/aseprite/shared-skia-deps.patch @@ -0,0 +1,21 @@ +--- src/laf/cmake/FindSkia.cmake.orig 2022-01-08 02:15:13.417619266 +0100 ++++ src/laf/cmake/FindSkia.cmake 2022-01-08 02:15:43.603960491 +0100 +@@ -32,14 +32,18 @@ + # SkShaper module + freetype + harfbuzz + find_library(SKSHAPER_LIBRARY skshaper PATH "${SKIA_LIBRARY_DIR}") + ++if(NOT USE_SHARED_FREETYPE) + set(FREETYPE_FOUND ON) + find_library(FREETYPE_LIBRARY freetype2 PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) + set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY}) + set(FREETYPE_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/freetype/include") ++endif() + ++if(NOT USE_SHARED_HARFBUZZ) + find_library(HARFBUZZ_LIBRARY harfbuzz PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) + set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY}) + set(HARFBUZZ_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/harfbuzz/src") ++endif() + + set(SKIA_LIBRARIES + ${SKIA_LIBRARY} \ No newline at end of file diff --git a/pkgs/applications/editors/aseprite/skia-deps.nix b/pkgs/applications/editors/aseprite/skia-deps.nix index e5655ca8315d..3c92c649bebf 100644 --- a/pkgs/applications/editors/aseprite/skia-deps.nix +++ b/pkgs/applications/editors/aseprite/skia-deps.nix @@ -2,13 +2,13 @@ { angle2 = fetchgit { url = "https://chromium.googlesource.com/angle/angle.git"; - rev = "956ab4d9fab36be9929e63829475d4d69b2c681c"; - sha256 = "0fcw04wwkn3ixr9l9k0d32n78r9g72p31ii9i5spsq2d0wlylr38"; + rev = "8718783526307a3fbb35d4c1ad4e8101262a0d73"; + sha256 = "0c90q8f4syvwcayw58743sa332dcpkmblwh3ffkjqn5ygym04xji"; }; dng_sdk = fetchgit { url = "https://android.googlesource.com/platform/external/dng_sdk.git"; - rev = "96443b262250c390b0caefbf3eed8463ba35ecae"; - sha256 = "1rsr7njhj7c5p87hfznj069fdc3qqhvvnq9sa2rb8c4q849rlzx6"; + rev = "c8d0c9b1d16bfda56f15165d39e0ffa360a11123"; + sha256 = "1nlq082aij7q197i5646bi4vd2il7fww6sdwhqisv2cs842nyfwm"; }; piex = fetchgit { url = "https://android.googlesource.com/platform/external/piex.git"; @@ -17,7 +17,7 @@ }; sfntly = fetchgit { url = "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git"; - rev = "b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916"; - sha256 = "0zf1h0dibmm38ldypccg4faacvskmd42vsk6zbxlfcfwjlqm6pp4"; + rev = "b55ff303ea2f9e26702b514cf6a3196a2e3e2974"; + sha256 = "1qi5rfzmwfrji46x95g6dsb03i1v26700kifl2hpgm3pqhr7afpz"; }; } diff --git a/pkgs/applications/editors/aseprite/skia-make-deps.sh b/pkgs/applications/editors/aseprite/skia-make-deps.sh index 5e12c4f5c858..bee69cc40d9d 100755 --- a/pkgs/applications/editors/aseprite/skia-make-deps.sh +++ b/pkgs/applications/editors/aseprite/skia-make-deps.sh @@ -2,7 +2,7 @@ FILTER=$1 OUT=skia-deps.nix -REVISION=89e4ca4352d05adc892f5983b108433f29b2c0c2 +REVISION=861e4743af6d9bf6077ae6dda7274e5a136ee4e2 DEPS=$(curl -s https://raw.githubusercontent.com/aseprite/skia/$REVISION/DEPS) THIRD_PARTY_DEPS=$(echo "$DEPS" | grep third_party | grep "#" -v | sed 's/"//g') diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix index 2de61c7e20f1..71fa62157d8a 100644 --- a/pkgs/applications/editors/aseprite/skia.nix +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -1,37 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja +{ stdenv, lib, fetchFromGitHub, fetchgit, python3, gn, ninja , fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib -, mesa, libX11 +, mesa, libX11, harfbuzzFull }: let # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' depSrcs = import ./skia-deps.nix { inherit fetchgit; }; - gnOld = gn.overrideAttrs (oldAttrs: rec { - version = "20190403"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; - sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy"; - }; - }); in stdenv.mkDerivation { pname = "skia"; - version = "aseprite-m71"; + version = "aseprite-m102"; src = fetchFromGitHub { owner = "aseprite"; repo = "skia"; - # latest commit from aseprite-m71 branch - rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; # TODO: Remove the gnOld override - sha256 = "0n3vrkswvi6rib9zv2pzi18h3j5wm7flmgkgaikcm6q7iw4l2c7x"; + # latest commit from aseprite-m102 branch + rev = "861e4743af6d9bf6077ae6dda7274e5a136ee4e2"; + hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0="; }; - nativeBuildInputs = [ python2 gnOld ninja ]; + nativeBuildInputs = [ python3 gn ninja ]; buildInputs = [ fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib - mesa libX11 + mesa libX11 harfbuzzFull ]; preConfigure = with depSrcs; '' @@ -44,13 +36,13 @@ stdenv.mkDerivation { configurePhase = '' runHook preConfigure - gn gen out/Release --args="is_debug=false is_official_build=true" + gn gen out/Release --args="is_debug=false is_official_build=true extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" runHook postConfigure ''; buildPhase = '' runHook preBuild - ninja -C out/Release skia + ninja -C out/Release skia modules runHook postBuild ''; @@ -69,8 +61,11 @@ stdenv.mkDerivation { include/gpu \ include/private \ include/utils \ + include/third_party/skcms/*.h \ out/Release/*.a \ src/gpu/**/*.h \ + src/core/*.h \ + modules/skshaper/include/*.h \ third_party/externals/angle2/include \ third_party/skcms/**/*.h ''; From 7c2a459244b0592fa36184c193193dde8d033297 Mon Sep 17 00:00:00 2001 From: kyren Date: Tue, 8 Nov 2022 08:31:21 -0500 Subject: [PATCH 3/5] 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 { }; From 75683e28399bc25b5665d6d481e8f6e2e059cf9c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 25 Aug 2023 08:11:10 -0500 Subject: [PATCH 4/5] sketchybar: 2.15.2 -> 2.16.1 --- pkgs/os-specific/darwin/sketchybar/default.nix | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index b27390608a28..e44d74b8ea87 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -1,10 +1,12 @@ { lib , stdenv , fetchFromGitHub -, Carbon -, Cocoa +, AppKit +, CoreAudio , CoreWLAN +, CoreVideo , DisplayServices +, IOKit , MediaRemote , SkyLight }: @@ -18,20 +20,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.15.2"; + version = "2.16.1"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-13wc+1IgplB+L0j1AbBr/MUjEo4W38ZgJwrAhbdOroE="; + hash = "sha256-H+bR5ZhUTrN2KAEdY/hnq6c3TEb1NQvPQ9uPo09gSM8="; }; buildInputs = [ - Carbon - Cocoa + AppKit + CoreAudio CoreWLAN + CoreVideo DisplayServices + IOKit MediaRemote SkyLight ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 588e96587f9f..163827b33264 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13111,7 +13111,7 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair { }; sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar { - inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices MediaRemote SkyLight; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight; }; sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { }; From 38b9aaf6682015f1d2fc7b7f48da96992c30cfa3 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 25 Aug 2023 19:40:49 -0500 Subject: [PATCH 5/5] sketchybar: add meta.mainProgram --- pkgs/os-specific/darwin/sketchybar/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index e44d74b8ea87..426474115deb 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A highly customizable macOS status bar replacement"; homepage = "https://github.com/FelixKratz/SketchyBar"; license = lib.licenses.gpl3; + mainProgram = "sketchybar"; maintainers = with lib.maintainers; [ azuwis khaneliman ]; platforms = lib.platforms.darwin; };