diff options
Diffstat (limited to 'pkgs/applications')
10 files changed, 86 insertions, 97 deletions
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 785feeb98990..6f261ff51983 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1" - sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM="; + version = "2023.2.1.24"; # "Android Studio Iguana | 2023.2.1 Patch 1" + sha256Hash = "sha256-ACZCdXKEnJy7DJTW+XGOoIvDRdzP47NytUEAqV//mbU="; }; betaVersion = { version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1" sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM="; }; latestVersion = { - version = "2023.3.1.12"; # "Android Studio Jellyfish | 2023.3.1 Canary 12" - sha256Hash = "sha256-yg84WBLHfb6q+OlHuh5SJ5P4Fuc8yqO9eZ8iecOhZj4="; + version = "2023.3.2.1"; # "Android Studio Jellyfish | 2023.3.2 Canary 1" + sha256Hash = "sha256-99EWGh3+3HV8yO29ANg1pwoo/1ktI2aCwKrdIqlcgVs="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix index 73cdd865d172..ba5f1205a58b 100644 --- a/pkgs/applications/emulators/punes/default.nix +++ b/pkgs/applications/emulators/punes/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , gitUpdater , cmake , pkg-config @@ -17,26 +16,17 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "punes"; - version = "0.110"; + version = "0.111"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; - rev = "v${version}"; - sha256 = "sha256-+hL168r40aYUjyLbWFXWk9G2srrrG1TH1gLYMliHftU="; + rev = "v${finalAttrs.version}"; + hash = "sha256-TIXjYkInWV3yVnvXrdHcmeWYeps5TcvkG2Xjg4roIds="; }; - patches = [ - # Fixes compilation on aarch64 - # Remove when version > 0.110 - (fetchpatch { - url = "https://github.com/punesemu/puNES/commit/90dd5bc90412bbd199c2716f67a24aa88b24d80f.patch"; - hash = "sha256-/KNpTds4qjwyaTUebWWPlVXfuxVh6M4zOInxUfYztJg="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config @@ -73,8 +63,9 @@ stdenv.mkDerivation rec { description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player"; mainProgram = "punes"; homepage = "https://github.com/punesemu/puNES"; + changelog = "https://github.com/punesemu/puNES/blob/v${finalAttrs.version}/ChangeLog"; license = licenses.gpl2Plus; maintainers = with maintainers; [ OPNA2608 ]; platforms = with platforms; linux ++ freebsd ++ openbsd ++ windows; }; -} +}) diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix index 5c504777ecc2..6bf2cf24d80e 100644 --- a/pkgs/applications/graphics/structorizer/default.nix +++ b/pkgs/applications/graphics/structorizer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-17"; + version = "3.32-18"; desktopItems = [ (makeDesktopItem { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-yJPF4N402wzc4kNWgcu7quhQ9QaERMfqHdQrf1IGwrQ="; + hash = "sha256-CA87j11TFUd0nmuPc1qyqdITkTPE/jauf31cO2iBQVg="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/applications/misc/owmods-cli/default.nix deleted file mode 100644 index 44a711dfeec1..000000000000 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, nix-update-script -, fetchFromGitHub -, rustPlatform -, pkg-config -, installShellFiles -, zstd -, openssl -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "owmods-cli"; - version = "0.12.2"; - - src = fetchFromGitHub { - owner = "ow-mods"; - repo = "ow-mod-man"; - rev = "cli_v${version}"; - hash = "sha256-AfqpLL3cGZLKW5/BE6SaBe4S8GzYM2GKUZU8mFH5uX4="; - }; - - cargoHash = "sha256-PhdfpiUgeOB13ROgzPBYM+sBLGMP+RtV9j9ebo8PpJU="; - - nativeBuildInputs = [ - pkg-config - installShellFiles - ]; - - buildInputs = [ - zstd - ] ++ lib.optionals stdenv.isLinux [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - Security - ]; - - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - buildAndTestSubdir = "owmods_cli"; - - postInstall = '' - cargo xtask dist_cli - installManPage man/man*/* - installShellCompletion --cmd owmods \ - dist/cli/completions/owmods.{bash,fish,zsh} - ''; - - passthru.updateScript = nix-update-script {}; - - meta = with lib; { - description = "CLI version of the mod manager for Outer Wilds Mod Loader"; - homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli"; - downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; - changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; - mainProgram = "owmods"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ locochoco ]; - }; -} diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 2c8f9993fed5..ddb649e3c359 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -53,6 +53,9 @@ let nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas libXxf86vm ]; + # upstream targets Java 7 by default + env.ANT_ARGS = "-DappletClassSource=8 -DappletClassTarget=8 -DclassSource=8 -DclassTarget=8"; + buildPhase = '' runHook preBuild diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index d5cdebb76282..926d75fe5c7a 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -44,6 +44,9 @@ let nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ ant jdk gtk3 gsettings-desktop-schemas ]; + # upstream targets Java 7 by default + env.ANT_ARGS = "-DappletClassSource=8 -DappletClassTarget=8 -DclassSource=8 -DclassTarget=8"; + postPatch = '' sed -i -e 's,../SweetHome3D,${applicationSrc},g' build.xml sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index ad3913aedb2b..c2f21bd8b700 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,23 +1,23 @@ { stable = { chromedriver = { - hash_darwin = "sha256-QdL9KamluVX6kIIY6F7zxKL5l7clhsE7QWGWw4YRUtM="; + hash_darwin = "sha256-yRLbe3xl0L/PfRcVB4LA6JeDvLpgUhtKZiAfyB2v/ZE="; hash_darwin_aarch64 = - "sha256-GKqk6GMitz0uud65iPCUMdOtIEhmWyHPbtrO+V2f8XU="; - hash_linux = "sha256-QKr2BjydiP5D3T5becwQHeFmK0LMrIFhbssDELqSEQM="; - version = "122.0.6261.128"; + "sha256-TMreCFF9Lo+9gy7kzZWd9Mjep0CYa3Cxn4kr9BNTdkE="; + hash_linux = "sha256-rM2usA0zDZ1aXvkbvm+l0xalViEJIxu8ZYZvoTkNiis="; + version = "123.0.6312.58"; }; deps = { gn = { - hash = "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY="; - rev = "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e"; + hash = "sha256-JvilCnnb4laqwq69fay+IdAujYC1EHD7uWpkF/C8tBw="; + rev = "d4f94f9a6c25497b2ce0356bb99a8d202c8c1d32"; url = "https://gn.googlesource.com/gn"; - version = "2024-01-22"; + version = "2024-02-19"; }; }; - hash = "sha256-BzLSwDQrmKavh4s2uOSfP935NnB5+Hw7oD7YDbSWp2g="; - hash_deb_amd64 = "sha256-SxdYfWhV3ZpiGWmagOM6JUfjAmU9pzFGDQDinXrweas="; - version = "122.0.6261.128"; + hash = "sha256-GrCYCUjxV16tinqrIqW4DQD51dKIgKNu2fLLz9Yqq7k="; + hash_deb_amd64 = "sha256-z+UC7wUsWAX7kPIgk8S9ujW2n6HlUp0m3zHTvsAiTps="; + version = "123.0.6312.58"; }; ungoogled-chromium = { deps = { diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 454d6343d15b..27d2c9a72b0e 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240318"; + version = "20240319"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-KK+KQowI0KKwgZE91xivfmhnHyDMRozfpLsrOLuE+FE="; + hash = "sha256-aDf7HId0A4GBiG3AJZLAtVEq54RywV/gx4Sa3c/KLg0="; }; postPatch = '' diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index fe1c1f5511d1..d9092b9eeb11 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "More command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.hpndUc; }; } diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix new file mode 100644 index 000000000000..88e9504f8d19 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix @@ -0,0 +1,55 @@ +{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals, websocket }: +let + python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]); +in +buildKodiAddon rec { + pname = "jellycon"; + namespace = "plugin.video.jellycon"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "jellyfin"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-60my7Y60KV5WWALQiamnmAJZJi82cV21rIGYPiV7T+A="; + }; + + nativeBuildInputs = [ + python + ]; + + prePatch = '' + # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 + substituteInPlace build.py \ + --replace "with zipfile.ZipFile(f'{target}/{archive_name}', 'w') as z:" "with zipfile.ZipFile(f'{target}/{archive_name}', 'w', strict_timestamps=False) as z:" + ''; + + buildPhase = '' + ${python}/bin/python3 build.py --version=py3 + ''; + + postInstall = '' + mv /build/source/addon.xml $out${addonDir}/${namespace}/ + ''; + + propagatedBuildInputs = [ + requests + dateutil + six + kodi-six + signals + websocket + ]; + + meta = with lib; { + homepage = "https://github.com/jellyfin/jellycon"; + description = "A lightweight Kodi add-on for Jellyfin"; + longDescription = '' + JellyCon is a lightweight Kodi add-on that lets you browse and play media + files directly from your Jellyfin server within the Kodi interface. It can + easily switch between multiple user accounts at will. + ''; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} |