diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e72d2a11650..5e78a3f8d4bb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3908,6 +3908,12 @@ githubId = 183879; name = "Florian Klink"; }; + florentc = { + email = "florentc@users.noreply.github.com"; + github = "florentc"; + githubId = 1149048; + name = "Florent Ch."; + }; FlorianFranzen = { email = "Florian.Franzen@gmail.com"; github = "FlorianFranzen"; @@ -5004,6 +5010,12 @@ githubId = 4085046; name = "Imuli"; }; + ineol = { + email = "leo.stefanesco@gmail.com"; + github = "ineol"; + githubId = 37965; + name = "Léo Stefanesco"; + }; infinisil = { email = "contact@infinisil.com"; matrix = "@infinisil:matrix.org"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index f1d803136aa0..f0e39471ecee 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -172,6 +172,41 @@ + + + ORY Kratos was updated to version 0.8.0-alpha.3 + + + + + This release requires you to run SQL migrations. Please, + as always, create a backup of your database first! + + + + + The SDKs are now generated with tag v0alpha2 to reflect + that some signatures have changed in a breaking fashion. + Please update your imports from v0alpha1 to v0alpha2. + + + + + The SMTPS scheme used in courier config URL with + cleartext/StartTLS/TLS SMTP connection types is now only + supporting implicit TLS. For StartTLS and cleartext SMTP, + please use the SMTP scheme instead. + + + + + for more details, see + Release + Notes. + + + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 275ee7142d0e..3bdda82c026f 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -50,6 +50,12 @@ In addition to numerous new and upgraded packages, this release has the followin - This breaks connections to old SSH daemons as ssh-rsa host keys and ssh-rsa public keys that were signed with SHA-1 are disabled by default now - These can be re-enabled, see the [OpenSSH changelog](https://www.openssh.com/txt/release-8.8) for details +- ORY Kratos was updated to version 0.8.0-alpha.3 + - This release requires you to run SQL migrations. Please, as always, create a backup of your database first! + - The SDKs are now generated with tag v0alpha2 to reflect that some signatures have changed in a breaking fashion. Please update your imports from v0alpha1 to v0alpha2. + - The SMTPS scheme used in courier config URL with cleartext/StartTLS/TLS SMTP connection types is now only supporting implicit TLS. For StartTLS and cleartext SMTP, please use the SMTP scheme instead. + - for more details, see [Release Notes](https://github.com/ory/kratos/releases/tag/v0.8.0-alpha.1). + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index a6c8221c9f72..7cd22d258315 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -11,15 +11,15 @@ mkDerivation rec { pname = "audacious"; - version = "4.0.5"; + version = "4.1"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji"; + sha256 = "0p734psjjvjcmla2hg5h6a9v1prvy63jj9xm2g2ngs49jy7qan0z"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"; + sha256 = "0k0xnqmxi5lna034i2cnzvfzrykxmv4fbs1nkrc9sd2ma1igrmns"; }; nativeBuildInputs = [ gettext pkg-config ]; @@ -36,8 +36,10 @@ mkDerivation rec { libopenmpt ]; + configureFlags = [ "--disable-gtk" ]; + # Here we build both audacious and audacious-plugins in one - # derivations, since they really expect to be in the same prefix. + # derivation, since they really expect to be in the same prefix. # This is slighly tricky. builder = builtins.toFile "builder.sh" '' # First build audacious. diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index f9cef2898bfc..3cc054cea593 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.14.0-beta"; + version = "0.14.1-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0pf84l46cfhbmbzjdkpmqp494wqix8715zawm537mm94k3q25bis"; + sha256 = "0arm36682y4csdv9abqs0l8rgxkiqkamrps7q8wpyyg4n78yiij3"; }; - vendorSha256 = "1481zscd9lrnzxsaxkpaaa8fjazmfynhim13f8lj2yd9d21j5d31"; + vendorSha256 = "13zhs0gb7chi0zz5rabmw3sd5fcpxc4s553crfcg7lrnbn5hcwzv"; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 4c65ddcc8f67..db5f8275386a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.2.4"; /* updated by script */ + version = "2021.3.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1vj9ihzw07bh30ngy8mj027ljq9zzd904k61f8jbfpw75vknh8f6"; /* updated by script */ + sha256 = "18drbddcjbbv6q6j95wy7ila8d7imi0gh5nnf0lhj4gkkxhszmii"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index a616378e9892..a0b67042ecac 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.7.6-alpha.1"; + version = "0.8.0-alpha.3"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - sha256 = "1412jckfsm0d5gn7fhjpj212xbsf43sfpd8hgcz3pxc0q37dzfgh"; + sha256 = "0ihq2kxjackicxg0hrpmx6bsgz056xbaq3j8py37z2w6mwszarcg"; }; - vendorSha256 = "1gcdahs8x26kpwlng3wijqi12yjwj19v413wyyviim4vn1r4c0m7"; + vendorSha256 = "175pckj30cm5xkbvsdvwzarvwapsylyjgj4ss8v5r1sa0fjpj008"; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 438a468afa16..4b273981fa9a 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -7,7 +7,8 @@ , curl , doxygen , fetchFromGitHub -#, ffmpeg +, ffmpeg +, freeimage , libmediainfo , libraw , libsodium @@ -27,13 +28,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.5.3.0"; + version = "4.6.1.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "1lwjmdbqyxx5wd8nx4mc830fna37jad4h93viwfh5x7sxn104js7"; + sha256 = "0v2fvji9hs7valya0wx5qjx01c7yjld6nnp6m9gpxfkr30h5s5wb"; fetchSubmodules = true; }; @@ -52,8 +53,8 @@ mkDerivation rec { c-ares cryptopp curl - # temporarily disable until patched for ffmpeg 4.4 - #ffmpeg + ffmpeg + freeimage libmediainfo libraw libsodium @@ -71,6 +72,7 @@ mkDerivation rec { ./noinstall-distro-version.patch # megasync target is not part of the install rule thanks to a commented block ./install-megasync.patch + ./ffmpeg_44.patch ]; postPatch = '' @@ -95,9 +97,8 @@ mkDerivation rec { "--with-cares" "--with-cryptopp" "--with-curl" - # temporarily disable until patched for ffmpeg 4.4 - #"--with-ffmpeg" - "--without-freeimage" # unreferenced even when found + "--with-ffmpeg" + "--with-freeimage" "--without-readline" "--without-termcap" "--with-sodium" diff --git a/pkgs/applications/misc/megasync/ffmpeg_44.patch b/pkgs/applications/misc/megasync/ffmpeg_44.patch new file mode 100644 index 000000000000..901635e43f3e --- /dev/null +++ b/pkgs/applications/misc/megasync/ffmpeg_44.patch @@ -0,0 +1,14 @@ +Index: megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp +=================================================================== +--- megasync-4.6.1.0.orig/src/MEGASync/mega/src/gfx/freeimage.cpp ++++ megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp +@@ -253,7 +253,8 @@ bool GfxProcFreeImage::readbitmapFfmpeg( + + // Force seeking to key frames + formatContext->seek2any = false; +- videoStream->skip_to_keyframe = true; ++ // no longer exposed in ffmpeg 4.4; the line above should be sufficient ++ //videoStream->skip_to_keyframe = true; + if (decoder->capabilities & CAP_TRUNCATED) + { + codecContext->flags |= CAP_TRUNCATED; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 641353f53daf..75d617bceeb5 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -13,13 +13,13 @@ # logitech-udev-rules instead of adding this to services.udev.packages on NixOS python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - sha256 = "sha256-Ys0005hIQ+fT4oMeU5iFtbLNqn1WM6iLdIKGwdyn7BM="; + sha256 = "sha256-RQ7iSiw/0xbPOYhuHg4cQpuJyRcaigWKVw4Jt12T9Uw="; }; nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index c9cbdd379864..5fc8b0527b31 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-10-27"; + version = "unstable-2021-11-14"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "e1201cdcce4311061643d90cc0132745023a82d2"; - sha256 = "04xqvyj4rzgl9r7sfjjw1kc3vql30c80rwppff2zr5aijr15fgjj"; + rev = "796b5ce8a11e294e6325dbe92cd1834d140368ff"; + hash = "sha256-Zjh83TrAm9pWieqz1e+Wzoy6g/xfsjhI/3Ll73iJoD4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 261a99698726..d507dbc35bd8 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-wc4+j2kTSwZsxIdJHmznkNIq436p0yNrskchuEJtL5E="; + sha256 = "14vq14gfqlqi1gg1psq9gs2i0ki6xlcfrjfcxi148hpaf38ly7pw"; }; - vendorSha256 = "sha256-klbAVOHLefxG33zpEYFlPezrKrXfuWOaE+UnIsu462M="; + vendorSha256 = "0qzbp35j49z52fd67ffznlmfpv1xcn0i3sbwvx3gqyfbw5ac0mlj"; doCheck = false; diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index fe81ff44d245..f2e0d3a50c24 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "delly"; - version = "0.8.7"; + version = "0.9.1"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M="; + sha256 = "sha256-p1pryP+ktGt8OHFiASJQ3T+K94cNBG9fLxsJ2n/T+DA="; }; buildInputs = [ zlib htslib bzip2 xz ncurses boost ]; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index f002b808e0af..7d447745a23d 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,34 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, adoptopenjdk-bin, jre, ant -}: +{ lib, stdenv, fetchurl, makeWrapper, adoptopenjdk-bin, jre }: stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.7.0"; + version = "1.7.1"; - src = fetchFromGitHub { - owner = "tlaplus"; - repo = "tlaplus"; - rev = "refs/tags/v${version}"; - sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891"; + src = fetchurl { + url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar"; + sha256 = "d532ba31aafe17afba1130f92410d9257454ff7393d1eb2fe032f0c07f352da5"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ adoptopenjdk-bin ant ]; + buildInputs = [ adoptopenjdk-bin ]; - buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/java $out/bin - cp tlatools/org.lamport.tlatools/dist/*.jar $out/share/java + cp $src $out/share/java/tla2tools.jar - makeWrapper ${jre}/bin/java $out/bin/tlc2 \ - --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" - makeWrapper ${jre}/bin/java $out/bin/tla2sany \ - --add-flags "-cp $out/share/java/tla2tools.jar tla2sany.SANY" + makeWrapper ${jre}/bin/java $out/bin/tlc \ + --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC" + makeWrapper ${jre}/bin/java $out/bin/tlasany \ + --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY" makeWrapper ${jre}/bin/java $out/bin/pcal \ - --add-flags "-cp $out/share/java/tla2tools.jar pcal.trans" - makeWrapper ${jre}/bin/java $out/bin/tla2tex \ - --add-flags "-cp $out/share/java/tla2tools.jar tla2tex.TLA" + --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans" + makeWrapper ${jre}/bin/java $out/bin/tlatex \ + --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA" ''; meta = { @@ -36,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://lamport.azurewebsites.net/tla/tla.html"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; + maintainers = with lib.maintainers; [ florentc thoughtpolice ]; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a8a18692b9ee..93a215f1003b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] + ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals pulseSupport [ libpulseaudio ] ++ lib.optionals sdlSupport [ SDL2 SDL2_image ] ++ lib.optionals gtkSupport [ gtk3 gettext vte ] @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { ++ lib.optionals smartcardSupport [ libcacard ] ++ lib.optionals spiceSupport [ spice-protocol spice ] ++ lib.optionals usbredirSupport [ usbredir ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libaio libcap_ng libcap attr ] + ++ lib.optionals stdenv.isLinux [ libaio libcap_ng libcap attr ] ++ lib.optionals xenSupport [ xen ] ++ lib.optionals cephSupport [ ceph ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] @@ -178,6 +179,9 @@ stdenv.mkDerivation rec { "--enable-guest-agent" "--localstatedir=/var" "--sysconfdir=/etc" + # Always use our Meson, not the bundled version, which doesn't + # have our patches and will be subtly broken because of that. + "--meson=meson" ] ++ lib.optional numaSupport "--enable-numa" ++ lib.optional seccompSupport "--enable-seccomp" ++ lib.optional smartcardSupport "--enable-smartcard" diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix new file mode 100644 index 000000000000..0ed8ea0486b6 --- /dev/null +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, graalvmCEPackages, glibcLocales }: + +{ name ? "${args.pname}-${args.version}" + # Final executable name +, executable ? args.pname + # JAR used as input for GraalVM derivation, defaults to src +, jar ? args.src +, dontUnpack ? (jar == args.src) + # Default native-image arguments. You probably don't want to set this, + # except in special cases. In most cases, use extraNativeBuildArgs instead +, nativeImageBuildArgs ? [ + "-jar" jar + "-H:CLibraryPath=${lib.getLib graalvm}/lib" + (lib.optionalString stdenv.isDarwin "-H:-CheckToolchain") + "-H:Name=${executable}" + "--verbose" + ] + # Extra arguments to be passed to the native-image +, extraNativeImageBuildArgs ? [ ] + # XMX size of GraalVM during build +, graalvmXmx ? "-J-Xmx6g" + # The GraalVM to use +, graalvm ? graalvmCEPackages.graalvm11-ce +, ... +} @ args: + +stdenv.mkDerivation (args // { + inherit dontUnpack; + + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvm glibcLocales ]; + + nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; + + buildPhase = args.buildPhase or '' + runHook preBuild + + native-image ''${nativeImageBuildArgs[@]} + + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + install -Dm755 ${executable} -t $out/bin + + runHook postInstall + ''; + + meta.platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args; + meta.mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args; +}) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 018e8cb775c3..f35fec275299 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "6.0.1"; + version = "6.1.0"; repoName = "code"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "120328pprzqj4587yj54yya9v2mv1rfwylpmxyr5l2qf80cjxi9d"; + sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw="; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 208ea7cd8bd4..7dc6d79fee16 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -16,14 +16,11 @@ , granite , libgee , bamf -, libcanberra , libcanberra-gtk3 , gnome-desktop , mutter , clutter -, elementary-dock , elementary-icon-theme -, elementary-settings-daemon , gnome-settings-daemon , wrapGAppsHook , gexiv2 @@ -31,23 +28,22 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.2.1"; + version = "6.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1phnhj731kvk8ykmm33ypcxk8fkfny9k6kdapl582qh4d47wcy6f"; + sha256 = "sha256-f/WDm9/+lXgplg9tGpct4f+1cOhKgdypwiDRBhewRGw="; }; patches = [ ./plugins-dir.patch - # Multitasking view: Don't use smooth scroll events to handle mouse wheel - # Avoid breaking the multitasking view scroll once xf86-input-libinput 1.2.0 lands - # https://github.com/elementary/gala/pull/1266 + # Session crashes when switching windows with Alt+Tab + # https://github.com/elementary/gala/issues/1312 (fetchpatch { - url = "https://github.com/elementary/gala/commit/d2dcfdefdf97c1b49654179a7acd01ebfe017308.patch"; - sha256 = "sha256-2lKrCz3fSjrfKfysuUHzeUjhmMm84K47n882CLpfAyg="; + url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch"; + sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc="; }) ]; @@ -66,20 +62,23 @@ stdenv.mkDerivation rec { buildInputs = [ bamf clutter - elementary-dock elementary-icon-theme - elementary-settings-daemon gnome-settings-daemon gexiv2 gnome-desktop granite gtk3 - libcanberra libcanberra-gtk3 libgee mutter ]; + mesonFlags = [ + # TODO: enable this and remove --builtin flag from session-settings + # https://github.com/NixOS/nixpkgs/pull/140429 + "-Dsystemd=false" + ]; + postPatch = '' chmod +x build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py @@ -91,7 +90,7 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = with lib; { description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon"; homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index c2a4ad64ce95..15c301eee15a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.9.1"; + version = "2.10.1"; repoName = "applications-menu"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-Q0ee8S8wWhK0Y16SWfE79Us6QD/oRE5Pxm3o//eb/po="; + sha256 = "sha256-e9InWx5b2DAFK7m7z/oCW7Mw/ymBNz1Sc7vT65kkZ9o="; }; patches = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 8226ed5b0b3c..d9c2cdc90338 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , pantheon @@ -40,7 +41,10 @@ stdenv.mkDerivation rec { }) # Fix incorrect month shown on re-opening indicator if previously changed month # https://github.com/elementary/wingpanel-indicator-datetime/pull/284 - ./fix-incorrect-month.patch + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch"; + sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch deleted file mode 100644 index 7e0dc09b16c2..000000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 401cb05d7181e69ae8edd347644f2518904e9acb Mon Sep 17 00:00:00 2001 -From: Jeremy Paul Wootten -Date: Sat, 30 Oct 2021 17:44:12 +0100 -Subject: [PATCH] Reset position and relative position after rebuilding - carousel - ---- - src/Widgets/calendar/CalendarView.vala | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala -index a41b37a4..f946b91c 100644 ---- a/src/Widgets/calendar/CalendarView.vala -+++ b/src/Widgets/calendar/CalendarView.vala -@@ -216,7 +216,11 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { - carousel.add (right_grid); - carousel.scroll_to (start_month_grid); - label.label = calmodel.month_start.format (_("%OB, %Y")); -+ -+ position = 1; -+ rel_postion = 0; - } -+ - carousel.no_show_all = false; - } - diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix new file mode 100644 index 000000000000..7c9ee2dca646 --- /dev/null +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -0,0 +1,16 @@ +{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }: + +with lib; mkCoqDerivation rec { + pname = "coq-record-update"; + owner = "tchajed"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.10" "8.14"; out = "0.3.0"; } + ] null; + release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z"; + releaseRev = v: "v${v}"; + meta = { + description = "Library to create Coq record update functions"; + maintainers = with maintainers; [ ineol ]; + }; +} diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index fdd9580ed1d6..7d586760548e 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -49,6 +49,16 @@ let sha256 = "074smp3448wcazlhc7sb8r54l4kfavr6yks3w5x60zl1qpijf52r"; }; }); + + zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { + version = "0.36.13"; + src = fetchFromGitHub { + owner = "jstasiak"; + repo = "python-zeroconf"; + rev = version; + sha256 = "aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c="; + }; + }); }; }; in diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 85daec0d2ac9..5e7731b69039 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales, writeScript }: +{ lib, buildGraalvmNativeImage, fetchurl, writeScript }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "babashka"; version = "0.6.5"; @@ -9,48 +9,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-72D/HzDIxkGD4zTPE9gHf/uFtboLbNnT7CTslSlAqjc="; }; - dontUnpack = true; + executable = "bb"; - nativeBuildInputs = [ graalvm11-ce glibcLocales ]; - - LC_ALL = "en_US.UTF-8"; - BABASHKA_JAR = src; - BABASHKA_BINARY = "bb"; - BABASHKA_XMX = "-J-Xmx4500m"; - - buildPhase = '' - runHook preBuild - - # https://github.com/babashka/babashka/blob/v0.6.2/script/compile#L41-L52 - args=("-jar" "$BABASHKA_JAR" - "-H:CLibraryPath=${graalvm11-ce.lib}/lib" - # Required to build babashka on darwin. Do not remove. - "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" - "-H:Name=$BABASHKA_BINARY" - "-H:+ReportExceptionStackTraces" - # "-H:+PrintAnalysisCallTree" - # "-H:+DashboardAll" - # "-H:DashboardDump=reports/dump" - # "-H:+DashboardPretty" - # "-H:+DashboardJson" - "--verbose" - "--no-fallback" - "--native-image-info" - "$BABASHKA_XMX") - - native-image ''${args[@]} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp bb $out/bin/bb - - runHook postInstall - ''; + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "--no-fallback" + "--native-image-info" + ]; installCheckPhase = '' $out/bin/bb --version | grep '${version}' @@ -102,7 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/babashka/babashka"; changelog = "https://github.com/babashka/babashka/blob/v${version}/CHANGELOG.md"; license = licenses.epl10; - platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ bandresen bhougland diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index a0bfc6f017ad..7c4c072a7003 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { pname = "graphene"; version = "1.10.6"; - outputs = [ "out" "devdoc" "installedTests" ]; + outputs = [ "out" ] + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" "installedTests" ]; src = fetchFromGitHub { owner = "ebassi"; @@ -33,6 +34,10 @@ stdenv.mkDerivation rec { ./0001-meson-add-options-for-tests-installation-dirs.patch ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ docbook_xml_dtd_43 docbook_xsl @@ -47,7 +52,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gobject-introspection ]; checkInputs = [ @@ -55,7 +59,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" ]; @@ -64,6 +69,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests/gen-installed-test.py + '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py ''; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 9947214bf7fc..a8f8535138e3 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { pname = "gssdp"; version = "1.4.0.1"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -44,13 +45,14 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" "-Dsniffer=false" + "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; doCheck = true; - postFixup = '' + postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' # Move developer documentation to devdoc output. # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 6eb44b9172ab..45e17704449d 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -17,13 +17,18 @@ stdenv.mkDerivation rec { pname = "gupnp-igd"; version = "1.2.0"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "sha256-S1EgCYqhPt0ngYup7k1/6WG/VAv1DQVv9wPGFUXgK+E="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ pkg-config meson @@ -41,7 +46,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; # Seems to get stuck sometimes. diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 32f7c201fad4..1a77e50eb540 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { pname = "gupnp"; version = "1.4.0"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -34,6 +35,10 @@ stdenv.mkDerivation rec { ./0001-pkg-config-Declare-header-dependencies-as-public.patch ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -58,7 +63,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; doCheck = true; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 8f6beb01ea39..0f040a00ca40 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.65.0"; + version = "1.66.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "1k906pll4k8bc2xc9qd9g7q10rikbij2sy0w2wg9mf335rfym6z4"; + hash = "sha256-IhA6mk7s6AdONRpvQ5UgNbPJ+/k9hzCf2ochCVcy7NA="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0jc9kyn5h3cn2ni5h3km47sfprpxr7hc96ca01yal2zyksm7zqxn"; + hash = "sha256-F9JpGtQ7lwqguoZrzQR/faUOJxDCbW74JenPCFeEHdA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 7c5043165f9d..87f2d7327125 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { pname = "libnice"; version = "0.1.18"; - outputs = [ "bin" "out" "dev" "devdoc" ]; + outputs = [ "bin" "out" "dev" ] + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz"; @@ -61,7 +62,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=enabled" # Disabled by default as of libnice-0.1.15 + "-Dgtk_doc=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" + "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" "-Dexamples=disabled" # requires many dependencies and probably not useful for our users ]; diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix new file mode 100644 index 000000000000..4d4eaaacaad7 --- /dev/null +++ b/pkgs/development/python-modules/asyncmy/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asyncmy"; + version = "0.2.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "long2ice"; + repo = pname; + rev = "v${version}"; + sha256 = "ys9RYaosc4noJsWYsVo9+6W7JaG4r6lsz6UH4o08q4A="; + }; + + nativeBuildInputs = [ + cython + poetry-core + ]; + + # Not running tests as aiomysql is missing support for + # pymysql>=0.9.3 + doCheck = false; + + pythonImportsCheck = [ + "asyncmy" + ]; + + meta = with lib; { + description = "Python module to interact with MySQL/mariaDB"; + homepage = "https://github.com/long2ice/asyncmy"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index b57a26060fd6..f99407030cdd 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -3,32 +3,35 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder -, requests }: buildPythonPackage rec { pname = "awesomeversion"; - version = "21.10.1"; + version = "21.11.0"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-y+QU8T1Cb6FpRcRqhao4KPdE9XlU5C+GURaEuahC25E="; + sha256 = "sha256-qxN5AdLlzadG0/raeAyJ/37PLgYLndl1JQSVkgdLv/4="; }; postPatch = '' - substituteInPlace setup.py --replace "main" ${version} + # Upstream doesn't set a version + substituteInPlace setup.py \ + --replace "main" ${version} ''; - propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "awesomeversion" ]; + pythonImportsCheck = [ + "awesomeversion" + ]; meta = with lib; { description = "Python module to deal with versions"; diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index f14245865f59..40748f86954e 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -10,6 +10,7 @@ , mock , importlib-resources , isPy27 +, lxml }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { scikitimage procps pytestCheckHook + lxml ]; postConfigure = '' diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 8f86e6a5dd35..799b0459c3fa 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.2.1"; + version = "23.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6334aee6073db2fb1f30892697b1730105b5e9a77ce7e61fca6b435225493efe"; + sha256 = "sha256-Ct7Khr6zoveTYtksf7cZSb51HnJGPywTUOKrXA+9NwE="; }; nativeBuildInputs = [ @@ -43,12 +43,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # Keychain communications isn't possible in our build environment - # keyring.errors.KeyringError: Can't get password from keychain: (-25307, 'Unknown Error') - disabledTests = lib.optionals (stdenv.isDarwin) [ - "test_multiprocess_get" - "test_multiprocess_get_after_native_get" - ] ++ [ + disabledTests = [ # E ValueError: too many values to unpack (expected 1) "test_entry_point" ]; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 092e5b91f16c..6a883bbff33f 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { pname = "pyatv"; version = "0.9.6"; - format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -32,11 +32,6 @@ buildPythonPackage rec { sha256 = "0navm7a0k1679kj7nbkbyl7s2q0wq0xmcnizmnvp0arkd5xqmqv1"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - ''; - propagatedBuildInputs = [ aiohttp bitarray @@ -57,6 +52,18 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + # Remove all version pinning + sed -i -e "s/==[0-9.]*//" requirements/requirements.txt + ''; + + disabledTestPaths = [ + # Test doesn't work in the sandbox + "tests/protocols/companion/test_companion_auth.py" + ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix index 781363334e13..82374a8a0423 100644 --- a/pkgs/development/python-modules/rflink/default.nix +++ b/pkgs/development/python-modules/rflink/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , async-timeout , docopt , pyserial @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "rflink"; version = "0.0.58"; + format = "setuptools"; src = fetchFromGitHub { owner = "aequitas"; @@ -20,11 +22,6 @@ buildPythonPackage rec { sha256 = "1zab55lsw419gg0jfrl69ap6128vbi3wdmg5z7qin65ijpjdhasc"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "version=version_from_git()" "version='${version}'" - ''; - propagatedBuildInputs = [ async-timeout docopt @@ -37,7 +34,23 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "rflink.protocol" ]; + patches = [ + # Remove loop, https://github.com/aequitas/python-rflink/pull/61 + (fetchpatch { + name = "remove-loop.patch"; + url = "https://github.com/aequitas/python-rflink/commit/777e19b5bde3398df5b8f142896c34a01ae18d52.patch"; + sha256 = "sJmihxY3fNSfZVFhkvQ/+9gysQup/1jklKDMyDDLOs8="; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version=version_from_git()" "version='${version}'" + ''; + + pythonImportsCheck = [ + "rflink.protocol" + ]; meta = with lib; { description = "Library and CLI tools for interacting with RFlink 433MHz transceiver"; diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index bfb5ddcfe5b6..e1ee42b08157 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -1,12 +1,13 @@ { lib +, aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub -, aiohttp -, xmltodict -, yarl -, aresponses , pytest-asyncio , pytestCheckHook +, pythonOlder +, xmltodict +, yarl }: buildPythonPackage rec { @@ -14,6 +15,8 @@ buildPythonPackage rec { version = "0.8.4"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "ctalkington"; repo = "python-rokuecp"; @@ -33,6 +36,11 @@ buildPythonPackage rec { pytest-asyncio ]; + disabledTests = [ + # https://github.com/ctalkington/python-rokuecp/issues/249 + "test_resolve_hostname" + ]; + pythonImportsCheck = [ "rokuecp" ]; @@ -41,6 +49,6 @@ buildPythonPackage rec { description = "Asynchronous Python client for Roku (ECP)"; homepage = "https://github.com/ctalkington/python-rokuecp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index 1d0b938d4944..9759443228d0 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { pname = "surepy"; version = "0.7.2"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { @@ -31,8 +32,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'click = "^7.1.2"' 'click = "*"' \ - --replace 'attrs = "^20.3.0"' 'attrs = "*"' + --replace 'aiohttp = {extras = ["speedups"], version = "^3.7.4"}' 'aiohttp = {extras = ["speedups"], version = ">=3.7.4"}' \ + --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"' ''; nativeBuildInputs = [ @@ -56,7 +57,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "surepy" ]; + pythonImportsCheck = [ + "surepy" + ]; meta = with lib; { description = "Python library to interact with the Sure Petcare API"; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index b449ec59e967..059316f7a99c 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , requests +, lxml }: buildPythonPackage rec { @@ -23,6 +24,7 @@ buildPythonPackage rec { numpy pandas requests + lxml ]; doCheck = false; # Tests require internet access diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a6adbe7e597d..a29a4bc8b1a8 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.36.13"; + version = "0.37.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c="; + sha256 = "sha256-KdcRG1YKtvhcqq/FNiOVQeXlyYepvPjRL5EZJA8Axyk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 97f41b0c8a7e..df6a5e0f90ef 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, graalvm11-ce, fetchurl }: +{ lib, buildGraalvmNativeImage, fetchurl }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "clj-kondo"; version = "2021.10.19"; @@ -9,38 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-i0OeQPZfQPUeXC/Bs84I91IahBKK6W1mFix97s8/lVA="; }; - dontUnpack = true; - - buildInputs = [ graalvm11-ce ]; - - buildPhase = '' - runHook preBuild - - # https://github.com/clj-kondo/clj-kondo/blob/v2021.10.19/script/compile#L17-L21 - args=("-jar" "$src" - "-H:CLibraryPath=${graalvm11-ce.lib}/lib" - # Required to build babashka on darwin. Do not remove. - "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" - "-H:+ReportExceptionStackTraces" - "--verbose" - "--no-fallback" - "-J-Xmx3g") - - native-image ''${args[@]} - - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out/bin - cp clj-kondo $out/bin/clj-kondo - ''; + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "--no-fallback" + ]; meta = with lib; { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; license = licenses.epl10; - platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; }; } diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index a7d9aeda000b..0b113a6fe8ca 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.303.1"; + version = "2.303.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0rf06axz1hxssg942w2g66avak30jy6rfdwxynhriqv3vrf17bja"; + sha256 = "8a6ae7367755b3f31a050faa945f7a3991abdb43d941c7294cac890c1e2779d8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index 9ba85cb8fc4f..6e140620adc9 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, graalvm11-ce, fetchurl }: +{ lib, buildGraalvmNativeImage, fetchurl }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "jet"; version = "0.1.0"; @@ -14,46 +14,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-mOUiKEM5tYhtpBpm7KtslyPYFsJ+Wr+4ul6Zi4aS09Q="; }; - dontUnpack = true; - - buildInputs = [ graalvm11-ce ]; - - buildPhase = '' - runHook preBuild - - # https://github.com/borkdude/jet/blob/v0.1.0/script/compile#L16-L29 - args=("-jar" "$src" - "-H:CLibraryPath=${graalvm11-ce.lib}/lib" - # Required to build jet on darwin. Do not remove. - "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" - "-H:Name=jet" - "-H:+ReportExceptionStackTraces" - "-J-Dclojure.spec.skip-macros=true" - "-J-Dclojure.compiler.direct-linking=true" - "-H:IncludeResources=JET_VERSION" - "-H:ReflectionConfigurationFiles=${reflectionJson}" - "--initialize-at-build-time" - "-H:Log=registerResource:" - "--verbose" - "--no-fallback" - "--no-server" - "-J-Xmx3g") - - native-image ''${args[@]} - - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out/bin - cp jet $out/bin/jet - ''; + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "-J-Dclojure.spec.skip-macros=true" + "-J-Dclojure.compiler.direct-linking=true" + "-H:IncludeResources=JET_VERSION" + "-H:ReflectionConfigurationFiles=${reflectionJson}" + "--initialize-at-build-time" + "-H:Log=registerResource:" + "--no-fallback" + "--no-server" + ]; meta = with lib; { description = "CLI to transform between JSON, EDN and Transit, powered with a minimal query language"; homepage = "https://github.com/borkdude/jet"; license = licenses.epl10; - platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ ericdallo ]; }; } diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 9128b3f190e1..5e3c750852df 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub, clojure, writeScript }: +{ lib, stdenv, buildGraalvmNativeImage, babashka, fetchurl, fetchFromGitHub, clojure, writeScript }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "clojure-lsp"; version = "2021.11.02-15.24.47"; @@ -16,48 +16,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-k0mzibcLAspklCPE6f2qsUm9bwSvcJRgWecMBq7mpF0="; }; - GRAALVM_HOME = graalvm11-ce; - CLOJURE_LSP_JAR = jar; - CLOJURE_LSP_XMX = "-J-Xmx6g"; + # https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27 + DTLV_LIB_EXTRACT_DIR = "/tmp"; - buildInputs = [ graalvm11-ce clojure ]; - - buildPhase = with lib; '' - runHook preBuild - - # https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27 - DTLV_LIB_EXTRACT_DIR=$(mktemp -d) - export DTLV_LIB_EXTRACT_DIR=$DTLV_LIB_EXTRACT_DIR - - args=("-jar" "$CLOJURE_LSP_JAR" - "-H:+ReportExceptionStackTraces" - "-H:CLibraryPath=${graalvm11-ce.lib}/lib" - "-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR" - "--verbose" - "--no-fallback" - "--native-image-info" - "$CLOJURE_LSP_XMX") - - native-image ''${args[@]} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm755 ./clojure-lsp $out/bin/clojure-lsp - - runHook postInstall - ''; + extraNativeImageBuildArgs = [ + "-H:CLibraryPath=${DTLV_LIB_EXTRACT_DIR}" + "--no-fallback" + "--native-image-info" + ]; doCheck = true; checkPhase = '' runHook preCheck export HOME="$(mktemp -d)" - ./clojure-lsp --version | fgrep -q '${version}' - ${babashka}/bin/bb integration-test ./clojure-lsp + ./${pname} --version | fgrep -q '${version}' + ${babashka}/bin/bb integration-test ./${pname} runHook postCheck ''; @@ -88,7 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/clojure-lsp/clojure-lsp"; license = licenses.mit; maintainers = with maintainers; [ ericdallo babariviere ]; - platforms = graalvm11-ce.meta.platforms; # Depends on datalevin that is x86_64 only # https://github.com/juji-io/datalevin/blob/bb7d9328f4739cddea5d272b5cd6d6dcb5345da6/native/src/java/datalevin/ni/Lib.java#L86-L102 broken = !stdenv.isx86_64; diff --git a/pkgs/development/tools/parsing/antlr/4.8.nix b/pkgs/development/tools/parsing/antlr/4.8.nix index 0708ba754b2a..0e69227aa786 100644 --- a/pkgs/development/tools/parsing/antlr/4.8.nix +++ b/pkgs/development/tools/parsing/antlr/4.8.nix @@ -22,6 +22,10 @@ let buildInputs = lib.optional stdenv.isLinux libuuid ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; + # Install CMake config files, used to locate the runtime from another + # CMake project, using the find_package function. + cmakeFlags = [ "-DANTLR4_INSTALL=ON" ]; + postUnpack = '' export sourceRoot=$sourceRoot/runtime/Cpp ''; diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix new file mode 100644 index 000000000000..4ffc0a24264e --- /dev/null +++ b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: +buildGoModule rec { + pname = "protoc-gen-go-vtproto"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "planetscale"; + repo = "vtprotobuf"; + rev = "v${version}"; + sha256 = "0kjjpfsiws4vi36ha1gajb97rwcggqw753mv2jqf09kdfszz9p63"; + }; + + vendorSha256 = "01lxwlgh3y3gp22gk5qx7r60c1j63pnpi6jnri8gf2lmiiib8fdc"; + + excludedPackages = [ "conformance" ]; + + meta = with lib; { + description = "A Protocol Buffers compiler that generates optimized marshaling & unmarshaling Go code for ProtoBuf APIv2"; + homepage = "https://github.com/planetscale/vtprotobuf"; + license = licenses.bsd3; + maintainers = [ maintainers.zane ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index f5de052e0e55..0f90f4800439 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yTtnRdDy3wGBe0SlO0165uooWu6ZMhUQw3hdDUK1e8A="; + sha256 = "0s49q8x0iscy9rgn9zgymyg39cqm251a99m341znjn55lap3pdl8"; }; - cargoSha256 = "sha256-f5vUMdyz3vDh2yE0pMKZiknsqTAKkuvTCtlgb6/gaLc="; + cargoSha256 = "0rb4s5bwjs7hri636r2viva96a6z9qjv9if6i220j9yglrvi7c8i"; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo extension for working with microcontrollers"; homepage = "https://probe.rs/"; + changelog = "https://github.com/probe-rs/cargo-flash/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; }; diff --git a/pkgs/development/tools/zprint/default.nix b/pkgs/development/tools/zprint/default.nix index f00d9c29a482..f69c2b223a92 100644 --- a/pkgs/development/tools/zprint/default.nix +++ b/pkgs/development/tools/zprint/default.nix @@ -1,40 +1,22 @@ -{ stdenv, lib, fetchurl, graalvm11-ce, glibcLocales }: +{ lib, buildGraalvmNativeImage, fetchurl }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "zprint"; version = "1.1.2"; src = fetchurl { - url = - "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; + url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; sha256 = "1wh8jyj7alfa6h0cycfwffki83wqb5d5x0p7kvgdkhl7jx7isrwj"; }; - dontUnpack = true; - - LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ graalvm11-ce glibcLocales ]; - - buildPhase = '' - native-image \ - --no-server \ - -J-Xmx7G \ - -J-Xms4G \ - -jar ${src} \ - -H:Name=${pname} \ - -H:EnableURLProtocols=https,http \ - -H:+ReportExceptionStackTraces \ - -H:CLibraryPath=${graalvm11-ce.lib}/lib \ - ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ - --report-unsupported-elements-at-runtime \ - --initialize-at-build-time \ - --no-fallback - ''; - - installPhase = '' - mkdir -p $out/bin - install ${pname} $out/bin - ''; + extraNativeImageBuildArgs = [ + "--no-server" + "-H:EnableURLProtocols=https,http" + "-H:+ReportExceptionStackTraces" + "--report-unsupported-elements-at-runtime" + "--initialize-at-build-time" + "--no-fallback" + ]; meta = with lib; { description = "Clojure/EDN source code formatter and pretty printer"; @@ -45,7 +27,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/kkinnear/zprint"; license = licenses.mit; - platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ stelcodes ]; }; } diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index d27dac79b7b3..9882f95f5283 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.16.2"; + version = "1.16.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qf1eDQ6ZbBGOQIDh2q8hKjsKB0Ri9Hjqq1AMOTanML0="; + sha256 = "sha256-9qfBreviTcWgkvZCD7bSvCaC40G+u1v4geGissJ4jE4="; }; - cargoSha256 = "sha256-ZA9pR8yQV5v/Xa/B7M01PIqrkBe1DVIXC5VURoE1EtI="; + cargoSha256 = "sha256-20o3JgpL4tHVDoH/l3yM7kCZyXu/vciA8ACubzRvPKA="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 7539f41e3afe..73dcd7593d8f 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.34.0"; + version = "0.35.0"; shas = { - x86_64-linux = "sha256-Ly5bEfC993JH3/1VNpFu72Dv8kJYOFu+HIlEUJJcHps="; - aarch64-linux = "sha256-zazlvm4uyHD6Z+2JmeHS7gQ84C83KTWOGqNjSNPgoT0="; - x86_64-darwin = "sha256-RTgbtkCAuIj/ceJNbdA0yfKtFG8hSZgurEHEuUfJ7fk="; - aarch64-darwin = "sha256-xrOUPEZ4tj2BK6pDeoTpTKDx4E1KUEQ+lGMyduKDvBE="; + x86_64-linux = "sha256-vMqLxARbR39G7YSACvqxp+3WLDcfivDgMkvkAEtJ758="; + aarch64-linux = "sha256-8rU4Z+eOt4RduiYM97uPiVLAspPkvmf7oeTVuVfBjII="; + x86_64-darwin = "sha256-SIXXfK72FfwGv44Z+Qu+a5YAtUaqo/qEpMJZdpOdr3A="; + aarch64-darwin = "sha256-FAzwPlST02O5b/T9cz+uKNp6GFhFrgQnmabrAjMfmWc="; }; } diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 02ae1bfe9260..09507954670d 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , fetchFromGitHub , gradle_6 -, jdk11 +, jdk , perl # for arc @@ -87,8 +87,7 @@ let popd ''; - jdk = jdk11; - gradle = (gradle_6.override (old: { java = jdk11; })); + gradle = (gradle_6.override (old: { java = jdk; })); # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { @@ -129,6 +128,15 @@ stdenv.mkDerivation rec { rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so '' + cleanupMindustrySrc; + # Propagate glew to prevent it from being cleaned up. + # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there, + # and will assume that it's not actually needed. + # This can cause issues. + # See https://github.com/NixOS/nixpkgs/issues/109798. + propagatedBuildInputs = lib.optionals enableClient [ + glew.out + ]; + buildInputs = lib.optionals enableClient [ SDL2 glew @@ -157,9 +165,11 @@ stdenv.mkDerivation rec { '' + optionalString enableClient '' gradle --offline --no-daemon jnigenBuild -Pbuildversion=${buildVersion} gradle --offline --no-daemon sdlnatives -Pdynamic -Pbuildversion=${buildVersion} + glewlib=${lib.getLib glew}/lib/libGLEW.so + sdllib=${lib.getLib SDL2}/lib/libSDL2.so patchelf ../Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so \ - --add-needed ${glew.out}/lib/libGLEW.so \ - --add-needed ${SDL2}/lib/libSDL2.so + --add-needed $glewlib \ + --add-needed $sdllib gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion} '' + optionalString enableServer '' gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} @@ -191,8 +201,6 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 - broken = stdenv.isDarwin - # does not work with any maintained java version (https://github.com/Anuken/Mindustry/issues/5114) - || true; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index ab13e041139c..c8a1b8983f32 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -50,10 +50,11 @@ let mkLibRetroCore = { core , description + # Check https://github.com/libretro/libretro-core-info for license information , license , src ? null , broken ? false - , version ? "unstable-2021-11-16" + , version ? "unstable-2021-11-22" , ... }@args: lib.makeOverridable stdenv.mkDerivation ( @@ -82,13 +83,18 @@ let }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" ] ++ (args.makeFlags or [ ]); + coreDir = "${placeholder "out"}/lib/retroarch/cores"; + installPhase = '' - COREDIR="$out/lib/retroarch/cores" + runHook preInstall + mkdir -p $out/bin - mkdir -p $COREDIR - mv ${d2u args.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $COREDIR + mkdir -p $coreDir + mv ${d2u args.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $coreDir makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \ - --add-flags "-L $COREDIR/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@" + --add-flags "-L $coreDir/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@" + + runHook postInstall ''; enableParallelBuilding = true; @@ -108,6 +114,8 @@ let ); in { + inherit mkLibRetroCore; + atari800 = mkLibRetroCore { core = "atari800"; description = "Port of Atari800 to libretro"; @@ -116,14 +124,6 @@ in makeFlags = [ "GIT_VERSION=" ]; }; - beetle-snes = mkLibRetroCore { - core = "mednafen-snes"; - src = getCoreSrc "beetle-snes"; - description = "Port of Mednafen's SNES core to libretro"; - license = lib.licenses.gpl2Only; - makefile = "Makefile"; - }; - beetle-gba = mkLibRetroCore { core = "mednafen-gba"; src = getCoreSrc "beetle-gba"; @@ -189,19 +189,15 @@ in description = "Port of Mednafen's Saturn core to libretro"; license = lib.licenses.gpl2Only; makefile = "Makefile"; - makeFlags = [ "HAVE_HW=0" ]; meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; }; - beetle-saturn-hw = mkLibRetroCore { - core = "mednafen-saturn-hw"; - src = getCoreSrc "beetle-saturn"; - description = "Port of Mednafen's Saturn core to libretro"; + beetle-snes = mkLibRetroCore { + core = "mednafen-snes"; + src = getCoreSrc "beetle-snes"; + description = "Port of Mednafen's SNES core to libretro"; license = lib.licenses.gpl2Only; - extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; - makeFlags = [ "HAVE_OPENGL=1" "HAVE_HW=1" ]; - meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; }; beetle-supergrafx = mkLibRetroCore { @@ -212,14 +208,6 @@ in makefile = "Makefile"; }; - beetle-wswan = mkLibRetroCore { - core = "mednafen-wswan"; - src = getCoreSrc "beetle-wswan"; - description = "Port of Mednafen's WonderSwan core to libretro"; - license = lib.licenses.gpl2Only; - makefile = "Makefile"; - }; - beetle-vb = mkLibRetroCore { core = "mednafen-vb"; src = getCoreSrc "beetle-vb"; @@ -228,12 +216,63 @@ in makefile = "Makefile"; }; + beetle-wswan = mkLibRetroCore { + core = "mednafen-wswan"; + src = getCoreSrc "beetle-wswan"; + description = "Port of Mednafen's WonderSwan core to libretro"; + license = lib.licenses.gpl2Only; + makefile = "Makefile"; + }; + + blastem = mkLibRetroCore { + core = "blastem"; + description = "Port of BlastEm to libretro"; + license = lib.licenses.gpl3Only; + }; + bluemsx = mkLibRetroCore { core = "bluemsx"; description = "Port of BlueMSX to libretro"; license = lib.licenses.gpl2Only; }; + bsnes = mkLibRetroCore { + core = "bsnes"; + description = "Port of bsnes to libretro"; + license = lib.licenses.gpl3Only; + makefile = "Makefile"; + # https://github.com/libretro/bsnes-libretro/issues/10 + patches = [ + (fetchpatch { + name = "added-missing-GB_VERSION-define.patch"; + url = "https://github.com/nE0sIghT/bsnes-libretro/commit/97fd8b486f9a9046277a580b238b6673a98f7f72.patch"; + sha256 = "sha256-gCiy6sqc9sixT6Appr5ZCfHyBE2jYhPb0KvI63nfmEc="; + }) + ]; + }; + + bsnes-hd = + let + # linux = bsd + # https://github.com/DerKoun/bsnes-hd/blob/f0b6cf34e9780d53516977ed2de64137a8bcc3c5/bsnes/GNUmakefile#L37 + platform = if stdenv.isDarwin then "macos" else "linux"; + in + mkLibRetroCore { + core = "bsnes-hd-beta"; + src = getCoreSrc "bsnes-hd"; + description = "Port of bsnes-hd to libretro"; + license = lib.licenses.gpl3Only; + makefile = "GNUmakefile"; + makeFlags = [ + "-C" + "bsnes" + "target=libretro" + "platform=${platform}" + ]; + extraBuildInputs = [ xorg.libX11 xorg.libXext ]; + postBuild = "cd bsnes/out"; + }; + bsnes-mercury = mkLibRetroCore { core = "bsnes-mercury-accuracy"; src = getCoreSrc "bsnes-mercury"; @@ -243,6 +282,24 @@ in makeFlags = [ "PROFILE=accuracy" ]; }; + bsnes-mercury-balanced = mkLibRetroCore { + core = "bsnes-mercury-balanced"; + src = getCoreSrc "bsnes-mercury"; + description = "Fork of bsnes with HLE DSP emulation restored"; + license = lib.licenses.gpl3Only; + makefile = "Makefile"; + makeFlags = [ "PROFILE=balanced" ]; + }; + + bsnes-mercury-performance = mkLibRetroCore { + core = "bsnes-mercury-performance"; + src = getCoreSrc "bsnes-mercury"; + description = "Fork of bsnes with HLE DSP emulation restored"; + license = lib.licenses.gpl3Only; + makefile = "Makefile"; + makeFlags = [ "PROFILE=performance" ]; + }; + citra = mkLibRetroCore { core = "citra"; # `nix-prefetch-github` doesn't support `deepClone`, necessary for citra @@ -503,6 +560,14 @@ in enableParallelBuilding = false; }; + melonds = mkLibRetroCore { + core = "melonds"; + description = "Port of MelonDS to libretro"; + license = lib.licenses.gpl3Only; + extraBuildInputs = [ libGL libGLU ]; + makefile = "Makefile"; + }; + mesen = mkLibRetroCore { core = "mesen"; description = "Port of Mesen to libretro"; @@ -511,6 +576,20 @@ in preBuild = "cd Libretro"; }; + mesen-s = mkLibRetroCore { + core = "mesens"; + src = getCoreSrc "mesen-s"; + description = "Port of Mesen-S to libretro"; + license = lib.licenses.gpl3Only; + makefile = "Makefile"; + preBuild = "cd Libretro"; + postInstall = '' + # fix library name to match libretro-core-info + mv $coreDir/mesens_libretro${stdenv.hostPlatform.extensions.sharedLibrary} \ + $coreDir/mesen-s_libretro${stdenv.hostPlatform.extensions.sharedLibrary} + ''; + }; + meteor = mkLibRetroCore { core = "meteor"; description = "Port of Meteor to libretro"; @@ -724,6 +803,19 @@ in makefile = "Makefile"; }; + swanstation = mkLibRetroCore { + core = "swanstation"; + description = "Port of SwanStation (a fork of DuckStation) to libretro"; + license = lib.licenses.gpl3Only; + extraNativeBuildInputs = [ cmake ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_LIBRETRO_CORE=ON" + ]; + postPatch = "mkdir -p src/duckstation-libretro"; + }; + tgbdual = mkLibRetroCore { core = "tgbdual"; description = "Port of TGBDual to libretro"; @@ -757,12 +849,6 @@ in postBuild = "cd lib"; }; - vba-next = mkLibRetroCore { - core = "vba-next"; - description = "VBA-M libretro port with modifications for speed"; - license = lib.licenses.gpl2Only; - }; - vba-m = mkLibRetroCore { core = "vbam"; src = getCoreSrc "vba-m"; @@ -772,6 +858,12 @@ in preBuild = "cd src/libretro"; }; + vba-next = mkLibRetroCore { + core = "vba-next"; + description = "VBA-M libretro port with modifications for speed"; + license = lib.licenses.gpl2Only; + }; + vecx = mkLibRetroCore { core = "vecx"; description = "Port of Vecx to libretro"; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index b2621ba8cc13..5a294277c80c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -36,16 +36,18 @@ with lib; let + mainVersion = "1.9.13"; + revision = "2"; libretroSuperSrc = fetchFromGitHub { owner = "libretro"; - repo = "libretro-super"; - sha256 = "sha256-4WB6/1DDec+smhMJKLCxWb4+LQlZN8v2ik69saKixkE="; - rev = "fa70d9843838df719623094965bd447e4db0d1b4"; + repo = "libretro-core-info"; + sha256 = "sha256-jM+iXNSCpJy4wOk1S72G1UjNGBzejyhs5LFFWCFjs2c="; + rev = "v${mainVersion}"; }; in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.9.13.2"; + version = "${lib.concatStringsSep "." [ mainVersion revision ]}"; src = fetchFromGitHub { owner = "libretro"; @@ -98,7 +100,7 @@ stdenv.mkDerivation rec { postInstall = optionalString withVulkan '' mkdir -p $out/share/libretro/info # TODO: ideally each core should have its own core information - cp -r ${libretroSuperSrc}/dist/info/* $out/share/libretro/info + cp -r ${libretroSuperSrc}/* $out/share/libretro/info wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ''; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index a849a37bfab4..9eab19b29ad1 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -6,13 +6,6 @@ "sha256": "LJpRegJVR2+sS1UmTTpVest0rMrNDBMXmj/jRFVglWI=", "fetchSubmodules": false }, - "beetle-snes": { - "owner": "libretro", - "repo": "beetle-bsnes-libretro", - "rev": "bc867656d7438aaffc6818b3b92350587bc78a47", - "sha256": "TyUCRGK+uyXowDjXW9/4m+zL8Vh/3GGsX1eznrTCbAg=", - "fetchSubmodules": false - }, "beetle-gba": { "owner": "libretro", "repo": "beetle-gba-libretro", @@ -30,57 +23,71 @@ "beetle-ngp": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "f969af2b52f20642aea7e800e3cfcce728f3aee9", - "sha256": "GIzLZ3iOJeHKdAowhM4S56iouaxX8v2XZgc/ZiCzCPk=", + "rev": "f7c393184e5228c3d3807ee74c951c4c549107d8", + "sha256": "7vki8VkwOzxwMZcUxekg1DFSskV7VNQ1SRaU3M1xHZ0=", "fetchSubmodules": false }, "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "81d4c9d07a76c89c32ad0e7450b69bde6403836f", - "sha256": "LhQbAEUMhoIF3VfwLbhtD7xxSddzdgwIHHnSabQPAvs=", + "rev": "a7608100d1cdd8eb65aea82fede7da61dcc3c5f1", + "sha256": "3v/TGz4y52IodXRmt/peZlabNS+quQVN9t5xucC2plg=", "fetchSubmodules": false }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "a1f1734509dd6acb11269f118d61f480ae8dbacf", - "sha256": "rvRDuYJLxb1TSwNXhp3ATJW0sQgWi8Cj4NR3hep/AJk=", + "rev": "19f2b7ce529e70655db04d3dd4faf32b4de14df2", + "sha256": "K3ZjOd8IGtwlwxExNAmHsOC0N0fz06w/3uua7sAm8Jc=", "fetchSubmodules": false }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "ccca81930a078c0efd77b00327d2ee212698f3b4", - "sha256": "Hy8Zrp0kTR+Mfbq0nVYerSarRCxZI+ykgDOscakDMiU=", + "rev": "bc1b6af8d7b8dd0b4133040fef82725520bbd560", + "sha256": "QgBB05o7941LsNKl2EIKy185xgcAf1vrAZgQiray/x0=", "fetchSubmodules": false }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "e1119e91a4e3f4b30971455aeb3c1a6f4cd05e59", - "sha256": "lKlNNAHK1ynFXY++Ya0m1Ax5YTZkd44eQjzuOLXfWa8=", + "rev": "f97fda5447d883220ce2f53a15f2cbe4790a8392", + "sha256": "r4kvrTIw1sOf5nEuPq2xF/QXw+0COQYWyERJ7HX1sFU=", + "fetchSubmodules": false + }, + "beetle-snes": { + "owner": "libretro", + "repo": "beetle-bsnes-libretro", + "rev": "bc867656d7438aaffc6818b3b92350587bc78a47", + "sha256": "TyUCRGK+uyXowDjXW9/4m+zL8Vh/3GGsX1eznrTCbAg=", "fetchSubmodules": false }, "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "59062662d6e925ad512fcbb9c1a0db97d1592bc1", - "sha256": "kGyl5XJMFUALPAEZf4IynY6bmXWfqy0o65eO8zS0RTE=", - "fetchSubmodules": false - }, - "beetle-wswan": { - "owner": "libretro", - "repo": "beetle-wswan-libretro", - "rev": "0c7faaf7f70b72ebb68e310530cd46a69e680d40", - "sha256": "UQyICcZe1DVotSFt0QVnGop+JG5NJwTBcGSZaFW0P0U=", + "rev": "083d102389a1ffaeddfa525a186adde0f35e42fc", + "sha256": "4hTOYPnOWdhb7CfWKZFO53NBFGa3lg0745ncBU6ejiQ=", "fetchSubmodules": false }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "1bd0da71c8f6add253ad76e2b6e1357cd09fc304", - "sha256": "KguKbRK0uXE+brpF8HdRwi8Gt76AMa4wkh1MFvNCbN4=", + "rev": "aa77198c6c60b935503b5ea2149b8ff7598344da", + "sha256": "ShsMYc2vjDoiN1yCCoSl91P5ecYJDj/V+VWUYuYVxas=", + "fetchSubmodules": false + }, + "beetle-wswan": { + "owner": "libretro", + "repo": "beetle-wswan-libretro", + "rev": "3fcb582755a509ae33fc52cd0ca4b3edffc734ef", + "sha256": "XHTzXlTt8op0bDLNn833Unt57zclXowlLhG3qvWwjXQ=", + "fetchSubmodules": false + }, + "blastem": { + "owner": "libretro", + "repo": "blastem", + "rev": "0786858437ed71996f43b7af0fbe627eb88152fc", + "sha256": "uEP5hSgLAle1cLv/EM7D11TJMAggu7pqWxfrUt3rhEg=", "fetchSubmodules": false }, "bluemsx": { @@ -90,6 +97,20 @@ "sha256": "ix/AyYNer1R73ZJW1reXyj7geBr3ThrqXf5Ki5yrz9A=", "fetchSubmodules": false }, + "bsnes": { + "owner": "libretro", + "repo": "bsnes-libretro", + "rev": "44d97b17d06a10ae17d97a91a48e5acd10ec6db4", + "sha256": "VNSeTRryrX2/V38GGXTRLuDEQqDUmX2DUOHAKLxJezU=", + "fetchSubmodules": false + }, + "bsnes-hd": { + "owner": "DerKoun", + "repo": "bsnes-hd", + "rev": "65f24e56c37f46bb752190024bd4058e64ad77d1", + "sha256": "1dk2i71NOLeTTOZjVll8wrkr5dIH5bGSGUeeHqWjZHE=", + "fetchSubmodules": false + }, "bsnes-mercury": { "owner": "libretro", "repo": "bsnes-mercury", @@ -121,8 +142,8 @@ "dolphin": { "owner": "libretro", "repo": "dolphin", - "rev": "82e617439b622af5d1189e9fec67e7f1376be099", - "sha256": "Q3a+0SYocX1hBGLs1K9r932NkiCDFINPhtHeyzUknJE=", + "rev": "d5193c4391addbd257b2aafe943a138ba89e20fb", + "sha256": "uRhYMO+fmAfwEr/KTKAhx//dKq44YdvhXxp7v+Gol0w=", "fetchSubmodules": false }, "dosbox": { @@ -149,29 +170,29 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "4d6387b7f3e3f1a9c25015789d751c6db1a9ae8c", - "sha256": "bIOmvhu9mOfOXoOTbwbjMHIZ3JkGz96yyFZALmqkOmk=", + "rev": "2447dd5385cb193801dc46be7b50a807d13162aa", + "sha256": "x70kPEC9LVm9ZyH5sviI8iW9dCkIi+lx2ns03OId2Oc=", "fetchSubmodules": false }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "a918869c18c9f30b84e04260b78b675b8a3c7be1", - "sha256": "nDYPrwIsvhWveDQDE0WEK7GO60iRE967p1XxXn+lNj4=", + "rev": "8864f6e246e4ba511b95a48713456b0dd3b3045b", + "sha256": "GrkD54ElseEYczPSb9WGTvI8SaNy/fWV4zve7sG9TTY=", "fetchSubmodules": false }, "flycast": { "owner": "libretro", "repo": "flycast", - "rev": "ae670ea28fdbb9f08149cb598312a71a0970ca67", - "sha256": "jmSOfyak5mX04HgZOtCF9cz8HqAApxDXHJ6IqhqGILE=", + "rev": "254b66a017a087f0833777760b879abfe7f9d5cd", + "sha256": "pkgVjZCGlgq95Cv+xWLl3sjq+jIpgnfuVaXGDYtuGAY=", "fetchSubmodules": false }, "fmsx": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "20c805409b8f6e1f9d61cb3dff0d5b28d82d1ee3", - "sha256": "uqqVF2+YpfWOKbe8aIreoImFb3/kL8ohslJkl+JivQI=", + "rev": "7b0c70c25fcc7f4bb876e729eacfcc01f494df60", + "sha256": "H3ttVMw3cUxXJ64olbTSO6K7YBpmdgKnaLEpTS9QQEg=", "fetchSubmodules": false }, "freeintv": { @@ -184,22 +205,22 @@ "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "4b822bcf561856689e101dd5505d365de5ffcffe", - "sha256": "FsIQLd/UO5xs/aTpggSn8WLPgi83gsxRlwKR+UzH+TY=", + "rev": "c842d49b1daab6e45f3a1802ee7516b100827599", + "sha256": "DUj4vEh3x7MaE8bHDwOoDY7K2yEkTGz8Cf3fx4sgCvY=", "fetchSubmodules": false }, "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "309a4aacfd582c312dcad61b7abfdffba4a0c66e", - "sha256": "jnbey1USldDZGXGXLLR5TgSJZgD+6ZFpwfIf6c8xvyM=", + "rev": "c1c605e862c4a277e880b510c68ebde630487948", + "sha256": "wDEwG+VMs0hXjL1pBn+wmvtaaN4nax+Dm6Ocy7HCLbQ=", "fetchSubmodules": false }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "a2aa78733d8daf1d550c9dc76c6ff94e8670b31c", - "sha256": "nKim7YkksUyZO97SvrW1TEYQlA+7Yi7xbLtyDPV4LWc=", + "rev": "bc0a3cf2c182b7f60c80464309a791377bef5af3", + "sha256": "27eOnAp6pzZAK5o1of5+2Fx/hHtUsjbBQlefdsCv0rk=", "fetchSubmodules": false }, "gw": { @@ -240,15 +261,15 @@ "mame2003": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "d0ed1a565803cfada9f4088326eae616f6e5f8a3", - "sha256": "JGEy6Mp5qcZwaehzbj+qpdBfxHzqi6qIR7akxIj/WK8=", + "rev": "e6595b3fa677158a7d834391517ae68e3c5f8f41", + "sha256": "qxynDUQWtUKxJ7H7q9nGFhIjr1Pkrgtp8aJdTtG5/xU=", "fetchSubmodules": false }, "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "841e44dff953a346127f15be53cb34778e20ce1c", - "sha256": "aCXyeDcz0uSObe4S2bQWCxIAF5aA3kne5v0HT+oXHuw=", + "rev": "680f4679c7a15fcec007eff8ba9578567b821daa", + "sha256": "nxpmPE79C3hgeFLlwS4fHYteSmC4xuis1UySlqhqvzk=", "fetchSubmodules": false }, "mame2010": { @@ -272,11 +293,25 @@ "sha256": "GQ4Sdg/1nZRT4Z1Aqq1zPo96duqIGyt6sjghf9ap2Jg=", "fetchSubmodules": false }, + "melonds": { + "owner": "libretro", + "repo": "melonds", + "rev": "1ad65728476d7b9594c4ff91a1ba60460a0a30e7", + "sha256": "EBV8F2MCmWuxWKMOXipTZKRGHqp8sb/ojK3JpGZe818=", + "fetchSubmodules": false + }, "mesen": { - "owner": "SourMesen", + "owner": "libretro", "repo": "mesen", - "rev": "86326e832974d984846ae078e568c023a5f76f1f", - "sha256": "At5rhlJ6rAnXaQrmRA1NtCCi+Ff/ytlt5dwsaXZhxXg=", + "rev": "094d82bf724448426acbaad45e83bc38994e32f6", + "sha256": "9+AqZRv8lugNNa+ZZzIPJNO87J1aBUEiOggL8aYno1M=", + "fetchSubmodules": false + }, + "mesen-s": { + "owner": "libretro", + "repo": "mesen-s", + "rev": "42eb0e8ad346608dae86feb8a04833d16ad21541", + "sha256": "q6zeoNiZtFy8ZYls9/E+O7o9BYTcVcmYjbJA48qiraU=", "fetchSubmodules": false }, "meteor": { @@ -331,8 +366,8 @@ "opera": { "owner": "libretro", "repo": "opera-libretro", - "rev": "d8aa7cecf96298bd7ee51718086f7b1bc8c57e2a", - "sha256": "1t+zwCVmqiPFFNCNq9XzVfRGbEA1q8v4jzhOb+wV/nA=", + "rev": "aa868e656b518567a95b11b2f14c5db8001b11a0", + "sha256": "YUzfHtgKCzgxZwslFxwmAN0hg+MIGLAYBAI7RUCIW40=", "fetchSubmodules": false }, "parallel-n64": { @@ -352,22 +387,22 @@ "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "9cb99ce36f93871b05c5adc2790b2e33e63b50b6", - "sha256": "hhdEuri1hSNLAkno8Rwd0Yls11Yh6Q7/+t4T2LH+BaE=", + "rev": "3edf1a00f64e0f22331233bb1638170115b2ac2e", + "sha256": "4IWYOJ2wTDkdO4FxsAWCV724VNViHIb42nYc+j4pekU=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "b8e16159734c2068db0f2f12b11bc16ef55058ce", - "sha256": "qjp1rEjmDAAB2wXITA3lAS+ERJuZinoneJToYiYRi/w=", + "rev": "6b9cc418004c01a195c78387752cc99245ba54d5", + "sha256": "sha256-7nU5fQ8pQLmKy9Swmshkv2oj+HV0oTcqQ93LfNSq1us=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "b6e7fe1aaf2bbb8f4faa1378bf14f434aea33cc1", - "sha256": "Kif6oF8Bjhgc02xKDivCG9RBxj5wxNFEwxl9nX3AZug=", + "rev": "712b87ae57d4e69ad5ba98d331912dead31b9c01", + "sha256": "sygZYAOkFrrfpaF6nfKMBecJTNeXk48oqlCRncPb340=", "fetchSubmodules": true }, "prboom": { @@ -394,8 +429,8 @@ "sameboy": { "owner": "libretro", "repo": "sameboy", - "rev": "68f67b3db7747ba7aac84c5c253bc71d5a906525", - "sha256": "/4JQ1Tem3UgOUIcsLV0aLU+1R55hMTaT+wWElwj00Q4=", + "rev": "fb3c7dd7d89df1f696e4cde33a868e141c927790", + "sha256": "KFVNl43AJ11thHFFSJ6BO7wxfxhVdDVF+BAm1+GIzIs=", "fetchSubmodules": false }, "scummvm": { @@ -415,8 +450,8 @@ "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "edc32fc0bd6aea6d5645a03f0f94b72f3cbfa43e", - "sha256": "Zeojdoykmk+lpG1z5EdZToGWYDQvSSQqaEr7F68iyk0=", + "rev": "cf1a5901fccafdaead225b0a5e55ff74fdcf9678", + "sha256": "p6qTCZnZSV5vgpZglI/HMi/wOfu0hG2TuvOQhQHeo2s=", "fetchSubmodules": false }, "snes9x2002": { @@ -443,8 +478,8 @@ "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "e1035b74fce26932078d00e8625688927efce34c", - "sha256": "+ZvSCnnoKGyToSFqUQOArolFdgUcBBFNjFw8aoVDkYI=", + "rev": "f619b4e5cb01eefe0c01dedc01b452b3f74aab26", + "sha256": "Oe++mDo1InvlvbRLlxcSjNQpioj4+ytt6ihTcvrD8g4=", "fetchSubmodules": false }, "stella2014": { @@ -454,6 +489,13 @@ "sha256": "s7LQ47sAPTyk4COONk4qnebxCq78zGLIjh3Y2+1fIak=", "fetchSubmodules": false }, + "swanstation": { + "owner": "libretro", + "repo": "swanstation", + "rev": "cc3946b2b3bd10282bc46078c245db09f6e68836", + "sha256": "UzdmjUS6+6z4K6VJtMPxOwGXsCtxoh08RWTNHlvy/h8=", + "fetchSubmodules": false + }, "tgbdual": { "owner": "libretro", "repo": "tgbdual-libretro", @@ -475,13 +517,6 @@ "sha256": "SXJvWX6Q3BrdajNnT4HIf6H2z7dXXvnXTJXf/TYRw4I=", "fetchSubmodules": true }, - "vba-next": { - "owner": "libretro", - "repo": "vba-next", - "rev": "b218f48bb27b5d3885fa4076ff325922b5acd817", - "sha256": "idqGMbMA9mZlIh0QAba3BxpPDi/bFJJkUbnxV3xMOCo=", - "fetchSubmodules": false - }, "vba-m": { "owner": "libretro", "repo": "vbam-libretro", @@ -489,6 +524,13 @@ "sha256": "vJWjdqJ913NLGL4G15sRPqO/wp9xPsuhUMLUuAbDRKk=", "fetchSubmodules": false }, + "vba-next": { + "owner": "libretro", + "repo": "vba-next", + "rev": "b218f48bb27b5d3885fa4076ff325922b5acd817", + "sha256": "idqGMbMA9mZlIh0QAba3BxpPDi/bFJJkUbnxV3xMOCo=", + "fetchSubmodules": false + }, "vecx": { "owner": "libretro", "repo": "libretro-vecx", diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index db43db13575f..3c1ea2b755b1 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -11,7 +11,6 @@ SCRIPT_PATH = Path(__file__).absolute().parent HASHES_PATH = SCRIPT_PATH / "hashes.json" CORES = { "atari800": {"repo": "libretro-atari800"}, - "beetle-snes": {"repo": "beetle-bsnes-libretro"}, "beetle-gba": {"repo": "beetle-gba-libretro"}, "beetle-lynx": {"repo": "beetle-lynx-libretro"}, "beetle-ngp": {"repo": "beetle-ngp-libretro"}, @@ -19,10 +18,14 @@ CORES = { "beetle-pcfx": {"repo": "beetle-pcfx-libretro"}, "beetle-psx": {"repo": "beetle-psx-libretro"}, "beetle-saturn": {"repo": "beetle-saturn-libretro"}, + "beetle-snes": {"repo": "beetle-bsnes-libretro"}, "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, - "beetle-wswan": {"repo": "beetle-wswan-libretro"}, "beetle-vb": {"repo": "beetle-vb-libretro"}, + "beetle-wswan": {"repo": "beetle-wswan-libretro"}, + "blastem": {"repo": "blastem"}, "bluemsx": {"repo": "bluemsx-libretro"}, + "bsnes": {"repo": "bsnes-libretro"}, + "bsnes-hd": {"repo": "bsnes-hd", "owner": "DerKoun"}, "bsnes-mercury": {"repo": "bsnes-mercury"}, "citra": {"repo": "citra", "fetch_submodules": True}, "desmume": {"repo": "desmume"}, @@ -49,7 +52,9 @@ CORES = { "mame2010": {"repo": "mame2010-libretro"}, "mame2015": {"repo": "mame2015-libretro"}, "mame2016": {"repo": "mame2016-libretro"}, - "mesen": {"repo": "mesen", "owner": "SourMesen"}, + "melonds": {"repo": "melonds"}, + "mesen": {"repo": "mesen"}, + "mesen-s": {"repo": "mesen-s"}, "meteor": {"repo": "meteor-libretro"}, "mgba": {"repo": "mgba"}, "mupen64plus": {"repo": "mupen64plus-libretro-nx"}, @@ -75,11 +80,12 @@ CORES = { "snes9x2010": {"repo": "snes9x2010"}, "stella": {"repo": "stella", "owner": "stella-emu"}, "stella2014": {"repo": "stella2014-libretro"}, + "swanstation": {"repo": "swanstation"}, "tgbdual": {"repo": "tgbdual-libretro"}, "thepowdertoy": {"repo": "ThePowderToy"}, "tic80": {"repo": "tic-80", "fetch_submodules": True}, - "vba-next": {"repo": "vba-next"}, "vba-m": {"repo": "vbam-libretro"}, + "vba-next": {"repo": "vba-next"}, "vecx": {"repo": "libretro-vecx"}, "virtualjaguar": {"repo": "virtualjaguar-libretro"}, "yabause": {"repo": "yabause"}, @@ -112,21 +118,33 @@ def get_repo_hash(fetcher="fetchFromGitHub", **kwargs): raise ValueError(f"Unsupported fetcher: {fetcher}") -def get_repo_hashes(): - repo_hashes = {} +def get_repo_hashes(cores_to_update=[]): + with open(HASHES_PATH) as f: + repo_hashes = json.loads(f.read()) for core, repo in CORES.items(): - info(f"Getting repo hash for '{core}'...") - repo_hashes[core] = get_repo_hash(**repo) + if core in cores_to_update: + info(f"Getting repo hash for '{core}'...") + repo_hashes[core] = get_repo_hash(**repo) + else: + info(f"Skipping '{core}'...") return repo_hashes def main(): - repo_hashes = get_repo_hashes() + # If you don't want to update all cores, pass the name of the cores you + # want to update on the command line. E.g.: + # $ ./update.py citra snes9x + if len(sys.argv) > 1: + cores_to_update = sys.argv[1:] + else: + cores_to_update = CORES.keys() + + repo_hashes = get_repo_hashes(cores_to_update) info(f"Generating '{HASHES_PATH}'...") with open(HASHES_PATH, "w") as f: - f.write(json.dumps(repo_hashes, indent=4)) + f.write(json.dumps(dict(sorted(repo_hashes.items())), indent=4)) f.write("\n") info("Finished!") diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 0d1b538ceba8..3d3439b05d2d 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -1,16 +1,24 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, fetchpatch, python3Packages }: python3Packages.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rN+qoBS9zIy5EHlFQxgAlcz9haoYJNMKJ2wlS46UOi0="; + sha256 = "sha256-q1Rj8BehvYnV/Kah5YKAxBUz4j9WziSqn1fVeaKpy7g="; }; + patches = [ + # Compatibility with aiohttp 3.8.0 + (fetchpatch { + url = "https://github.com/hifi/heisenbridge/commit/cff5d33e0b617e6cf3a44dc00c72b98743175c9e.patch"; + sha256 = "sha256-y5X4mWvX1bq0XNZNTYUc0iK3SzvaHpS7px53I7xC9c8="; + }) + ]; + postPatch = '' echo "${version}" > heisenbridge/version.txt ''; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION b/pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION deleted file mode 100644 index c25c8e5b7416..000000000000 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION +++ /dev/null @@ -1 +0,0 @@ -0.30.0 diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 33ac1fca4672..1465b9518ffa 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -5,7 +5,7 @@ let inherit pkgs nodejs; inherit (stdenv.hostPlatform) system; }; - version = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./REVISION); + version = (lib.importJSON ./package.json).version; in ourNodePackages.package.override { pname = "matrix-appservice-irc"; @@ -30,7 +30,7 @@ ourNodePackages.package.override { meta = with lib; { description = "Node.js IRC bridge for Matrix"; - maintainers = with maintainers; [ piegames ]; + maintainers = with maintainers; [ ]; homepage = "https://github.com/matrix-org/matrix-appservice-irc"; license = licenses.asl20; }; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh index 462512dd0f4d..d2c16dedfcd2 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh @@ -6,7 +6,7 @@ set -euo pipefail cd "$(dirname "$0")" CURRENT_VERSION=$(nix eval --raw '(with import ../../../../. {}; matrix-appservice-irc.version)') -TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq -r ".tag_name")" +TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq --exit-status -r ".tag_name")" if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then echo "matrix-appservice-irc is up-to-date: ${CURRENT_VERSION}" @@ -18,7 +18,6 @@ echo "matrix-appservice-irc: $CURRENT_VERSION -> $TARGET_VERSION" rm -f package.json package-lock.json wget https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package.json wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package-lock.json -echo "$TARGET_VERSION" > ./REVISION ./generate-dependencies.sh diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 0407ad4528de..a9cf1238441c 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , meson , ninja -, nixUnstable +, nix , nlohmann_json , pkg-config , stdenv @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost - nixUnstable + nix nlohmann_json ]; nativeBuildInputs = [ diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index 195c0b1bf385..1fa7483e36ef 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.7.0"; + version = "0.10.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "v${version}"; - sha256 = "sha256-B19cHdoiCbxhvRGi3NzKPKneKgOI4+l8+Qg9/YVgUV8="; + sha256 = "sha256-nXJIgzm92OSSGHpN2+09Y8ILpU8Mf51vcVB0kMXBPZc="; }; - cargoSha256 = "sha256-iO64K+d/wEyY/tVztIG8zYSha5X0iTHV7IDVthMJQGA="; + cargoSha256 = "sha256-vExZzJ3Rw+MiU4ikEqzIo51qZW0sxwE/zoVEdUKLXwY="; patches = [ ./icon-paths.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb6a78ceb8ea..b474693eb9fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -337,6 +337,8 @@ with pkgs; protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { }; + protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { }; + protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { }; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; @@ -3288,7 +3290,9 @@ with pkgs; medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt515.callPackage ../applications/misc/megasync { }; + megasync = libsForQt5.callPackage ../applications/misc/megasync { + ffmpeg = ffmpeg-full; + }; megacmd = callPackage ../applications/misc/megacmd { }; @@ -12356,6 +12360,7 @@ with pkgs; }); graalvm11-ce = graalvmCEPackages.graalvm11-ce; graalvm17-ce = graalvmCEPackages.graalvm17-ce; + buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { }; inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee @@ -30319,10 +30324,16 @@ with pkgs; methane = callPackage ../games/methane { }; - mindustry = callPackage ../games/mindustry { }; - mindustry-wayland = callPackage ../games/mindustry { glew = glew-egl; }; + mindustry = callPackage ../games/mindustry { + jdk = adoptopenjdk-hotspot-bin-15; + }; + mindustry-wayland = callPackage ../games/mindustry { + jdk = adoptopenjdk-hotspot-bin-15; + glew = glew-egl; + }; mindustry-server = callPackage ../games/mindustry { + jdk = adoptopenjdk-hotspot-bin-15; enableClient = false; enableServer = true; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index bf5b65f93885..16ecd67de2d9 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -31,6 +31,7 @@ let coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; + coq-record-update = callPackage ../development/coq-modules/coq-record-update { }; coqeal = callPackage ../development/coq-modules/coqeal {}; coqhammer = callPackage ../development/coq-modules/coqhammer {}; coqprime = callPackage ../development/coq-modules/coqprime {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b67d1ef0305f..120b16eb5695 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -659,6 +659,8 @@ in { asyncio-nats-client = callPackage ../development/python-modules/asyncio-nats-client { }; + asyncmy = callPackage ../development/python-modules/asyncmy { }; + asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { }; asyncpg = callPackage ../development/python-modules/asyncpg { };