diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 47857a8ca4c3..3d4bb049991f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -22,7 +22,7 @@ For new packages please briefly describe the package or provide a link to its ho - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [22.11 Release Notes (or backporting 22.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes) +- [23.05 Release Notes (or backporting 22.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d8540782b91b..2d83222ee3a8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -98,17 +98,17 @@ git push origin feature --force-with-lease Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). -You can add a label such as `backport release-22.05` to a PR, so that merging it will +You can add a label such as `backport release-22.11` to a PR, so that merging it will automatically create a backport (via [a GitHub Action](.github/workflows/backport.yml)). This also works for PR's that have already been merged, and might take a couple of minutes to trigger. You can also create the backport manually: 1. Take note of the commits in which the change was introduced into `master` branch. -2. Check out the target _release branch_, e.g. `release-22.05`. Do not use a _channel branch_ like `nixos-22.05` or `nixpkgs-22.05-darwin`. +2. Check out the target _release branch_, e.g. `release-22.11`. Do not use a _channel branch_ like `nixos-22.11` or `nixpkgs-22.11-darwin`. 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. -5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.05`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.05]`. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. ## Criteria for Backporting changes @@ -120,15 +120,15 @@ Anything that does not cause user or downstream dependency regressions can be ba - Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) - Security critical applications (E.g. `firefox`) -## Generating 22.11 Release Notes +## Generating 23.05 Release Notes Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document. -Steps for updating 22.11 Release notes: +Steps for updating 23.05 Release notes: -1. Edit `nixos/doc/manual/release-notes/rl-2211.section.md` with the desired changes -2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2211.section.xml` -3. Include changes to `rl-2211.section.md` and `rl-2211.section.xml` in the same commit. +1. Edit `nixos/doc/manual/release-notes/rl-2305.section.md` with the desired changes +2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2305.section.xml` +3. Include changes to `rl-2305.section.md` and `rl-2305.section.xml` in the same commit. ## Reviewing contributions diff --git a/README.md b/README.md index c7e14f693495..4c6ad635164b 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 22.05 release](https://hydra.nixos.org/jobset/nixos/release-22.05) +* [Continuous package builds for the NixOS 22.11 release](https://hydra.nixos.org/jobset/nixos/release-22.11) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 22.05 release](https://hydra.nixos.org/job/nixos/release-22.05/tested#tabs-constituents) +* [Tests for the NixOS 22.11 release](https://hydra.nixos.org/job/nixos/release-22.11/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1dba4618e16c..9b59838336a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1071,6 +1071,12 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + archer-65 = { + email = "mario.liguori.056@gmail.com"; + github = "archer-65"; + githubId = 76066109; + name = "Mario Liguori"; + }; archseer = { email = "blaz@mxxn.io"; github = "archseer"; @@ -8787,6 +8793,12 @@ githubId = 4141584; name = "Maxime Daniel"; }; + maxwell-lt = { + email = "maxwell.lt@live.com"; + github = "maxwell-lt"; + githubId = 17859747; + name = "Maxwell L-T"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; @@ -9663,6 +9675,12 @@ githubId = 43796009; name = "Max Wilson"; }; + myaats = { + email = "mats@mats.sh"; + github = "Myaats"; + githubId = 6295090; + name = "Mats"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "Myrl"; @@ -12726,6 +12744,13 @@ githubId = 4294323; name = "Langston Barrett"; }; + sielicki = { + name = "Nicholas Sielicki"; + email = "nix@opensource.nslick.com"; + github = "sielicki"; + githubId = 4522995; + matrix = "@sielicki:matrix.org"; + }; siers = { email = "veinbahs+nixpkgs@gmail.com"; github = "siers"; @@ -14241,6 +14266,13 @@ github = "twitchyliquid64"; githubId = 6328589; }; + tylerjl = { + email = "tyler+nixpkgs@langlois.to"; + github = "tylerjl"; + githubId = 1733846; + matrix = "@ty:tjll.net"; + name = "Tyler Langlois"; + }; typetetris = { email = "ericwolf42@mail.com"; github = "typetetris"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index da3e202b76e4..c75f9aa71773 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -265,6 +265,15 @@ with lib.maintainers; { shortName = "GCC"; }; + geospatial = { + members = [ + imincik + sikmir + ]; + scope = "Maintain geospatial packages."; + shortName = "Geospatial"; + }; + golang = { members = [ c00w diff --git a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml index 11fe1d317ccd..f6aedc800aca 100644 --- a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml +++ b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml @@ -12,7 +12,7 @@ Stable channels, such as - nixos-22.05. + nixos-22.11. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), @@ -33,7 +33,7 @@ Small channels, such as - nixos-22.05-small + nixos-22.11-small or nixos-unstable-small. These are identical to the stable and unstable channels @@ -60,8 +60,8 @@ When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For - instance, if you installed from a 22.05 ISO, you will be subscribed - to the nixos-22.05 channel. To see which NixOS + instance, if you installed from a 22.11 ISO, you will be subscribed + to the nixos-22.11 channel. To see which NixOS channel you’re subscribed to, run the following as root: @@ -76,17 +76,17 @@ nixos https://nixos.org/channels/nixos-unstable (Be sure to include the nixos parameter at the - end.) For instance, to use the NixOS 22.05 stable channel: + end.) For instance, to use the NixOS 22.11 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-22.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11 nixos If you have a server, you may want to use the small channel instead: -# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11-small nixos And if you want to live on the bleeding edge: @@ -146,7 +146,7 @@ system.autoUpgrade.allowReboot = true; also specify a channel explicitly, e.g. -system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.11; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 8b79b09a8b38..b72c4326004c 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1,48 +1,207 @@
- Release 22.11 (“Raccoon”, 2022.11/??) + Release 22.11 (“Raccoon”, 2022.11/30) - Support is planned until the end of June 2023, handing over to - 23.05. + The NixOS release team is happy to announce a new version of NixOS + 22.11. NixOS is both a Linux distribution, and a set of packages + usable on other Linux systems and macOS. + + + This release is supported until the end of June 2023, handing over + to NixOS 23.05. + + + To upgrade to the latest release follow the + upgrade chapter.
Highlights In addition to numerous new and upgraded packages, this release - has the following highlights: + includes the following highlights: - GNOME has been upgraded to 43. Please take a look at their - Release - Notes for details. + Software that uses the crypt password + hashing API is now using the implementation provided by + libxcrypt + instead of glibc’s, which enables support for more secure + algorithms. + + + + + Support for algorithms that libxcrypt + does + not consider strong are + deprecated as of this + release, and will be removed in NixOS 23.05. + + + + + This includes system login passwords. Given this, we + strongly encourage all + users to update their system passwords, as you will be + unable to login if password hashes are not migrated by the + time their support is removed. + + + + + When using + users.users.<name>.hashedPassword + to configure user passwords, run + mkpasswd, and use the yescrypt hash + that is provided as the new value. + + + + + On the other hand, for interactively configured user + passwords, simply re-set the passwords for all users + with passwd. + + + + + This release introduces warnings for the use of + deprecated hash algorithms for both methods of + configuring passwords. To make sure you migrated + correctly, run + nixos-rebuild switch. + + + + + + + + + The NixOS documentation is now generated from markdown. While + docbook is still part of the documentation build process, it’s + a big step towards the full migration. - During cross-compilation, tests are now executed if the test - suite can be executed by the build platform. This is the case - when doing “native” cross-compilation where the build and host - platforms are largely the same, but the nixpkgs’ cross - compilation infrastructure is used, e.g. - pkgsStatic and pkgsLLVM. - Another possibility is that the build platform is a superset - of the host platform, e.g. when cross-compiling from - x86_64-unknown-linux to - i686-unknown-linux. The predicate gating - test suite execution is the newly added - canExecute predicate: You can e.g. check if - stdenv.buildPlatform can execute binaries - built for stdenv.hostPlatform (i.e. - produced by stdenv.cc) by evaluating - stdenv.buildPlatform.canExecute stdenv.hostPlatform. + aarch64-linux is now included in the + nixos-22.11 and + nixos-22.11-small channels. This means that + when those channel update, both + x86_64-linux and + aarch64-linux will be available in the + binary cache. - The nixpkgs.hostPlatform and - nixpkgs.buildPlatform options have been - added. These cover and override the + aarch64-linux ISOs are now available on the + downloads + page. + + + + + nsncd is now available as a replacement of + nscd. + + + nscd is responsible for resolving + hostnames, users and more in NixOS and has been a long + standing source of bugs, such as sporadic network freezes. + + + More context in this + issue. + + + Help us test the new implementation by setting + services.nscd.enableNsncd to + true. + + + We plan to use nsncd by default in NixOS + 23.05. + + + + + Linode cloud images are now supported by importing + ${modulesPath}/virtualisation/linode-image.nix + and accessing system.build.linodeImage on + the output. + + + + + hardware.nvidia has a new option, + hardware.nvidia.open, that can be used to + enable the usage of NVIDIA’s open-source kernel driver. Note + that the driver’s support for GeForce and Workstation GPUs is + still alpha quality, see + the + release announcement for more information. + + + + + The emacs package now makes use of native + compilation which means: + + + + + Emacs packages from Nixpkgs, builtin or not, will do + native compilation ahead of time so you can enjoy the + benefit of native compilation without compiling them on + you machine; + + + + + Emacs packages from somewhere else, e.g. + package-install, will perform + asynchronously deferred native compilation. If you do not + want this, maybe to avoid CPU consumption for compilation, + you can use + (setq native-comp-deferred-compilation nil) + to disable it while still benefiting from native + compilation for packages from Nixpkgs. + + + + + +
+
+ Internal changes + + + + Haskell ghcWithPackages is now up to 15 + times faster to evaluate, thanks to changing + lib.closePropagation from a quadratic to + linear complexity. Please see backward incompatibilities notes + below. + https://github.com/NixOS/nixpkgs/pull/194391 + + + + + For cross-compilation targets that can also run on the + building machine, we now run tests. This, for example, is the + case for the pkgsStatic and + pkgsLLVM package sets or i686 packages on + x86_64 machines. + + + + + To simplify cross-compilation in NixOS, this release + introduces the nixpkgs.hostPlatform and + nixpkgs.buildPlatform options. These cover + and override the nixpkgs.{system,localSystem,crossSystem} options. @@ -77,78 +236,48 @@ with any supported NixOS release. + +
+
+ Notable version updates + - nscd functionality, necessary to provide - non-glibc-builtin NSS modules (such as - nss_systemd or nss_ldap) - can now be provided by nsncd, by setting - services.nscd.enableNsncd to - true. - - - The nscd daemon provided by glibc, which is - currently used by NixOS isn’t very reliable. For example, it’s - not - fully possible to disable caching functionality, - causing various issues and failed lookups. - - - In contrast to nscd’s behavior of caching module responses on - its own, nsncd merely forwards requests to NSS modules, which - might cache or not. - - - We plan to use nsncd by default in NixOS - 23.05. + Nix has been upgraded from v2.8.1 to v2.11.0. For more + information, please see the release notes for + 2.9, + 2.10 + and + 2.11. - emacs enables native compilation which - means: + OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. - - - - emacs packages from nixpkgs, builtin or not, will do - native compilation ahead of time so you can enjoy the - benefit of native compilation without compiling them on - you machine; - - - - - emacs packages from somewhere else, e.g. - package-install, will do asynchronously - deferred native compilation. If you do not want this, - maybe to avoid CPU consumption for compilation, you can - use - (setq native-comp-deferred-compilation nil) - to disable it while still enjoy the benefit of native - compilation for packages from nixpkgs. - - - - nixos-generate-config now generates - configurations that can be built in pure mode. This is - achieved by setting the new - nixpkgs.hostPlatform option. + GNOME has been upgraded to version 43. Please see the + release + notes for details. + + - You may have to unset the system parameter - in lib.nixosSystem, or similarly remove - definitions of the - nixpkgs.{system,localSystem,crossSystem} - options. + KDE Plasma has been upgraded from v5.24 to v5.26. Please see + the release notes for + v5.25 + and + v5.26 + for more details on the included changes. + + - Alternatively, you can remove the - hostPlatform line and use NixOS like you - would in NixOS 22.05 and earlier. + Cinnamon has been updated to 5.4, and the Cinnamon module now + defaults to Blueman as the Bluetooth manager and slick-greeter + as the LightDM greeter, to match upstream. @@ -156,27 +285,6 @@ PHP now defaults to PHP 8.1, updated from 8.0. - - - PHP is now built NTS (Non-Thread Safe) - style by default, for Apache and mod_php - usage we still enable ZTS (Zend Thread - Safe). This has been a common practice for a long time in - other distributions. - - - - - PHP 8.2.0 RC 7 is available. - - - - - protonup has been aliased to and replaced - by protonup-ng due to upstream not - maintaining it. - - Perl has been updated to 5.36, and its core module @@ -186,348 +294,7 @@ - Improved performances of - lib.closePropagation which was previously - quadratic. This is used in e.g. - ghcWithPackages. Please see backward - incompatibilities notes below. - - - - - Cinnamon has been updated to 5.4. While at it, the cinnamon - module now defaults to blueman as bluetooth manager and - slick-greeter as lightdm greeter to match upstream. - - - - - OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. - - - - - An image configuration and generator has been added for Linode - images, largely based on the present GCE configuration and - image. - - - - - hardware.nvidia has a new option - open that can be used to opt in the - opensource version of NVIDIA kernel driver. Note that the - driver’s support for GeForce and Workstation GPUs is still - alpha quality, see - NVIDIA - Releases Open-Source GPU Kernel Modules for the - official announcement. - - - -
-
- New Services - - - - appvm, - Nix based app VMs. Available as - virtualisation.appvm. - - - - - automatic-timezoned. - a Linux daemon to automatically update the system timezone - based on location. Available as - services.automatic-timezoned. - - - - - [xray] (https://github.com/XTLS/Xray-core), a fully compatible - v2ray-core replacement. Features XTLS, which when enabled on - server and client, brings UDP FullCone NAT to proxy setups. - Available as - services.xray. - - - - - syncstorage-rs, - a self-hostable sync server for Firefox. Available as - services.firefox-syncserver. - - - - - dragonflydb, - a modern replacement for Redis and Memcached. Available as - services.dragonflydb. - - - - - Komga, a free and - open source comics/mangas media server. Available as - services.komga. - - - - - Tandoor Recipes, - a self-hosted multi-tenant recipe collection. Available as - services.tandoor-recipes. - - - - - HBase - cluster, a distributed, scalable, big data store. - Available as - services.hadoop.hbase. - - - - - Please, - a Sudo clone written in Rust. Available as - security.please - - - - - Sachet, - an SMS alerting tool for the Prometheus Alertmanager. - Available as - services.prometheus.sachet. - - - - - EVCC is an EV charge - controller with PV integration. It supports a multitude of - chargers, meters, vehicle APIs and more and ties that together - with a well-tested backend and a lightweight web frontend. - Available as - services.evcc. - - - - - infnoise, - a hardware True Random Number Generator dongle. Available as - services.infnoise. - - - - - kthxbye, - an alert acknowledgement management daemon for Prometheus - Alertmanager. Available as - services.kthxbye - - - - - kanata, - a tool to improve keyboard comfort and usability with advanced - customization. Available as - services.kanata. - - - - - karma, - an alert dashboard for Prometheus Alertmanager. Available as - services.karma - - - - - languagetool, - a multilingual grammar, style, and spell checker. Available as - services.languagetool. - - - - - OpenRGB, - a FOSS tool for controlling RGB lighting. Available as - services.hardware.openrgb.enable. - - - - - Outline, - a wiki and knowledge base similar to Notion. Available as - services.outline. - - - - - ntfy.sh, a push - notification service. Available as - services.ntfy-sh - - - - - alps, - a simple and extensible webmail. Available as - services.alps. - - - - - endlessh, - an SSH tarpit. Available as - services.endlessh. - - - - - endlessh-go, - an SSH tarpit that exposes Prometheus metrics. Available as - services.endlessh-go. - - - - - Garage, - a simple object storage server for geodistributed deployments, - alternative to MinIO. Available as - services.garage. - - - - - netbird, a zero - configuration VPN. Available as - services.netbird. - - - - - persistent-evdev, - a daemon to add virtual proxy devices that mirror a physical - input device but persist even if the underlying hardware is - hot-plugged. Available as - services.persistent-evdev. - - - - - schleuder, a - mailing list manager with PGP support. Enable using - services.schleuder. - - - - - Dolibarr, - an enterprise resource planning and customer relationship - manager. Enable using - services.dolibarr. - - - - - FreshRSS, a - free, self-hostable RSS feed aggregator. Available as - services.freshrss. - - - - - expressvpn, - the CLI client for ExpressVPN. Available as - services.expressvpn. - - - - - merecat, - a small and easy HTTP server based on thttpd. Available as - services.merecat - - - - - go-autoconfig, - IMAP/SMTP autodiscover server. Available as - services.go-autoconfig. - - - - - tmate-ssh-server, - server side part of - tmate. Available - as - services.tmate-ssh-server. - - - - - Grafana - Tempo, a distributed tracing store. Available as - services.tempo. - - - - - AusweisApp2, - the authentication software for the German ID card. Available - as - programs.ausweisapp. - - - - - Patroni, - a template for PostgreSQL HA with ZooKeeper, etcd or Consul. - Available as - services.patroni. - - - - - Prometheus - IPMI exporter, an IPMI exporter for Prometheus. - Available as - services.prometheus.exporters.ipmi. - - - - - WriteFreely, - a simple blogging platform with ActivityPub support. Available - as - services.writefreely. - - - - - Listmonk, a - self-hosted newsletter manager. Enable using - services.listmonk. - - - - - Uptime - Kuma, a fancy self-hosted monitoring tool. Available as - services.uptime-kuma. - - - - - Mepo, a - fast, simple, hackable OSM map viewer for mobile and desktop - Linux. Available as - programs.mepo.enable. + Python now defaults to 3.10, updated from 3.9. @@ -565,20 +332,28 @@ upgrade guide and changelog. Notably, breaking changes are that the config file format has - changed and support for single hypen arguments was dropped. + changed and support for single hyphen arguments was dropped. - i18n.supportedLocales is now by default - only generated with the locales set in - i18n.defaultLocale and - i18n.extraLocaleSettings. This got - partially copied over from the minimal profile and reduces the - final system size by up to 200MB. If you require all locales - installed set the option to - [ "all" ]. + i18n.supportedLocales is now only generated + with the locales set in i18n.defaultLocale + and i18n.extraLocaleSettings. + + + + This reduces the final system closure size by up to 200MB. + + + + + If you require all locales installed, set the option to + [ "all" ]. + + + @@ -632,7 +407,7 @@ ssh-keygen -A as they are insecure. Also, SetEnv directives in ssh_config and - sshd_config are now first-match-wins + sshd_config are now first-match-wins. @@ -676,8 +451,8 @@ - The openssl-extension for the PHP - interpreter used by Nextcloud is built against OpenSSL 1.1 if + The OpenSSL extension for the PHP interpreter used by + Nextcloud is built against OpenSSL 1.1 if is below 22.11. This is to make sure that people using @@ -685,8 +460,8 @@ encryption don’t lose access to their files. - In any other case it’s safe to use OpenSSL 3 for PHP’s openssl - extension. This can be done by setting + In any other case, it’s safe to use OpenSSL 3 for PHP’s + OpenSSL extension. This can be done by setting to false. @@ -738,9 +513,9 @@ kanidm has been updated to 1.1.0-alpha.10 - and now requires a tls certificate and key. It will always - start an https and – if enabled – an ldaps server and no http - and ldap server anymore. + and now requires a TLS certificate and key. It will always + start https and-–-if enabled-–-an LDAPS + server and no HTTP and LDAP server anymore. @@ -814,15 +589,6 @@ nix.checkConfig previously did. - - - nix.buildMachines got a new submodule - option protocol. An undocumented hack to - set the protocol via hostName is no longer - working and the protocol option should be - used instead. - - generateOptparseApplicativeCompletions and @@ -1006,7 +772,7 @@ - k3s no longer supports docker as runtime + k3s no longer supports Docker as runtime due to upstream dropping support. @@ -1079,7 +845,7 @@ signald -d /var/lib/signald/db \ stylua no longer accepts lua52Support and - luauSupport overrides, use + luauSupport overrides. Use features instead, which defaults to [ "lua54" "luau" ]. @@ -1133,11 +899,27 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [
Other Notable Changes + + + PHP is now built in NTS (Non-Thread Safe) + mode by default. + + + + + For Apache and mod_php usage, we enable + ZTS (Zend Thread Safe) mode. This has + been a common practice for a long time in other + distributions. + + + + firefox, thunderbird and - librewolf come with enabled Wayland support - by default. The firefox-wayland, + librewolf now come with Wayland support by + default. The firefox-wayland, firefox-esr-wayland, thunderbird-wayland and librewolf-wayland attributes are obsolete @@ -1156,7 +938,8 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Configuring multiple GitHub runners is now possible through services.github-runners.<name>. The - option services.github-runner remains. + options under services.github-runner + remain, to configure a single runner. @@ -1171,29 +954,39 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - A new module was added for the Saleae Logic device family, - providing the options + A new module was added to provide hardware support for the + Saleae Logic device family, providing the options hardware.saleae-logic.enable and hardware.saleae-logic.package. - ZFS module will not allow hibernation by default, this is a - safety measure to prevent data loss cases like the ones - described at - OpenZFS/260 - and - OpenZFS/12842. - Use the boot.zfs.allowHibernation option to - configure this behaviour. + ZFS module will no longer allow hibernation by default. + + + + This is a safety measure to prevent data loss cases like + the ones described at + OpenZFS/260 + and + OpenZFS/12842. + + + + + Use the boot.zfs.allowHibernation + option to configure this behaviour. + + + - mastodon now automatically removes remote - media attachments older than 30 days. This is configurable - through services.mastodon.mediaAutoRemove. + Mastodon now automatically removes remote media attachments + older than 30 days. This is configurable through + services.mastodon.mediaAutoRemove. @@ -1205,9 +998,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Neo4j was updated from version 3 to version 4. See this + Neo4j was updated from version 3 to version 4. See upstream’s migration - guide on how to migrate your Neo4j instance. + guide for information on how to migrate your instance. @@ -1240,8 +1033,8 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ prismlauncher, a fork by the rest of the maintainers. For more details, see the - pull request that made this change and - this + PR that made this change and + the issue detailing the vulnerability. Users with existing installations should rename ~/.local/share/polymc to @@ -1262,8 +1055,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - The services.matrix-synapse systemd unit - has been hardened. + Synapse’s systemd unit has been hardened. @@ -1420,7 +1212,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Matrix Synapse now requires entries in the + Synapse now requires entries in the state_group_edges table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was @@ -1455,9 +1247,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - dockerTools.buildImage deprecates the - misunderstood contents parameter, in favor - of copyToRoot. Use + dockerTools.buildImage’s + contents parameter has been deprecated in + favor of copyToRoot. Use copyToRoot = buildEnv { ... }; or similar if you intend to add packages to /bin. @@ -1510,9 +1302,16 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - The redis module now persists each instance’s configuration + The Redis module now persists each instance’s configuration file in the state directory, in order to support some more - advanced use cases like sentinel. + advanced use cases like Sentinel. + + + + + protonup has been aliased to and replaced + by protonup-ng due to upstream not + maintaining it. @@ -1550,7 +1349,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - For system.stateVersion being + If system.stateVersion is >=22.11, Nextcloud 25 will be installed by default. For older versions, Nextcloud 24 will be installed. @@ -1558,7 +1357,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Please ensure that you only upgrade on major release at a + Please ensure that you only upgrade one major release at a time! Nextcloud doesn’t support upgrades across multiple versions, i.e. an upgrade from 23 to @@ -1569,24 +1368,6 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - - - Add udev rules for the Teensy family of microcontrollers. - - - - - The Qt QML disk cache is now disabled by default. This fixes a - long-standing issue where updating Qt/KDE apps would sometimes - cause them to crash or behave strangely without explanation. - Those concerned about the small (~10%) performance hit to - application startup can re-enable the cache (and expose - themselves to gremlins) by setting the envrionment variable - QML_FORCE_DISK_CACHE to - 1 using e.g. the - environment.sessionVariables NixOS option. - - systemd-oomd is enabled by default. Depending on which systemd @@ -1620,14 +1401,8 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - There is a new module for AMD SEV CPU functionality, which - grants access to the hardware. - - - - - The Wordpress module got support for installing language packs - through + The Wordpress module now has support for installing language + packs through a new option, services.wordpress.sites.<site>.languages. @@ -1645,12 +1420,12 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - PowerDNS has been updated from 4.6.x to - 4.7.x. Please be sure to review the + PowerDNS has been updated from v4.6.2 to v4.7.2. Please be + sure to review the Upgrade Notes provided by upstream before upgrading. Worth specifically noting is that the new Catalog Zones feature - comes with a mandatory schema change for the gsql database + comes with a mandatory schema change for the GSQL database backends, which has to be manually applied. @@ -1662,21 +1437,19 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ service and a systemd unit. The option services.xserver.desktopManager.xfce.thunarPlugins has been renamed to - programs.thunar.plugins, and in a future - release it may be removed. + programs.thunar.plugins, and may be removed + in a future release. - There is a new module for the xfconf - program (the Xfce configuration storage system), which has a - dbus service. + There is a new module for xfconf (the Xfce + configuration storage system), which has a dbus service. - The Mastodon package got upgraded from the major version 3 to - 4. See the + The Mastodon package has been upgraded to v4.0.0. See the v4.0.0 release notes for a list of changes. On standard setups, no manual migration steps are required. Nevertheless, @@ -1685,8 +1458,8 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - The nomad package now defaults to 1.3, - which no longer has a downgrade path to releases 1.2 or older. + The nomad package now defaults to v1.3, + which no longer has a downgrade path to v1.2 or older. @@ -1705,7 +1478,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ boot.kernel.sysctl is defined as a freeformType and adds a custom merge option for - net.core.rmem_max (taking the highest value + net.core.rmem_max (taking the highest value defined to avoid conflicts between 2 services trying to set that value). @@ -1739,7 +1512,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - haskellPackage.callHackage is not always + haskellPackages.callHackage is not always invalidated if all-cabal-hashes changes, leading to less rebuilds of haskell dependencies. @@ -1755,4 +1528,310 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [
+
+ New Services + + + + alps, + a simple and extensible webmail. Available as + services.alps. + + + + + appvm, + Nix based app VMs. Available as + virtualisation.appvm. + + + + + AusweisApp2, + the authentication software for the German ID card. Available + as + programs.ausweisapp. + + + + + automatic-timezoned. + a Linux daemon to automatically update the system timezone + based on location. Available as + services.automatic-timezoned. + + + + + Dolibarr, + an enterprise resource planning and customer relationship + manager. Enable using + services.dolibarr. + + + + + dragonflydb, + a modern replacement for Redis and Memcached. Available as + services.dragonflydb. + + + + + endlessh-go, + an SSH tarpit that exposes Prometheus metrics. Available as + services.endlessh-go. + + + + + endlessh, + an SSH tarpit. Available as + services.endlessh. + + + + + EVCC is an EV charge + controller with PV integration. It supports a multitude of + chargers, meters, vehicle APIs and more and ties that together + with a well-tested backend and a lightweight web frontend. + Available as + services.evcc. + + + + + expressvpn, + the CLI client for ExpressVPN. Available as + services.expressvpn. + + + + + FreshRSS, a + free, self-hostable RSS feed aggregator. Available as + services.freshrss. + + + + + Garage, + a simple object storage server for geodistributed deployments, + alternative to MinIO. Available as + services.garage. + + + + + go-autoconfig, + IMAP/SMTP autodiscover server. Available as + services.go-autoconfig. + + + + + Grafana + Tempo, a distributed tracing store. Available as + services.tempo. + + + + + HBase + cluster, a distributed, scalable, big data store. + Available as + services.hadoop.hbase. + + + + + infnoise, + a hardware True Random Number Generator dongle. Available as + services.infnoise. + + + + + kanata, + a tool to improve keyboard comfort and usability with advanced + customization. Available as + services.kanata. + + + + + karma, + an alert dashboard for Prometheus Alertmanager. Available as + services.karma + + + + + Komga, a free and + open source comics/mangas media server. Available as + services.komga. + + + + + kthxbye, + an alert acknowledgement management daemon for Prometheus + Alertmanager. Available as + services.kthxbye + + + + + languagetool, + a multilingual grammar, style, and spell checker. Available as + services.languagetool. + + + + + Listmonk, a + self-hosted newsletter manager. Enable using + services.listmonk. + + + + + Mepo, a + fast, simple, hackable OSM map viewer for mobile and desktop + Linux. Available as + programs.mepo.enable. + + + + + merecat, + a small and easy HTTP server based on thttpd. Available as + services.merecat + + + + + netbird, a zero + configuration VPN. Available as + services.netbird. + + + + + ntfy.sh, a push + notification service. Available as + services.ntfy-sh + + + + + OpenRGB, + a FOSS tool for controlling RGB lighting. Available as + services.hardware.openrgb.enable. + + + + + Outline, + a wiki and knowledge base similar to Notion. Available as + services.outline. + + + + + Patroni, + a template for PostgreSQL HA with ZooKeeper, etcd or Consul. + Available as + services.patroni. + + + + + persistent-evdev, + a daemon to add virtual proxy devices that mirror a physical + input device but persist even if the underlying hardware is + hot-plugged. Available as + services.persistent-evdev. + + + + + Please, + a Sudo clone written in Rust. Available as + security.please. + + + + + Prometheus + IPMI exporter, an IPMI exporter for Prometheus. + Available as + services.prometheus.exporters.ipmi. + + + + + Sachet, + an SMS alerting tool for the Prometheus Alertmanager. + Available as + services.prometheus.sachet. + + + + + schleuder, a + mailing list manager with PGP support. Enable using + services.schleuder. + + + + + syncstorage-rs, + a self-hostable sync server for Firefox. Available as + services.firefox-syncserver. + + + + + Tandoor Recipes, + a self-hosted multi-tenant recipe collection. Available as + services.tandoor-recipes. + + + + + tmate-ssh-server, + server side part of + tmate. Available + as + services.tmate-ssh-server. + + + + + Uptime + Kuma, a fancy self-hosted monitoring tool. Available as + services.uptime-kuma. + + + + + WriteFreely, + a simple blogging platform with ActivityPub support. Available + as + services.writefreely. + + + + + xray, + a fully compatible v2ray-core replacement. Features XTLS, + which when enabled on server and client, brings UDP FullCone + NAT to proxy setups. Available as + services.xray. + + + +
diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md index 2644979bc9db..249bcd97cec8 100644 --- a/nixos/doc/manual/installation/upgrading.chapter.md +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated automatically from NixOS's Git repository after certain tests have passed and all packages have been built. These channels are: -- *Stable channels*, such as [`nixos-22.05`](https://nixos.org/channels/nixos-22.05). +- *Stable channels*, such as [`nixos-22.11`](https://nixos.org/channels/nixos-22.05). These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not @@ -19,7 +19,7 @@ passed and all packages have been built. These channels are: radical changes between channel updates. It's not recommended for production systems. -- *Small channels*, such as [`nixos-22.05-small`](https://nixos.org/channels/nixos-22.05-small) +- *Small channels*, such as [`nixos-22.11-small`](https://nixos.org/channels/nixos-22.05-small) or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small). These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated @@ -38,8 +38,8 @@ newest supported stable release. When you first install NixOS, you're automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 22.05 ISO, you will be subscribed to -the `nixos-22.05` channel. To see which NixOS channel you're subscribed +instance, if you installed from a 22.11 ISO, you will be subscribed to +the `nixos-22.11` channel. To see which NixOS channel you're subscribed to, run the following as root: ```ShellSession @@ -54,16 +54,16 @@ To switch to a different NixOS channel, do ``` (Be sure to include the `nixos` parameter at the end.) For instance, to -use the NixOS 22.05 stable channel: +use the NixOS 22.11 stable channel: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-22.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11 nixos ``` If you have a server, you may want to use the "small" channel instead: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11-small nixos ``` And if you want to live on the bleeding edge: @@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. ```nix -system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.11; ``` diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 6d0bc1197768..e0aef342c1ac 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -1,27 +1,53 @@ -# Release 22.11 (“Raccoon”, 2022.11/??) {#sec-release-22.11} +# Release 22.11 (“Raccoon”, 2022.11/30) {#sec-release-22.11} -Support is planned until the end of June 2023, handing over to 23.05. +The NixOS release team is happy to announce a new version of NixOS 22.11. NixOS is both a Linux distribution, and a set of packages usable on other Linux systems and macOS. + +This release is supported until the end of June 2023, handing over to NixOS 23.05. + +To upgrade to the latest release follow the [upgrade chapter](#sec-upgrading). ## Highlights {#sec-release-22.11-highlights} -In addition to numerous new and upgraded packages, this release has the following highlights: +In addition to numerous new and upgraded packages, this release includes the following highlights: -- GNOME has been upgraded to 43. Please take a look at their [Release - Notes](https://release.gnome.org/43/) for details. +- Software that uses the `crypt` password hashing API is now using the implementation provided by [`libxcrypt`](https://github.com/besser82/libxcrypt) instead of glibc's, which enables support for more secure algorithms. + - Support for algorithms that `libxcrypt` [does not consider strong](https://github.com/besser82/libxcrypt/blob/v4.4.28/lib/hashes.conf#L41) are **deprecated** as of this release, and will be removed in NixOS 23.05. + - This includes system login passwords. Given this, we **strongly encourage** all users to update their system passwords, as you will be unable to login if password hashes are not migrated by the time their support is removed. + - When using `users.users..hashedPassword` to configure user passwords, run `mkpasswd`, and use the yescrypt hash that is provided as the new value. + - On the other hand, for interactively configured user passwords, simply re-set the passwords for all users with `passwd`. + - This release introduces warnings for the use of deprecated hash algorithms for both methods of configuring passwords. To make sure you migrated correctly, run `nixos-rebuild switch`. -- During cross-compilation, tests are now executed if the test suite can be executed - by the build platform. This is the case when doing “native” cross-compilation - where the build and host platforms are largely the same, but the nixpkgs' cross - compilation infrastructure is used, e.g. `pkgsStatic` and `pkgsLLVM`. Another - possibility is that the build platform is a superset of the host platform, e.g. when - cross-compiling from `x86_64-unknown-linux` to `i686-unknown-linux`. - The predicate gating test suite execution is the newly added `canExecute` - predicate: You can e.g. check if `stdenv.buildPlatform` can execute binaries - built for `stdenv.hostPlatform` (i.e. produced by `stdenv.cc`) by evaluating - `stdenv.buildPlatform.canExecute stdenv.hostPlatform`. +- The NixOS documentation is now generated from markdown. While docbook is still part of the documentation build process, it's a big step towards the full migration. -- The `nixpkgs.hostPlatform` and `nixpkgs.buildPlatform` options have been added. - These cover and override the `nixpkgs.{system,localSystem,crossSystem}` options. +- `aarch64-linux` is now included in the `nixos-22.11` and `nixos-22.11-small` channels. This means that when those channel update, both `x86_64-linux` and `aarch64-linux` will be available in the binary cache. + +- `aarch64-linux` ISOs are now available on the [downloads page](https://nixos.org/download.html). + +- `nsncd` is now available as a replacement of `nscd`. + + `nscd` is responsible for resolving hostnames, users and more in NixOS and has been a long standing source of bugs, such as sporadic network freezes. + + More context in this [issue](https://github.com/NixOS/nixpkgs/issues/135888). + + Help us test the new implementation by setting `services.nscd.enableNsncd` to `true`. + + We plan to use `nsncd` by default in NixOS 23.05. + +- Linode cloud images are now supported by importing `${modulesPath}/virtualisation/linode-image.nix` and accessing `system.build.linodeImage` on the output. + +- `hardware.nvidia` has a new option, `hardware.nvidia.open`, that can be used to enable the usage of NVIDIA's open-source kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [the release announcement](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for more information. + +- The `emacs` package now makes use of native compilation which means: + - Emacs packages from Nixpkgs, builtin or not, will do native compilation ahead of time so you can enjoy the benefit of native compilation without compiling them on you machine; + - Emacs packages from somewhere else, e.g. `package-install`, will perform asynchronously deferred native compilation. If you do not want this, maybe to avoid CPU consumption for compilation, you can use `(setq native-comp-deferred-compilation nil)` to disable it while still benefiting from native compilation for packages from Nixpkgs. + +## Internal changes {#sec-release-22.11-internal} + +- Haskell `ghcWithPackages` is now up to 15 times faster to evaluate, thanks to changing `lib.closePropagation` from a quadratic to linear complexity. Please see backward incompatibilities notes below. + +- For cross-compilation targets that can also run on the building machine, we now run tests. This, for example, is the case for the `pkgsStatic` and `pkgsLLVM` package sets or i686 packages on `x86_64` machines. + +- To simplify cross-compilation in NixOS, this release introduces the `nixpkgs.hostPlatform` and `nixpkgs.buildPlatform` options. These cover and override the `nixpkgs.{system,localSystem,crossSystem}` options. - `hostPlatform` is the platform or "`system`" string of the NixOS system described by the configuration. @@ -38,146 +64,24 @@ In addition to numerous new and upgraded packages, this release has the followin for a transition period so that in time the ecosystem can switch without breaking compatibility with any supported NixOS release. -- `nscd` functionality, necessary to provide non-glibc-builtin NSS - modules (such as `nss_systemd` or `nss_ldap`) can now be provided by - `nsncd`, by setting `services.nscd.enableNsncd` to `true`. +## Notable version updates {#sec-release-22.11-version-updates} - The `nscd` daemon provided by glibc, which is currently used by NixOS isn't - very reliable. For example, it's [not fully possible to disable caching - functionality](https://github.com/NixOS/nixpkgs/issues/135888), causing - various issues and failed lookups. - - In contrast to nscd's behavior of caching module responses on its own, - nsncd merely forwards requests to NSS modules, which might cache or not. - - We plan to use `nsncd` by default in NixOS 23.05. - -- `emacs` enables native compilation which means: - - emacs packages from nixpkgs, builtin or not, will do native compilation ahead of time so you can enjoy the benefit of native compilation without compiling them on you machine; - - emacs packages from somewhere else, e.g. `package-install`, will do asynchronously deferred native compilation. If you do not want this, maybe to avoid CPU consumption for compilation, you can use `(setq native-comp-deferred-compilation nil)` to disable it while still enjoy the benefit of native compilation for packages from nixpkgs. - -- `nixos-generate-config` now generates configurations that can be built in pure - mode. This is achieved by setting the new `nixpkgs.hostPlatform` option. - - You may have to unset the `system` parameter in `lib.nixosSystem`, or similarly - remove definitions of the `nixpkgs.{system,localSystem,crossSystem}` options. - - Alternatively, you can remove the `hostPlatform` line and use NixOS like you - would in NixOS 22.05 and earlier. - -- PHP now defaults to PHP 8.1, updated from 8.0. - -- PHP is now built `NTS` (Non-Thread Safe) style by default, for Apache and - `mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a - common practice for a long time in other distributions. - -- PHP 8.2.0 RC 7 is available. - -- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it. - -- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default. - -- Improved performances of `lib.closePropagation` which was previously quadratic. This is used in e.g. `ghcWithPackages`. Please see backward incompatibilities notes below. - -- Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to - blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream. +- Nix has been upgraded from v2.8.1 to v2.11.0. For more information, please see the release notes for [2.9](https://nixos.org/manual/nix/stable/release-notes/rl-2.9.html), [2.10](https://nixos.org/manual/nix/stable/release-notes/rl-2.10.html) and [2.11](https://nixos.org/manual/nix/stable/release-notes/rl-2.11.html). - OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. -- An image configuration and generator has been added for Linode images, largely based on the present GCE configuration and image. +- GNOME has been upgraded to version 43. Please see the [release notes](https://release.gnome.org/43/) for details. -- `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement. +- KDE Plasma has been upgraded from v5.24 to v5.26. Please see the release notes for [v5.25](https://kde.org/announcements/plasma/5/5.25.0/) and [v5.26](https://kde.org/announcements/plasma/5/5.26.0/) for more details on the included changes. - +- Cinnamon has been updated to 5.4, and the Cinnamon module now defaults to + Blueman as the Bluetooth manager and slick-greeter as the LightDM greeter, to match upstream. -## New Services {#sec-release-22.11-new-services} +- PHP now defaults to PHP 8.1, updated from 8.0. -- [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable). +- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default. -- [automatic-timezoned](https://github.com/maxbrunet/automatic-timezoned). a Linux daemon to automatically update the system timezone based on location. Available as [services.automatic-timezoned](#opt-services.automatic-timezoned.enable). - -- [xray] (https://github.com/XTLS/Xray-core), a fully compatible v2ray-core replacement. Features XTLS, which when enabled on server and client, brings UDP FullCone NAT to proxy setups. Available as [services.xray](options.html#opt-services.xray.enable). - -- [syncstorage-rs](https://github.com/mozilla-services/syncstorage-rs), a self-hostable sync server for Firefox. Available as [services.firefox-syncserver](options.html#opt-services.firefox-syncserver.enable). - -- [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable). - -- [Komga](https://komga.org/), a free and open source comics/mangas media server. Available as [services.komga](#opt-services.komga.enable). - -- [Tandoor Recipes](https://tandoor.dev), a self-hosted multi-tenant recipe collection. Available as [services.tandoor-recipes](options.html#opt-services.tandoor-recipes.enable). - -- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). - -- [Please](https://github.com/edneville/please), a Sudo clone written in Rust. Available as [security.please](#opt-security.please.enable) - -- [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable). - -- [EVCC](https://evcc.io) is an EV charge controller with PV integration. It supports a multitude of chargers, meters, vehicle APIs and more and ties that together with a well-tested backend and a lightweight web frontend. Available as [services.evcc](#opt-services.evcc.enable). - -- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. - Available as [services.infnoise](options.html#opt-services.infnoise.enable). - -- [kthxbye](https://github.com/prymitive/kthxbye), an alert acknowledgement management daemon for Prometheus Alertmanager. Available as [services.kthxbye](options.html#opt-services.kthxbye.enable) - -- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. - Available as [services.kanata](options.html#opt-services.kanata.enable). - -- [karma](https://github.com/prymitive/karma), an alert dashboard for Prometheus Alertmanager. Available as [services.karma](options.html#opt-services.karma.enable) - -- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. - Available as [services.languagetool](options.html#opt-services.languagetool.enable). - -- [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master), a FOSS tool for controlling RGB lighting. Available as [services.hardware.openrgb.enable](options.html#opt-services.hardware.openrgb.enable). - -- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). - -- [ntfy.sh](https://ntfy.sh), a push notification service. Available as [services.ntfy-sh](#opt-services.ntfy-sh.enable) - -- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). - -- [endlessh](https://github.com/skeeto/endlessh), an SSH tarpit. Available as [services.endlessh](#opt-services.endlessh.enable). - -- [endlessh-go](https://github.com/shizunge/endlessh-go), an SSH tarpit that exposes Prometheus metrics. Available as [services.endlessh-go](#opt-services.endlessh-go.enable). - -- [Garage](https://garagehq.deuxfleurs.fr/), a simple object storage server for geodistributed deployments, alternative to MinIO. Available as [services.garage](#opt-services.garage.enable). - -- [netbird](https://netbird.io), a zero configuration VPN. - Available as [services.netbird](options.html#opt-services.netbird.enable). - -- [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable). - -- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). - -- [Dolibarr](https://www.dolibarr.org/), an enterprise resource planning and customer relationship manager. Enable using [services.dolibarr](#opt-services.dolibarr.enable). - -- [FreshRSS](https://freshrss.org/), a free, self-hostable RSS feed aggregator. Available as [services.freshrss](#opt-services.freshrss.enable). - -- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable). - -- [merecat](https://troglobit.com/projects/merecat/), a small and easy HTTP server based on thttpd. Available as [services.merecat](#opt-services.merecat.enable) - -- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable). - -- [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable). - -- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable). - -- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable). - -- [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul. -Available as [services.patroni](options.html#opt-services.patroni.enable). - -- [Prometheus IPMI exporter](https://github.com/prometheus-community/ipmi_exporter), an IPMI exporter for Prometheus. Available as [services.prometheus.exporters.ipmi](#opt-services.prometheus.exporters.ipmi.enable). - -- [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable). - -- [Listmonk](https://listmonk.app), a self-hosted newsletter manager. Enable using [services.listmonk](options.html#opt-services.listmonk.enable). - -- [Uptime Kuma](https://uptime.kuma.pet/), a fancy self-hosted monitoring tool. Available as [services.uptime-kuma](#opt-services.uptime-kuma.enable). - -- [Mepo](https://mepo.milesalan.com), a fast, simple, hackable OSM map viewer for mobile and desktop Linux. Available as [programs.mepo.enable](#opt-programs.mepo.enable). - - +- Python now defaults to 3.10, updated from 3.9. ## Backward Incompatibilities {#sec-release-22.11-incompatibilities} @@ -193,11 +97,11 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - `ngrok` has been upgraded from 2.3.40 to 3.0.4. Please see [the upgrade guide](https://ngrok.com/docs/guides/upgrade-v2-v3) and [changelog](https://ngrok.com/docs/ngrok-agent/changelog). Notably, breaking changes are that the config file format has - changed and support for single hypen arguments was dropped. + changed and support for single hyphen arguments was dropped. -- `i18n.supportedLocales` is now by default only generated with the locales set in `i18n.defaultLocale` and `i18n.extraLocaleSettings`. - This got partially copied over from the minimal profile and reduces the final system size by up to 200MB. - If you require all locales installed set the option to ``[ "all" ]``. +- `i18n.supportedLocales` is now only generated with the locales set in `i18n.defaultLocale` and `i18n.extraLocaleSettings`. + - This reduces the final system closure size by up to 200MB. + - If you require all locales installed, set the option to ``[ "all" ]``. - Deprecated settings `logrotate.paths` and `logrotate.extraConfig` have been removed. Please convert any uses to @@ -209,7 +113,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `fetchgit` fetcher supports sparse checkouts via the `sparseCheckout` option. This used to accept a multi-line string with directories/patterns to check out, but now requires a list of strings. -- `openssh` was updated to version 9.1, disabling the generation of DSA keys when using `ssh-keygen -A` as they are insecure. Also, `SetEnv` directives in `ssh_config` and `sshd_config` are now first-match-wins +- `openssh` was updated to version 9.1, disabling the generation of DSA keys when using `ssh-keygen -A` as they are insecure. Also, `SetEnv` directives in `ssh_config` and `sshd_config` are now first-match-wins. - `bsp-layout` no longer uses the command `cycle` to switch to other window layouts, as it got replaced by the commands `previous` and `next`. @@ -222,11 +126,11 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `p4` package now only includes the open-source Perforce Helix Core command-line client and APIs. It no longer installs the unfree Helix Core Server binaries `p4d`, `p4broker`, and `p4p`. To install the Helix Core Server binaries, use the `p4d` package instead. -- The `openssl`-extension for the PHP interpreter used by Nextcloud is built against OpenSSL 1.1 if +- The OpenSSL extension for the PHP interpreter used by Nextcloud is built against OpenSSL 1.1 if [](#opt-system.stateVersion) is below `22.11`. This is to make sure that people using [server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html) don't lose access to their files. - In any other case it's safe to use OpenSSL 3 for PHP's openssl extension. This can be done by setting + In any other case, it's safe to use OpenSSL 3 for PHP's OpenSSL extension. This can be done by setting [](#opt-services.nextcloud.enableBrokenCiphersForSSE) to `false`. - The `coq` package and versioned variants starting at `coq_8_14` no @@ -245,7 +149,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues. Users who still wish to remain using GTK can do so by using `emacs-gtk`. -- `kanidm` has been updated to 1.1.0-alpha.10 and now requires a tls certificate and key. It will always start an https and – if enabled – an ldaps server and no http and ldap server anymore. +- `kanidm` has been updated to 1.1.0-alpha.10 and now requires a TLS certificate and key. It will always start `https` and-–-if enabled-–-an LDAPS server and no HTTP and LDAP server anymore. - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. @@ -266,8 +170,6 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `nix.checkConfig` option now fully disables the config check. The new `nix.checkAllErrors` option behaves like `nix.checkConfig` previously did. -- `nix.buildMachines` got a new submodule option `protocol`. An undocumented hack to set the protocol via `hostName` is no longer working and the `protocol` option should be used instead. - - `generateOptparseApplicativeCompletions` and `generateOptparseApplicativeCompletion` from `haskell.lib.compose` (and `haskell.lib`) have been deprecated in favor of `generateOptparseApplicativeCompletions` (plural!) as provided by the haskell package sets (so `haskellPackages.generateOptparseApplicativeCompletions` etc.). @@ -314,7 +216,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `zrepl` package has been updated from 0.5.0 to 0.6.0. See the [changelog](https://zrepl.github.io/changelog.html) for details. -- `k3s` no longer supports docker as runtime due to upstream dropping support. +- `k3s` no longer supports Docker as runtime due to upstream dropping support. - `cassandra_2_1` and `cassandra_2_2` have been removed. Please update to `cassandra_3_11` or `cassandra_3_0`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt) for more information about the upgrade process. @@ -338,7 +240,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). For further information, please read the upstream changelogs. -- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`. +- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides. Use `features` instead, which defaults to `[ "lua54" "luau" ]`. - `ocamlPackages.ocaml_extlib` has been renamed to `ocamlPackages.extlib`. @@ -363,23 +265,29 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). ## Other Notable Changes {#sec-release-22.11-notable-changes} -- `firefox`, `thunderbird` and `librewolf` come with enabled Wayland support by default. The `firefox-wayland`, `firefox-esr-wayland`, `thunderbird-wayland` and `librewolf-wayland` attributes are obsolete and have been aliased to their generic attribute. +- PHP is now built in `NTS` (Non-Thread Safe) mode by default. + - For Apache and `mod_php` usage, we enable `ZTS` (Zend Thread Safe) mode. This has been a + common practice for a long time in other distributions. + +- `firefox`, `thunderbird` and `librewolf` now come with Wayland support by default. The `firefox-wayland`, `firefox-esr-wayland`, `thunderbird-wayland` and `librewolf-wayland` attributes are obsolete and have been aliased to their generic attribute. - The `xplr` package has been updated from 0.18.0 to 0.19.0, which brings some breaking changes. See the [upstream release notes](https://github.com/sayanarijit/xplr/releases/tag/v0.19.0) for more details. -- Configuring multiple GitHub runners is now possible through `services.github-runners.`. The option `services.github-runner` remains. +- Configuring multiple GitHub runners is now possible through `services.github-runners.`. The options under `services.github-runner` remain, to configure a single runner. - `github-runner` gained support for ephemeral runners and registrations using a personal access token (PAT) instead of a registration token. See `services.github-runner.ephemeral` and `services.github-runner.tokenFile` for details. -- A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`. +- A new module was added to provide hardware support for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`. -- ZFS module will not allow hibernation by default, this is a safety measure to prevent data loss cases like the ones described at [OpenZFS/260](https://github.com/openzfs/zfs/issues/260) and [OpenZFS/12842](https://github.com/openzfs/zfs/issues/12842). Use the `boot.zfs.allowHibernation` option to configure this behaviour. +- ZFS module will no longer allow hibernation by default. + - This is a safety measure to prevent data loss cases like the ones described at [OpenZFS/260](https://github.com/openzfs/zfs/issues/260) and [OpenZFS/12842](https://github.com/openzfs/zfs/issues/12842). + - Use the `boot.zfs.allowHibernation` option to configure this behaviour. -- `mastodon` now automatically removes remote media attachments older than 30 days. This is configurable through `services.mastodon.mediaAutoRemove`. +- Mastodon now automatically removes remote media attachments older than 30 days. This is configurable through `services.mastodon.mediaAutoRemove`. - The Redis module now disables RDB persistence when `services.redis.servers..save = []` instead of using the Redis default. -- Neo4j was updated from version 3 to version 4. See this [migration guide](https://neo4j.com/docs/upgrade-migration-guide/current/) on how to migrate your Neo4j instance. +- Neo4j was updated from version 3 to version 4. See upstream's [migration guide](https://neo4j.com/docs/upgrade-migration-guide/current/) for information on how to migrate your instance. - The `networking.wireguard` module now can set the mtu on interfaces and tag its packets with an fwmark. @@ -389,9 +297,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `polymc` package has been removed due to a rogue maintainer. It has been replaced by `prismlauncher`, a fork by the rest of the maintainers. For more - details, see [the pull request that made this - change](https://github.com/NixOS/nixpkgs/pull/196624) and [this issue - detailing the vulnerability](https://github.com/NixOS/nixpkgs/issues/196460). + details, see [the PR that made this change](https://github.com/NixOS/nixpkgs/pull/196624) and + [the issue detailing the vulnerability](https://github.com/NixOS/nixpkgs/issues/196460). Users with existing installations should rename `~/.local/share/polymc` to `~/.local/share/PrismLauncher`. The main config file's path has also moved from `~/.local/share/polymc/polymc.cfg` to @@ -399,7 +306,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `bloat` package has been updated from unstable-2022-03-31 to unstable-2022-10-25, which brings a breaking change. See [this upstream commit message](https://git.freesoftwareextremist.com/bloat/commit/?id=887ed241d64ba5db3fd3d87194fb5595e5ad7d73) for details. -- The `services.matrix-synapse` systemd unit has been hardened. +- Synapse's systemd unit has been hardened. - The module `services.grafana` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed: - The newly introduced option [](#opt-services.grafana.settings) is an attribute-set that @@ -464,7 +371,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `services.grafana.provision.alerting` option was added. It includes suboptions for every alerting-related objects (with the exception of `notifiers`), which means it's now possible to configure modern Grafana alerting declaratively. -- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. +- Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. - The `diamond` package has been update from 0.8.36 to 2.0.15. See the [upstream release notes](https://github.com/bbuchfink/diamond/releases) for more details. @@ -472,7 +379,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `netlify-cli` package has been updated from 6.13.2 to 12.2.4, see the [changelog](https://github.com/netlify/cli/releases) for more details. -- `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`. +- `dockerTools.buildImage`'s `contents` parameter has been deprecated in favor of `copyToRoot`. Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`. - The `proxmox.qemuConf.bios` option was added, it corresponds to `Hardware->BIOS` field in Proxmox web interface. Use `"ovmf"` value to build UEFI image, default value remains `"bios"`. New option `proxmox.partitionTableType` defaults to either `"legacy"` or `"efi"`, depending on the `bios` value. Setting `partitionTableType` to `"hybrid"` results in an image, which supports both methods (`"bios"` and `"ovmf"`), thereby remaining bootable after change to Proxmox `Hardware->BIOS` field. @@ -483,7 +390,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `documentation.nixos.options.allowDocBook` option was added to ease the transition to CommonMark option documentation. Setting this option to `false` causes an error for every option included in the manual that uses DocBook documentation; it defaults to `true` to preserve the previous behavior and will be removed once the transition to CommonMark is complete. -- The redis module now persists each instance's configuration file in the state directory, in order to support some more advanced use cases like sentinel. +- The Redis module now persists each instance's configuration file in the state directory, in order to support some more advanced use cases like Sentinel. + +- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it. - The udisks2 service, available at `services.udisks2.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. This also means that polkit will now actually be disabled by default. The default for `security.polkit.enable` was already flipped in the previous release, but udisks2 being enabled by default re-enabled it. @@ -492,22 +401,12 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). for Nextcloud in NixOS: - For Nextcloud **>=24**, the default PHP version is 8.1. - Nextcloud **23** has been removed since it will reach its [end of life in December 2022](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule/d76576a12a626d53305d480a6065b57cab705d3d). - - For `system.stateVersion` being **>=22.11**, Nextcloud 25 will be installed by default. For older versions, + - If `system.stateVersion` is **>=22.11**, Nextcloud 25 will be installed by default. For older versions, Nextcloud 24 will be installed. - - Please ensure that you only upgrade on major release at a time! Nextcloud doesn't support + - Please ensure that you only upgrade one major release at a time! Nextcloud doesn't support upgrades across multiple versions, i.e. an upgrade from **23** to **25** is only possible when upgrading to **24** first. -- Add udev rules for the Teensy family of microcontrollers. - -- The Qt QML disk cache is now disabled by default. This fixes a - long-standing issue where updating Qt/KDE apps would sometimes cause - them to crash or behave strangely without explanation. Those concerned - about the small (~10%) performance hit to application startup can - re-enable the cache (and expose themselves to gremlins) by setting the - envrionment variable `QML_FORCE_DISK_CACHE` to `1` using e.g. the - `environment.sessionVariables` NixOS option. - - systemd-oomd is enabled by default. Depending on which systemd units have `ManagedOOMSwap=kill` or `ManagedOOMMemoryPressure=kill`, systemd-oomd will SIGKILL all the processes under the appropriate descendant cgroups when the @@ -521,25 +420,23 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API. -- There is a new module for AMD SEV CPU functionality, which grants access to the hardware. - -- The Wordpress module got support for installing language packs through `services.wordpress.sites..languages`. +- The Wordpress module now has support for installing language packs through a new option, `services.wordpress.sites..languages`. - The default package for `services.mullvad-vpn.package` was changed to `pkgs.mullvad`, allowing cross-platform usage of Mullvad. `pkgs.mullvad` only contains the Mullvad CLI tool, so users who rely on the Mullvad GUI will want to change it back to `pkgs.mullvad-vpn`, or add `pkgs.mullvad-vpn` to their environment. -- PowerDNS has been updated from `4.6.x` to `4.7.x`. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master) provided by upstream before upgrading. Worth specifically noting is that the new Catalog Zones feature comes with a mandatory schema change for the gsql database backends, which has to be manually applied. +- PowerDNS has been updated from v4.6.2 to v4.7.2. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master) provided by upstream before upgrading. Worth specifically noting is that the new Catalog Zones feature comes with a mandatory schema change for the GSQL database backends, which has to be manually applied. -- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed. +- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and may be removed in a future release. -- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service. +- There is a new module for `xfconf` (the Xfce configuration storage system), which has a dbus service. -- The Mastodon package got upgraded from the major version 3 to 4. See the [v4.0.0 release notes](https://github.com/mastodon/mastodon/releases/tag/v4.0.0) for a list of changes. On standard setups, no manual migration steps are required. Nevertheless, a database backup is recommended. +- The Mastodon package has been upgraded to v4.0.0. See the [v4.0.0 release notes](https://github.com/mastodon/mastodon/releases/tag/v4.0.0) for a list of changes. On standard setups, no manual migration steps are required. Nevertheless, a database backup is recommended. -- The `nomad` package now defaults to 1.3, which no longer has a downgrade path to releases 1.2 or older. +- The `nomad` package now defaults to v1.3, which no longer has a downgrade path to v1.2 or older. - The `nodePackages` package set now defaults to the LTS release in the `nodejs` package again, instead of being pinned to `nodejs-14_x`. Several updates to node2nix have been made for compatibility with newer Node.js and npm versions and a new `postRebuild` hook has been added for packages to perform extra build steps before the npm install step prunes dev dependencies. -- `boot.kernel.sysctl` is defined as a freeformType and adds a custom merge option for "net.core.rmem_max" (taking the highest value defined to avoid conflicts between 2 services trying to set that value). +- `boot.kernel.sysctl` is defined as a freeformType and adds a custom merge option for `net.core.rmem_max` (taking the highest value defined to avoid conflicts between 2 services trying to set that value). - The `mame` package does not ship with its tools anymore in the default output. They were moved to a separate `tools` output instead. For convenience, `mame-tools` package was added for those who want to use it. @@ -547,8 +444,92 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The option `services.picom.experimentalBackends` was removed since it is now the default and the option will cause `picom` to quit instead. -- `haskellPackage.callHackage` is not always invalidated if `all-cabal-hashes` changes, leading to less rebuilds of haskell dependencies. +- `haskellPackages.callHackage` is not always invalidated if `all-cabal-hashes` changes, leading to less rebuilds of haskell dependencies. - `haskellPackages.callHackage` and `haskellPackages.callCabal2nix` (and related functions) no longer keep a reference to the `cabal2nix` call used to generate them. As a result, they will be garbage collected more often. + +## New Services {#sec-release-22.11-new-services} + +- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). + +- [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable). + +- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable). + +- [automatic-timezoned](https://github.com/maxbrunet/automatic-timezoned). a Linux daemon to automatically update the system timezone based on location. Available as [services.automatic-timezoned](#opt-services.automatic-timezoned.enable). + +- [Dolibarr](https://www.dolibarr.org/), an enterprise resource planning and customer relationship manager. Enable using [services.dolibarr](#opt-services.dolibarr.enable). + +- [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable). + +- [endlessh-go](https://github.com/shizunge/endlessh-go), an SSH tarpit that exposes Prometheus metrics. Available as [services.endlessh-go](#opt-services.endlessh-go.enable). + +- [endlessh](https://github.com/skeeto/endlessh), an SSH tarpit. Available as [services.endlessh](#opt-services.endlessh.enable). + +- [EVCC](https://evcc.io) is an EV charge controller with PV integration. It supports a multitude of chargers, meters, vehicle APIs and more and ties that together with a well-tested backend and a lightweight web frontend. Available as [services.evcc](#opt-services.evcc.enable). + +- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable). + +- [FreshRSS](https://freshrss.org/), a free, self-hostable RSS feed aggregator. Available as [services.freshrss](#opt-services.freshrss.enable). + +- [Garage](https://garagehq.deuxfleurs.fr/), a simple object storage server for geodistributed deployments, alternative to MinIO. Available as [services.garage](#opt-services.garage.enable). + +- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable). + +- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable). + +- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). + +- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). + +- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. Available as [services.kanata](options.html#opt-services.kanata.enable). + +- [karma](https://github.com/prymitive/karma), an alert dashboard for Prometheus Alertmanager. Available as [services.karma](options.html#opt-services.karma.enable) + +- [Komga](https://komga.org/), a free and open source comics/mangas media server. Available as [services.komga](#opt-services.komga.enable). + +- [kthxbye](https://github.com/prymitive/kthxbye), an alert acknowledgement management daemon for Prometheus Alertmanager. Available as [services.kthxbye](options.html#opt-services.kthxbye.enable) + +- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. Available as [services.languagetool](options.html#opt-services.languagetool.enable). + +- [Listmonk](https://listmonk.app), a self-hosted newsletter manager. Enable using [services.listmonk](options.html#opt-services.listmonk.enable). + +- [Mepo](https://mepo.milesalan.com), a fast, simple, hackable OSM map viewer for mobile and desktop Linux. Available as [programs.mepo.enable](#opt-programs.mepo.enable). + +- [merecat](https://troglobit.com/projects/merecat/), a small and easy HTTP server based on thttpd. Available as [services.merecat](#opt-services.merecat.enable) + +- [netbird](https://netbird.io), a zero configuration VPN. Available as [services.netbird](options.html#opt-services.netbird.enable). + +- [ntfy.sh](https://ntfy.sh), a push notification service. Available as [services.ntfy-sh](#opt-services.ntfy-sh.enable) + +- [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master), a FOSS tool for controlling RGB lighting. Available as [services.hardware.openrgb.enable](options.html#opt-services.hardware.openrgb.enable). + +- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). + +- [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul. Available as [services.patroni](options.html#opt-services.patroni.enable). + +- [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable). + +- [Please](https://github.com/edneville/please), a Sudo clone written in Rust. Available as [security.please](#opt-security.please.enable). + +- [Prometheus IPMI exporter](https://github.com/prometheus-community/ipmi_exporter), an IPMI exporter for Prometheus. Available as [services.prometheus.exporters.ipmi](#opt-services.prometheus.exporters.ipmi.enable). + +- [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable). + +- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). + +- [syncstorage-rs](https://github.com/mozilla-services/syncstorage-rs), a self-hostable sync server for Firefox. Available as [services.firefox-syncserver](options.html#opt-services.firefox-syncserver.enable). + +- [Tandoor Recipes](https://tandoor.dev), a self-hosted multi-tenant recipe collection. Available as [services.tandoor-recipes](options.html#opt-services.tandoor-recipes.enable). + +- [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable). + +- [Uptime Kuma](https://uptime.kuma.pet/), a fancy self-hosted monitoring tool. Available as [services.uptime-kuma](#opt-services.uptime-kuma.enable). + +- [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable). + +- [xray](https://github.com/XTLS/Xray-core), a fully compatible v2ray-core replacement. Features XTLS, which when enabled on server and client, brings UDP FullCone NAT to proxy setups. Available as [services.xray](options.html#opt-services.xray.enable). + + diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 26e7cbfca733..8eb1ed53d0c7 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -414,6 +414,7 @@ in str int bool + path package ]); in diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix index 491371e468e5..183002ff72b9 100644 --- a/nixos/modules/services/networking/stubby.nix +++ b/nixos/modules/services/networking/stubby.nix @@ -7,7 +7,9 @@ let settingsFormat = pkgs.formats.yaml { }; confFile = settingsFormat.generate "stubby.yml" cfg.settings; in { - imports = map (x: + imports = [ + (mkRemovedOptionModule [ "stubby" "debugLogging" ] "Use services.stubby.logLevel = \"debug\"; instead.") + ] ++ map (x: (mkRemovedOptionModule [ "services" "stubby" x ] "Stubby configuration moved to services.stubby.settings.")) [ "authenticationMode" @@ -49,10 +51,22 @@ in { ''; }; - debugLogging = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc "Enable or disable debug level logging."; + logLevel = let + logLevels = { + emerg = 0; + alert = 1; + crit = 2; + error = 3; + warning = 4; + notice = 5; + info = 6; + debug = 7; + }; + in mkOption { + default = null; + type = types.nullOr (types.enum (attrNames logLevels ++ attrValues logLevels)); + apply = v: if isString v then logLevels.${v} else v; + description = lib.mdDoc "Log verbosity (syslog keyword or level)."; }; }; @@ -80,7 +94,7 @@ in { Type = "notify"; AmbientCapabilities = "CAP_NET_BIND_SERVICE"; CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; - ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}"; + ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString (cfg.logLevel != null) "-v ${toString cfg.logLevel}"}"; DynamicUser = true; CacheDirectory = "stubby"; }; diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index f09a8dfc5b21..800af234e278 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -9,6 +9,10 @@ let name = "configuration.py"; text = '' STATIC_ROOT = '${staticDir}' + MEDIA_ROOT = '${cfg.dataDir}/media' + REPORTS_ROOT = '${cfg.dataDir}/reports' + SCRIPTS_ROOT = '${cfg.dataDir}/scripts' + ALLOWED_HOSTS = ['*'] DATABASE = { 'NAME': 'netbox', @@ -42,11 +46,10 @@ let installPhase = old.installPhase + '' ln -s ${configFile} $out/opt/netbox/netbox/netbox/configuration.py '' + optionalString cfg.enableLdap '' - ln -s ${ldapConfigPath} $out/opt/netbox/netbox/netbox/ldap_config.py + ln -s ${cfg.ldapConfigPath} $out/opt/netbox/netbox/netbox/ldap_config.py ''; })).override { - plugins = ps: ((cfg.plugins ps) - ++ optionals cfg.enableLdap [ ps.django-auth-ldap ]); + inherit (cfg) plugins; }; netboxManageScript = with pkgs; (writeScriptBin "netbox-manage" '' #!${stdenv.shell} @@ -139,6 +142,8 @@ in { }; config = mkIf cfg.enable { + services.netbox.plugins = mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); + services.redis.servers.netbox.enable = true; services.postgresql = { diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index d5325bc43940..25de29554b1e 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -171,7 +171,8 @@ in # theme sound-theme-freedesktop nixos-artwork.wallpapers.simple-dark-gray - mint-artwork # cursors + mint-artwork + mint-cursor-themes mint-themes mint-x-icons mint-y-icons diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index f05f04baa35d..a71b69341051 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -88,6 +88,16 @@ in }; ''; }; + + privilegedContainer = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether this LXC container will be running as a privileged container or not. If set to `true` then + additional configuration will be applied to the `systemd` instance running within the container as + recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/). + ''; + }; }; }; @@ -146,12 +156,31 @@ in }; # Add the overrides from lxd distrobuilder - systemd.extraConfig = '' - [Service] - ProtectProc=default - ProtectControlGroups=no - ProtectKernelTunables=no - ''; + # https://github.com/lxc/distrobuilder/blob/05978d0d5a72718154f1525c7d043e090ba7c3e0/distrobuilder/main.go#L630 + systemd.packages = [ + (pkgs.writeTextFile { + name = "systemd-lxc-service-overrides"; + destination = "/etc/systemd/system/service.d/zzz-lxc-service.conf"; + text = '' + [Service] + ProcSubset=all + ProtectProc=default + ProtectControlGroups=no + ProtectKernelTunables=no + NoNewPrivileges=no + LoadCredential= + '' + optionalString cfg.privilegedContainer '' + # Additional settings for privileged containers + ProtectHome=no + ProtectSystem=no + PrivateDevices=no + PrivateTmp=no + ProtectKernelLogs=no + ProtectKernelModules=no + ReadWritePaths= + ''; + }) + ]; # Allow the user to login as root without password. users.users.root.initialHashedPassword = mkOverride 150 ""; diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index 57407477f4b8..8e37d5dcf97b 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -1,7 +1,7 @@ let testString = "can-use-subgroups"; in -import ../make-test-python.nix ({ lib, php, ... }: { +import ../make-test-python.nix ({ pkgs, lib, php, ... }: { name = "php-${php.version}-httpd-pcre-jit-test"; meta.maintainers = lib.teams.php.members; @@ -31,12 +31,22 @@ import ../make-test-python.nix ({ lib, php, ... }: { ''; }; }; - testScript = { ... }: - '' + testScript = let + # PCRE JIT SEAlloc feature does not play well with fork() + # The feature needs to either be disabled or PHP configured correctly + # More information in https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 + pcreJitSeallocForkIssue = pkgs.writeText "pcre-jit-sealloc-issue.php" '' + > $out/nix-support/libcxx-cxxflags done - for dir in ${gccForLibs}/include/c++/*/${targetPlatform.config}; do + for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*/${targetPlatform.config}; do echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done '' diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 802b2f79f0fc..71c3574963c8 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -92,10 +92,11 @@ rec { ]; extraCommands = '' + mkdir -p tmp + # nginx still tries to read this directory even if error_log # directive is specifying another file :/ mkdir -p var/log/nginx - mkdir -p var/cache/nginx ''; config = { diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index f05fbd54485f..4e09ca3b3d06 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -54,13 +54,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.6.2"; + version = "5.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-JvdbapOJq2w0tObnGd8t+SLruWN0sblKhSf2dlHR9Go="; + hash = "sha256-IPu3J05y4xEFn82cI0y9eN+4kJRChKS/zEGZOWaJnZw="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 5a803c6d487c..fbff8c60fa3f 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -26,6 +26,7 @@ lib.makeScope pkgs.newScope (self: with self; { cjs = callPackage ./cjs { }; nemo = callPackage ./nemo { }; mint-artwork = callPackage ./mint-artwork { }; + mint-cursor-themes = callPackage ./mint-cursor-themes { }; mint-themes = callPackage ./mint-themes { }; mint-x-icons = callPackage ./mint-x-icons { }; mint-y-icons = callPackage ./mint-y-icons { }; diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 68f627feecbd..9c59e381f819 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.6.8"; + version = "1.7.0"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20221129013553/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20221130011545/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-HPnb5Mb6tvzREZbW9SyDNQ6ST6RPmOUVdA9MW8oyRAM="; + hash = "sha256-1dBLsN9nTzrqitlwoobYnjh1qKXR6UOaDsTkBMfnX1k="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/linuxmint/mint-artwork"; description = "Artwork for the cinnamon desktop"; - license = licenses.gpl3; # from debian/copyright + license = with licenses; [ gpl3Plus cc-by-40 ]; # from debian/copyright platforms = platforms.linux; maintainers = teams.cinnamon.members; }; diff --git a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix new file mode 100644 index 000000000000..c2190a65308d --- /dev/null +++ b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +}: + +stdenvNoCC.mkDerivation rec { + pname = "mint-cursor-themes"; + version = "unstable-2022-11-29"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = "aa6bb767831ac43d1768c2e639de713a4a1eba8d"; + hash = "sha256-UQnRrylUo9zuDiAwQ1COtXMtq4XTbxtMle41p+pzxJc="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv usr/share $out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/linuxmint/mint-cursor-themes/"; + description = "Linux Mint cursor themes"; + license = licenses.gpl3Plus; + maintainers = teams.cinnamon.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 241136f6e72a..6a592ac7e42d 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "5.6.0"; + version = "5.6.1"; outputs = [ "out" "dev" "man" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-vUkxR3HfzubaOoXxo6xHDLLy+zVBYE9i5s+yp1rbJaw="; + hash = "sha256-FpVCIRz1qZhvBR9KARb/CKXYL9t43FF2VqWkHrLdpNc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 2926760fce59..dff70527c082 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.2.15"; + version = "1.4.1"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-WLeJTSf8906CjvJvBWnmFRVV1ngOuIK0V/3qZ82Bx7s="; + hash = "sha256-gZ19WVolm8uoDZcX3OgLGkB8nFUPZIwCmKGQop9/xJ8="; }; nativeBuildInputs = [ @@ -68,9 +68,13 @@ python3.pkgs.buildPythonApplication rec { {} + ''; + dontWrapGApps = true; # Prevent double wrapping + preFixup = '' # these get loaded via import from bin, so don't need wrapping chmod -x+X $out/libexec/warpinator/*.py + + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; passthru.updateScript = gitUpdater { diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index f0b263ae4cf4..ae1dd2433625 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -396,11 +396,11 @@ }; }; plasma-workspace = { - version = "5.26.4"; + version = "5.26.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.4/plasma-workspace-5.26.4.tar.xz"; - sha256 = "06pbghl8gpq63gg9jj29jsizgfq7bcqj9kx48gkqcwvd9gd1q1f9"; - name = "plasma-workspace-5.26.4.tar.xz"; + url = "${mirror}/stable/plasma/5.26.4/plasma-workspace-5.26.4.1.tar.xz"; + sha256 = "7fcca23ff8de6f4aa2261f0180be54422f25047002b7ca6c648e7216459b80fc"; + name = "plasma-workspace-5.26.4.1.tar.xz"; }; }; plasma-workspace-wallpapers = { diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix new file mode 100644 index 000000000000..11b2fa60c733 --- /dev/null +++ b/pkgs/development/compilers/openjdk/19.nix @@ -0,0 +1,169 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio +, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib +, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst +, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk19-bootstrap +, ensureNewerSourcesForZipFilesHook +, setJavaClassPath +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + version = { + feature = "19"; + interim = ".0.1"; + build = "10"; + }; + + openjdk = stdenv.mkDerivation { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${version.feature}${version.interim}+${version.build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jdk${version.feature}u"; + rev = "jdk-${version.feature}${version.interim}+${version.build}"; + hash = "sha256-IS6ABnVdW1qJ4gu4YSgMVFXBTNdtWFdbNNz+kMaiyk8="; + }; + + nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk19-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + ./ignore-LegalNoticeFilePlugin-jdk18.patch + + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + postPatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + configureFlags = [ + "--with-boot-jdk=${openjdk19-bootstrap.home}" + "--with-version-build=${version.build}" + "--with-version-opt=nixos" + "--with-version-pre=" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]); + + # -j flag is explicitly rejected by the build system: + # Error: 'make -jN' is not supported, use 'make JOBS=N' + # Note: it does not make build sequential. Build system + # still runs in parallel. + enableParallelBuilding = false; + + buildFlags = [ "images" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk19-bootstrap ]; + + meta = import ./meta.nix lib version.feature; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + inherit gtk3; + }; + }; +in openjdk diff --git a/pkgs/development/compilers/openjdk/darwin/19.nix b/pkgs/development/compilers/openjdk/darwin/19.nix new file mode 100644 index 000000000000..e582c4016a54 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/19.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +let + # Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk + # Note that the latest build may differ by platform + dist = { + x86_64-darwin = { + arch = "x64"; + zuluVersion = "19.30.11"; + jdkVersion = "19.0.1"; + sha256 = "1h0qj0xgpxjy506ikbgdn74pi4860lsnh5n3q3bayfmn0pxc5ksn"; + }; + + aarch64-darwin = { + arch = "aarch64"; + zuluVersion = "19.30.11"; + jdkVersion = "19.0.1"; + sha256 = "0g8i371h5fv686xhiff0431sgvdk80lbp2lkz86jpfdv9lgg0qnk"; + }; + }."${stdenv.hostPlatform.system}"; + + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation rec { + pname = "zulu${dist.zuluVersion}-ca-jdk"; + version = dist.jdkVersion; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + inherit (dist) sha256; + curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/lib/security/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # fixupPhase is moving the man to share/man which breaks it because it's a + # relative symlink. + postFixup = '' + ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man + ''; + + passthru = { + home = jdk; + }; + + meta = import ./meta.nix lib version; + }; +in +jdk diff --git a/pkgs/development/compilers/openjdk/openjfx/19.nix b/pkgs/development/compilers/openjdk/openjfx/19.nix new file mode 100644 index 000000000000..96103734eb0a --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/19.nix @@ -0,0 +1,123 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 }: + +let + major = "19"; + update = ""; + build = "+11"; + repover = "${major}${update}${build}"; + gradle_ = (gradle_7.override { + # note: gradle does not yet support running on 19 + java = openjdk17_headless; + }); + + makePackage = args: stdenv.mkDerivation ({ + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + hash = "sha256-UXTaXtJ8py83V7IQK9wACIEWDAMRUaYNgH9e/Aeyuzc="; + }; + + patches = [ + # 8295962: Reference to State in Task.java is ambiguous when building with JDK 19 + (fetchpatch { + url = "https://github.com/openjdk/jfx/pull/933/commits/cfaee2a52350eff39dd4352484c892716076d3de.patch"; + hash = "sha256-hzJMenhvtmHs/6BJj8GfaLp14myV8VCXCLLC8n32yEw="; + }) + # ditto + (fetchpatch { + url = "https://github.com/openjdk/jfx/pull/933/commits/bd46ce12df0a93a56fe0d58d3653d08e58409b7f.patch"; + hash = "sha256-o9908uw9vYvULmAh/lbfyHhgxz6jpgPq2fcAltWsYoU="; + }) + ]; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" ('' + CONF = Release + JDK_HOME = ${openjdk19_headless.home} + '' + args.gradleProperties or ""); + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + ln -s $config gradle.properties + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + gradle --no-daemon $gradleFlags sdk + + runHook postBuild + ''; + } // args); + + # Fake build to pre-download deps into fixed-output derivation. + # We run nearly full build because I see no other way to download everything that's needed. + # Anyone who knows a better way? + deps = makePackage { + pname = "openjfx-deps"; + + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + # suspiciously the same as for openjfx 17 ... + # could they really not have changed any of their dependencies? + # or did we miss changing another upstream hash when copy-pasting? + outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + }; + +in makePackage { + pname = "openjfx-modular-sdk"; + + gradleProperties = '' + COMPILE_MEDIA = true + COMPILE_WEBKIT = false + ''; + + preBuild = '' + swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ + --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + ''; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${openjdk19_headless.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ openjdk17_headless openjdk19_headless ]; + + passthru.deps = deps; + + meta = with lib; { + homepage = "https://openjdk.org/projects/openjfx/"; + license = licenses.gpl2Classpath; + description = "The next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index 7af35920efc6..f963c6791d0f 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17) +feature_versions = (8, 11, 16, 17, 18, 19) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot") diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 75bd52dcc9fd..7774b7f2b1ae 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -10,6 +10,13 @@ in jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; + + jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; }; + jre-18 = common { sourcePerArch = sources.jre.openjdk18; }; + + jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; }; + jre-19 = common { sourcePerArch = sources.jre.openjdk19; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index df136f8d0c16..9033413431fe 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -11,6 +11,13 @@ in jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; + + jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; }; + jre-18 = common { sourcePerArch = sources.jre.openjdk18; }; + + jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; }; + jre-19 = common { sourcePerArch = sources.jre.openjdk19; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index ec696e1ac202..ccce5f1ea2ed 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,10 +6,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "327b3bfd1c14e15bf6c7fb4d0c6c3f9406c1282a16e24b1424215d764f687cb6", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "774d5955c09893dda14e3eb0fd3e239a6b2cec58615fcf4ec68747260b6e1cc1", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk16": { @@ -23,23 +23,43 @@ } }, "openjdk17": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "cb154396ff3bfb6a9082e3640c564643d31ecae1792fab0956149ed5258ad84b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "1a1706304c26da0d8d2e05127c5aa7dba00e5401b2c0228c8ae894d2812beee0", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "478c8f56dec7378ed8c687e8d7d0fbf729973c62c497cfc8cf58bd621849d764", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "76cfcdf47cdf24331b51939fd2840fd387cf62471da99e4718e2e42b486a9270", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_alpine-linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "e5dcb8f947b687597f92fa80c008a2a17ce86f739dd6dce7ca741921621acb21", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "aa782e3c561b041a5730cbe728c210e234db71fa7222bd8b661f9f4df7799375", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" } } }, @@ -48,30 +68,50 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "4cdebb54ead80e6dff562ad51db850244b1b419ba72062782156df59854a6b22", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "96d26887d042f3c5630cca208b6cd365679a59bf9efb601b28363e827439796c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk17": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "56daddc4c38cda4fa8716d0a6c5b3197305b94ed7011f06adfcd55357952ae17", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "cd0300449a26b3141e313f6ab55b20edfa4b289dc44a7a3989fa2c29152bf7fb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "ad23309a82e690f769037b1e6417022f588702d214da533289f116bba0f61f4e", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "32426b790ac99a21a69abec793bfa47996a4fe7f74c7c89484836237f121640b", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_alpine-linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "6352a4d55373266af90b2f2ec13f4397ada58f5cdc57944ea046c9c538341fd3", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "0f4a4a3c092d8cca171fc36003ac82e2f3d8d768bd6f530a20e2a4caf79bdb9e", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" } } } @@ -80,30 +120,30 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "1", - "sha256": "2b89cabf0ce1c2cedadd92b798d6e9056bc27c71a06f5ba24ede5dc9c316e3e8", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "d18b5dd73fce9edd5c58f623a1173f9ee2d45023836b8753b96beae51673a432", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "armv6l": { - "build": "1", - "sha256": "a703acfd04ece4a4aac4cb9bda26b7d225874008bba324237bd6f53792edb778", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "9ff3b4bd2bac18fb39f3356148efa2dc710ac029e12dc8f18ea1fe6be23bf299", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "armv7l": { - "build": "1", - "sha256": "a703acfd04ece4a4aac4cb9bda26b7d225874008bba324237bd6f53792edb778", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "9ff3b4bd2bac18fb39f3356148efa2dc710ac029e12dc8f18ea1fe6be23bf299", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "5f6b513757d386352cf91514ed5859d1ab59364b4453e1f1c57152ba2039b8e2", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "b8d46ed08ef4859476fe6421a7690d899ed83dce63f13fd894f994043177ef3c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk16": { @@ -135,39 +175,95 @@ } }, "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "1c26c0e09f1641a666d6740d802beb81e12180abaea07b47c409d30c7f368109", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "armv6l": { + "build": "8", + "sha256": "e7c81596f67b6325036e9182d012f2266ced5663c5d4b0de0540ce62dcc67718", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "armv7l": { + "build": "8", + "sha256": "e7c81596f67b6325036e9182d012f2266ced5663c5d4b0de0540ce62dcc67718", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "482180725ceca472e12a8e6d1a4af23d608d78287a77d963335e2a0156a020af", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "aarch64": { "build": "1", - "sha256": "3c7460de77421284b38b4e57cb1bd584a6cef55c34fc51a12270620544de2b8a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "262be608e266fd76d7496af83b2832be853c3aaf7460d6a4da198cd40db74553", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "armv6l": { "build": "1", - "sha256": "efba97cd38af8f43b61f09cb5041f81d92ecd005dcd51c81678fbcf4f24d8461", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "armv7l": { "build": "1", - "sha256": "efba97cd38af8f43b61f09cb5041f81d92ecd005dcd51c81678fbcf4f24d8461", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "5fbf8b62c44f10be2efab97c5f5dbf15b74fae31e451ec10abbc74e54a04ff44", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "7d6beba8cfc0a8347f278f7414351191a95a707d46b6586e9a786f2669af0f8b", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "aarch64": { + "build": "10", + "sha256": "5e8d7b3189364afd78d936bad140dbe1e7025d4b96d530ed5536d035c21afb7c", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "armv6l": { + "build": "36", + "sha256": "34a786548033391de80b857fe02a9c7bd42fcb94243e7273e89012df73f1adef", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_arm_linux_hotspot_19_36.tar.gz", + "version": "19.0.0" + }, + "armv7l": { + "build": "36", + "sha256": "34a786548033391de80b857fe02a9c7bd42fcb94243e7273e89012df73f1adef", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_arm_linux_hotspot_19_36.tar.gz", + "version": "19.0.0" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "163da7ea140210bae97c6a4590c757858ab4520a78af0e3e33129863d4087552", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { "aarch64": { - "build": "1", - "sha256": "c1965fb24dded7d7944e2da36cd902adf3b7b1d327aaa21ea507cff00a5a0090", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_aarch64_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "a70768968bbcccccf977f036e87e545c3b080ed6c44072a01e9dadb94051c454", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" }, "armv6l": { "build": "1", @@ -184,76 +280,132 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "ed6c9db3719895584fb1fd69fc79c29240977675f26631911c5a1dbce07b7d58", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "1", - "sha256": "b6607f28fa2906d612d517f0babe4f0f895aa1c3f901edcddb493e33c1e27364", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "bd6efe3290c8b5a42f695a55a26f3e3c9c284288574879d4b7089f31f5114177", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "armv6l": { - "build": "1", - "sha256": "2ee7fe636a6a57e4718dfe597e8097b93ef8d976e4b05384433777c9f0526f5a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "8cf113d3d7fa808895c8d2e41bb890af21c47e38c2460e0588147a4bb8fc658d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "armv7l": { - "build": "1", - "sha256": "2ee7fe636a6a57e4718dfe597e8097b93ef8d976e4b05384433777c9f0526f5a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "8cf113d3d7fa808895c8d2e41bb890af21c47e38c2460e0588147a4bb8fc658d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "1ffe1a682e8179e35238bf3f93aba0cb185850e202c676f41d38cb0561883eda", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "752616097e09d7f60a3ad8bd312f90eaf50ac72577e55df229fe6e8091148f79", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "34d6414710db27cd7760fe369135f3b9927ccc81410280606613166d4106d60a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "armv6l": { + "build": "8", + "sha256": "9e0d1745139fe502f22df1e261d2ed1ad807085dd75a8b333d481289b579870d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "armv7l": { + "build": "8", + "sha256": "9e0d1745139fe502f22df1e261d2ed1ad807085dd75a8b333d481289b579870d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "11326464a14b63e6328d1d2088a23fb559c0e36b3f380e4c1f8dcbe160a8b95e", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "aarch64": { "build": "1", - "sha256": "2e4137529319cd7935f74e1289025b7b4c794c0fb47a3d138adffbd1bbc0ea58", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "e11e00438c2f6f79f86ff1ca2b015913b0e16bd9491953a082d5c786402cb50a", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "armv6l": { "build": "1", - "sha256": "b63f532cb8b30e4d0bd18d52f08c1933e3cf66aeb373180d002274b6d94b4a25", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "armv7l": { "build": "1", - "sha256": "b63f532cb8b30e4d0bd18d52f08c1933e3cf66aeb373180d002274b6d94b4a25", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "e96814ee145a599397d91e16831d2dddc3c6b8e8517a8527e28e727649aaa2d1", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "74f602ab5abaa554859a5e92a65e5bb6e23c2d4165228299c7f54ed56dbc5959", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "aarch64": { + "build": "10", + "sha256": "c69ffc5474be076b200e8cc72417b838e4f830b36603d593fb8ca6d11b81969b", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "armv6l": { + "build": "36", + "sha256": "f6c4895b8d33118c75403d08f9697af0b77769d0e8574cb678518a0ab3b74a12", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jre_arm_linux_hotspot_19_36.tar.gz", + "version": "19.0.0" + }, + "armv7l": { + "build": "36", + "sha256": "f6c4895b8d33118c75403d08f9697af0b77769d0e8574cb678518a0ab3b74a12", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jre_arm_linux_hotspot_19_36.tar.gz", + "version": "19.0.0" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "68cae46c973e48ca6777cd0026bbf25f3457bd3d6730c36bd79d4f3b398c8338", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { "aarch64": { - "build": "1", - "sha256": "65b8bd74382d6514d2458ff4375468651791a55a186a5bffe0803204801e9c94", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_aarch64_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "cce4db7c4311378d8d2a174b2cf680d57b52a4036f37c995b14f936b6fc1141a", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" }, "armv6l": { "build": "1", @@ -270,10 +422,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "2422a8831fe414b9dba4c443ee3562431dfcde27577124f0db58ec903afc262a", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "40b6b4c3d8f7332ea479527b530413bf0dbc13cff3c0ed9fcadf1ca053bed106", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_x64_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" } } } @@ -282,18 +434,18 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "1", - "sha256": "1953f06702d45eb54bae3ccf453b57c33de827015f5623a2dfc16e1c83e6b0a1", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "79b18cbd398b67a52ebaf033dfca15c7af4c1a84ec5fa68a88f3bf742bb082f7", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "723548e36e0b3e0a5a2f36a38b22ea825d3004e26054a0e254854adc57045352", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "f408a12f10d93b3205bef851af62707531b699963cef79408d59197d08763c94", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk16": { @@ -307,19 +459,51 @@ } }, "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "2dc3e425b52d1cd2915d93af5e468596b9e6a90112056abdcebac8b65bf57049", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "94fe50982b09a179e603a096e83fd8e59fd12c0ae4bcb37ae35f00ef30a75d64", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "aarch64": { "build": "1", - "sha256": "3a976943a9e6a635e68e2b06bd093fc096aad9f5894acda673d3bea0cb3a6f38", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "c5ec423f52d8f3aa632941f29fd289f2e31dce5fe6f3abed9b72bd374f54cd41", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_mac_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "ac21a5a87f7cfa00212ab7c41f7eb80ca33640d83b63ad850be811c24095d61a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_mac_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "2ed916b0c9d197a6bf71b76e84d94125023c2609e0a9b22c64553eff5c9c29c1", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_mac_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "aarch64": { + "build": "10", + "sha256": "2be4ffbf7c59b3148886b48ecf3f7d7edb7c745917ceae2a6be145a4678bf014", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "0d80a8787fa97f5fc2f0000a849b54f4d41c5b87726c29ea1de215e382c8380c", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_mac_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { @@ -336,34 +520,66 @@ "jre": { "openjdk11": { "aarch64": { - "build": "1", - "sha256": "c84f38a7d87d50649ffc1f625facb4398fa54885371336a2cbf6ae2b435cbd10", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "2a5cbc2888f8e382c7d0a5bf2c6d2c3bad120ceff51b00d3a62805dae4473c02", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "10be61a8dd3766f7c12e2e823a6eca48cc6361d97e1b76310c752bd39770c7fe", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_mac_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "66508958b5da6e36021d960b65490ab70cc7d44851c98301a3d6d3552f305674", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "d98b7f5ee6cb4a1c49288bd932008e3e37f9bb5d9a0eb9396ea236786e6ab570", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "c4884b6cd8d43497ff46e4fd475ddde5ab91004db435f0c29a801b081662f7ee", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "aarch64": { "build": "1", - "sha256": "63a32fe611f2666856e84b79305eb80609de229bbce4f13991b961797aa88bf8", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "071f073efb9550838bc02e429ef972f9450b477360f803dd1cf19096ca41182e", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_mac_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "9c59e45a9a6cbc1b8d671c4a88bb8d9b8929fae067df0d0a73b1ca71781a0996", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_mac_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "3629e3dc9dbab7ed13070fbea3a827030acdd62afa557496e88a6d01f9300474", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_mac_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "aarch64": { + "build": "10", + "sha256": "d6d4a51d2eefb98cabdbdd9118ca473e9b07ced8d784541177f74e9bf09d4a2e", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_aarch64_mac_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "8bf67ece0915f5847caec5060e93eafbeeb1a3c99132a72a9424255b3b7cd063", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_mac_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix new file mode 100644 index 000000000000..6c0eb2222513 --- /dev/null +++ b/pkgs/development/interpreters/nelua/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, luaPackages }: + +stdenv.mkDerivation { + pname = "nelua"; + version = "unstable-2022-11-20"; + + src = fetchFromGitHub { + owner = "edubart"; + repo = "nelua-lang"; + rev = "63909dc834708a5bd7c21d65a6633880f40295db"; + hash = "sha256-GeknXYsdRUzihzF3qHcCgbcB3w8geiWe5O1Az+4UqMs="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + checkInputs = [ luaPackages.luacheck ]; + + doCheck = true; + + meta = with lib; { + description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code"; + homepage = "https://nelua.io/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch index 38cd7f52e237..98e2cb102db9 100644 --- a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch +++ b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch @@ -5,6 +5,6 @@ (void - (if remove? -+ (if #t ++ (begin (remove-signature file) (add-ad-hoc-signature file))) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index d285a148b3d7..c6786852b76e 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-os1TvqDTn+WJjX0fREFlNsd8bASdnOOvnCyAkplTVrA="; + sha256 = "sha256-VCPA0/hcbagprr7Ztizkka7W5pkDPgAnqHaxQaY4H4o="; }; - cargoSha256 = "sha256-zfGtRoCpTKomsq3xjfMC1VWUGbpb/qjdWNZ8pgwZfMQ="; + cargoSha256 = "sha256-BzDud7IQiW/LosLDliORmYS+dNG+L6PY0rGEtAmiKhU="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 88f7f6701b34..ad883b12e4eb 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "22.10.26"; + version = "22.11.23"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "sha256-Kub076FkWwHNlphGtTx2c3Jojv8otKLo492uN6Oq1F0="; + sha256 = "sha256-I41bslYoSGPNm1+Xpf4kHFDnIqLN8vg5cEqbFIpDT5A="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index 3ddba9e327db..769da9546e49 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; rev = "v${version}"; - sha256 = "sha256-jo/yGcDnT/L/CMU3XpuhyzlBgvMxgNm9Y1qSVwZJihA="; + sha256 = "sha256-rUuhhoVH4Jdve7eY0M5THWtoHoIluiujfQwfTYULEiQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 1cc0e3b3342f..ab3a9faca00e 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89"; + version = "1.89.1"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-nD65+yI0IR5XwUalAKH8q8kLhZBal0sPkJ1Wyf4UGq0="; + sha256 = "sha256-wIkbluNGiK5HPmFaS5o2tZt/kPcqcXup+V2jnQQDSd0="; }; dontBuild = true; diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 2cd6c55fdbdd..164c9f9e27dd 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.25"; + version = "1.1.26"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-yr9FJd1+yJdP3vXHbuaaL5UmXGnKxR319LzXs76LBwk="; + sha256 = "sha256-bXptf1ALanzDyhajQtKMs/0M9TWlrjhWQdC1NZiUgd8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 779f6790c558..2f1b66116c7d 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -15,21 +15,21 @@ stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.3.0"; + version = "1.4.8"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-qVyEqiqaQ8wfZhL5u+Bsaa1yXlgHUitSj5bo7FJ5Y8c="; + hash = "sha256-3oNsY91hgor1nZV10mcEZyEdhmHlozF8xXaCR4dvLYg="; } else fetchurl { url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-RBqeGUhB6Sdt+JujyQBW/76mZwnT0LNs9AMYr8+OCVU="; + hash = "sha256-eKjBUianpW4T8OeVwRSEyZFfDE10d3qogkPA4FUJ7rc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-jxSzhj1iU8qY+sZEVCYTaUqpaA4egjJi9qxrapASQF0="; + hash = "sha256-9v8UaBBpQDPZwHVurFJ1FaFMe6wywH3upKDjGcPYnuQ="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 8769cf6913ba..f602299e239d 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -13,26 +13,28 @@ assert sevVariant -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "libkrunfw"; - version = "3.3.0"; + version = "3.8.1"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-ay+E5AgJeA0i3T4JDosDawwtezDGquzAvYEWHGbPidg="; + hash = "sha256-6jFIfTPjI6Eq0SFdQVxqqoBDW00AsDz/xHN+n6DezME="; } else fetchurl { url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-9Wp93PC+PEqUpWHIe6BUnfDMpFvYL8rGGjTU2nWSUVY="; + hash = "sha256-i7btjGBgb93tHshIS02Rp492iB4aG0N4UuRwv6Pkukg="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.59.tar.xz"; - hash = "sha256-5t3GQgVzQNsGs7khwrMb/tLGETWejxRMPlz5w6wzvMs="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.xz"; + hash = "sha256-hksFry2Gm6c9YanFlZ5FMaFBqyvXshdINnH2Jfl0f6o="; }; preBuild = '' substituteInPlace Makefile \ --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' \ + --replace 'tar xf $(KERNEL_TARBALL)' \ + 'tar xf $(KERNEL_TARBALL); sed -i "s|/usr/bin/env bash|$(SHELL)|" $(KERNEL_SOURCES)/scripts/check-local-export' \ --replace 'gcc' '$(CC)' ''; @@ -51,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/libkrunfw"; license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; - platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 8b5753b3aca9..ecb247de0ba4 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,19 +1,36 @@ -{ lib, stdenv, fetchzip, perl, pkg-config, libbson -, openssl, which, zlib, snappy +{ + lib, + stdenv, + fetchzip, + cmake, + pkg-config, + perl, + openssl, + zlib, + cyrus_sasl, + libbson, + snappy, }: - stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.8.0"; + version = "1.23.1"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; }; - nativeBuildInputs = [ pkg-config which perl ]; - buildInputs = [ openssl zlib ]; - propagatedBuildInputs = [ libbson snappy ]; + # https://github.com/NixOS/nixpkgs/issues/25585 + preFixup = ''rm -rf "$(pwd)" ''; + + nativeBuildInputs = [cmake pkg-config perl]; + buildInputs = [openssl zlib cyrus_sasl]; + propagatedBuildInputs = [libbson snappy]; + + # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF + # The `mongodl.py` script is causing issues, and you also need to disabled sandboxing for it. However, it is used only to run some tests. + # https://www.mongodb.com/community/forums/t/problem-downloading-crypt-shared-when-installing-the-mongodb-c-driver/189370 + cmakeFlags = ["-DCMAKE_BUILD_TYPE=Release" "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" "-DMONGOC_TEST_USE_CRYPT_SHARED=OFF"]; enableParallelBuilding = true; @@ -22,6 +39,7 @@ stdenv.mkDerivation rec { homepage = "http://mongoc.org"; license = licenses.asl20; mainProgram = "mongoc-stat"; + maintainers = with maintainers; [archer-65]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index 7fcbd489b4c9..4a288702e2f2 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -11,13 +11,13 @@ gcc11Stdenv.mkDerivation rec { pname = "qcoro"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "sha256-6kRWBzspwsO0Q6/8gQUr69DJjmkPa3lWrKTmSgVn6V4="; + sha256 = "cHd2CwzP4oD/gy9qsDWIMgvlfBQq1p9C4G7JNAs4XW4="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 3b1c9ff22e8f..b610e903ba30 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-9WnXaMpKzqJhdfT7ScOhULbOwJsmuiS0IpYDArWq82s="; + hash = "sha256-n7m94QdQf0s5I9z8ScpCu+r2h7XOKO2F1OX44IjdBn4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md index 28fbfbb707ef..c1e3b64afc8e 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -94,8 +94,9 @@ resholve.mkDerivation rec { ## Basic `resholve.writeScript` and `resholve.writeScriptBin` examples -Both of these functions have the same basic API. This example is a little -trivial for now. If you have a real usage that you find helpful, please PR it. +Both of these functions have the same basic API. The examples are a little +trivial, so I'll also link to some real-world examples: +- [shell.nix from abathur/tdverpy](https://github.com/abathur/tdverpy/blob/e1f956df3ed1c7097a5164e0c85b178772e277f5/shell.nix#L6-L13) ```nix resholvedScript = resholve.writeScript "name" { @@ -183,6 +184,7 @@ handle any potential problems it encounters with directives. There are currently scripts from using the latest current-system symlinks.) - resolve commands in a variable definition - resolve an absolute command path from inputs as if it were a bare reference + - force resholve to resolve known security wrappers 3. `keep` directives tell resholve not to raise an error (i.e., ignore) something it would usually object to. Common examples: - variables used as/within the first word of a command diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix index fa3b9c80e31d..fc23352d5d67 100644 --- a/pkgs/development/misc/resholve/source.nix +++ b/pkgs/development/misc/resholve/source.nix @@ -3,7 +3,7 @@ }: rec { - version = "0.8.1"; + version = "0.8.3"; rSrc = # local build -> `make ci`; `make clean` to restore # return to remote source @@ -14,6 +14,6 @@ rec { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-EVrv4Lj9GQa3g18BRQjC0wCxzsfsn4Ka1iq5Ouu1cII="; + hash = "sha256-HilYaHSMASYXNGoX9/QSP9mpspszksdUrxlkUB1yGHQ="; }; } diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 4c089b76f3ed..cf349eeb8bb1 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,27 +1,25 @@ -{ stdenv, lib, fetchurl, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub, re }: -stdenv.mkDerivation rec { - pname = "ocaml-calendar"; - version = "2.5"; +buildDunePackage rec { + pname = "calendar"; + version = "3.0.0"; + minimalOCamlVersion = "4.03"; - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/915/calendar-${version}.tar.bz2"; - sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-+VQzi6pEMqzV1ZR84Yjdu4jsJEWtx+7bd6PQGX7TiEs="; }; - nativeBuildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ re ]; strictDeps = true; - createFindlibDestdir = true; - meta = { - homepage = "https://forge.ocamlcore.org/projects/calendar/"; - description = "An Objective Caml library managing dates and times"; - license = "LGPL"; - platforms = ocaml.meta.platforms or [ ]; - maintainers = [ - lib.maintainers.gal_bolle - ]; + inherit (src.meta) homepage; + description = "A library for handling dates and times"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index a87ec356dc06..64aca1ab3eed 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.35.0"; + version = "3.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-B0WxkloPTjILXfLl2FgoE9/7OkVdxU05mKAYcoPqCxM="; + hash = "sha256-c5AJsTR6qfBtxlTkjRpVoxDGO6TxJ6BvD9HX+Icf1ig="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6ad9cd017ed9..6253c43d60c6 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-/M0D252/YaJhmyJv51sOoAUCDbcxbIndF8mw9ATtYMQ="; + hash = "sha256-siODqRqji2u+EJag/wTXCZG4LATNxggpMtqMHZAfQ9o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix index d8b8c11cef99..6200c60d4665 100644 --- a/pkgs/development/python-modules/aioeafm/default.nix +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -2,7 +2,8 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, poetry +, fetchpatch +, poetry-core , pytest-aiohttp , pytest-asyncio , pytest-cov @@ -21,7 +22,15 @@ buildPythonPackage rec { sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc"; }; - nativeBuildInputs = [ poetry ]; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/Jc2k/aioeafm/commit/549590e2ed465be40e2406416d89b8a8cd8c6185.patch"; + hash = "sha256-cG/vQI1XQO8LVvWsHrAj8KlPGRulvO7Ny+k0CKUpPqQ="; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 91d4ff4211f8..f592ba98e390 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-6NqxJETKBDUmOOM+RjD3gdvqfsXFqoHhhaL55D+Ajz8="; + hash = "sha256-ttq9V+Bhmbeit3OBUquIlLW7HQeCe2+KE/QkuvLJMjE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index ea47444d47ce..eb8c6706b5d5 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -2,6 +2,7 @@ , angr , buildPythonPackage , fetchFromGitHub +, fetchpatch , progressbar , pythonOlder , pythonRelaxDepsHook @@ -22,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-wIPk7Cz7FSPviPFBSLrBjLr9M0o3pyoJM7wiAhHrg9Q="; }; + patches = [ + (fetchpatch { + name = "compatibility-with-newer-angr.patch"; + url = "https://github.com/angr/angrop/commit/23194ee4ecdcb7a7390ec04eb133786ec3f807b1.patch"; + hash = "sha256-n9/oPUblUHSk81qwU129rnNOjsNViaegp6454CaDo+8="; + }) + ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 864dd570209e..0eca7e2e977f 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -7,30 +7,29 @@ , gntp , installShellFiles , markdown -, mock , paho-mqtt +, pytest-mock +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml , requests , requests-oauthlib -, slixmpp }: buildPythonPackage rec { pname = "apprise"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-92eoBwp3fcKb9zCBeeC2ndLeZeZpM+2JsZmef/5yO2A="; + hash = "sha256-bjGvoY9HRS6szVb7fug9kkUsU00V85JAftGg48RlJEs="; }; nativeBuildInputs = [ - babel installShellFiles ]; @@ -44,11 +43,12 @@ buildPythonPackage rec { ]; checkInputs = [ + babel gntp - mock paho-mqtt + pytest-mock + pytest-xdist pytestCheckHook - slixmpp ]; disabledTests = [ diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index b93a3187afe5..f8fdf1612174 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.39.4.0"; + version = "3.40.0.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-vFPvevtAAEHG34G2ZPbETo/Erjem4G9r7xvkEoPBlLQ="; + hash = "sha256-Bi2pW+8vFLcYnatlqsfnwqfCpV2cjannYaTqgIlfNNM="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 47dc3c22a799..7081f426c66f 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-aiOJxdQnpNa4zCHRysyw9JsW9GQTHha8lup8VErgiDA="; + hash = "sha256-dzD73jmbeQQY/IjF6XRdOcDIhR2lzeA2XQdipssiT00="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 2a7e6cb0df95..2663f0c9d54e 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,41 +1,82 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytest-cov, pytest-xdist, responses -, asciimatics, loguru, requests, setuptools, websocket-client +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pdm-pep517 +, appdirs +, loguru +, requests +, setuptools +, toml +, websocket-client +, asciimatics +, pyperclip +, aria2 +, fastapi +, pytest-xdist +, pytestCheckHook +, responses +, uvicorn }: buildPythonPackage rec { pname = "aria2p"; - version = "0.9.1"; + version = "0.11.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pawamoy"; repo = pname; - rev = "v${version}"; - sha256 = "1s4kad6jnfz9p64gkqclkfq2x2bn8dbc0hyr86d1545bgn7pz672"; + rev = version; + hash = "sha256-z74ej6J6Yh1aVsXR5fE+XhoCzCS+zfDxQL8gKFd7tBA="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + pdm-pep517 + ]; - preBuild = '' + propagatedBuildInputs = [ + appdirs + loguru + requests + setuptools # for pkg_resources + toml + websocket-client + ]; + + passthru.optional-dependencies = { + tui = [ asciimatics pyperclip ]; + }; + + preCheck = '' export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytest-cov pytest-xdist ]; + checkInputs = [ + aria2 + fastapi + pytest-xdist + pytestCheckHook + responses + uvicorn + ] ++ passthru.optional-dependencies.tui; - # Tests are not all stable/deterministic, - # they rely on actually running an aria2c daemon and communicating with it, - # race conditions and deadlocks were observed, - # thus the corresponding tests are disabled - checkPhase = '' - pytest -nauto -k "not test_api and not test_cli and not test_interface" - ''; + disabledTests = [ + # require a running display server + "test_add_downloads_torrents_and_metalinks" + "test_add_downloads_uris" + # require a running aria2 server + "test_get_files_method" + "test_pause_subcommand" + "test_resume_method" + ]; - propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket-client ]; + pythonImportsCheck = [ "aria2p" ]; meta = with lib; { homepage = "https://github.com/pawamoy/aria2p"; + changelog = "https://github.com/pawamoy/aria2p/blob/${src.rev}/CHANGELOG.md"; description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC"; license = licenses.isc; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b7c2cf8994d4..57aa49c23ce2 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.23.0"; + version = "1.23.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-3jzUowSeO6j7DzIlOkeU3KUFFIUi7cEyvjbIL8uRGcU="; + hash = "sha256-t/fdj0p3Z0J0C1v+TWx5jWNOjdAK2f0sPPkNM3SthXk="; }; propagatedBuildInputs = [ @@ -63,6 +63,7 @@ buildPythonPackage rec { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Tool to compile, build and package AWS Lambda functions"; homepage = "https://github.com/awslabs/aws-lambda-builders"; + changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/v${version}"; longDescription = '' Lambda Builders is a Python library to compile, build and package AWS Lambda functions for several runtimes & frameworks. diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 7c3296cbd720..9afd28132e15 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-niJaHsvIX7NFA+pWufTA6j+Jvj6LcGlC+RaLNFn7yBo="; + hash = "sha256-7tn/OdPNUnbF2T0wASCBfuTZ0zI1j8GY5kh0QwbzS+8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 038062982f85..88d472a9de7a 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.26"; + version = "9.2.27"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-o6JGxEiG4HD4leAf1+NOEDQ5gkmRaDXl2SZtcVtH6f0="; + hash = "sha256-PP8TdAiyqdcgJNz5jYjAFcuv42ca0zfLwL289XKDqk4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index e81ff175d533..f834ef198ca8 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -3,21 +3,21 @@ , fetchFromGitHub , crashtest , poetry-core -, pylev , pytest-mock , pytestCheckHook +, rapidfuzz }: buildPythonPackage rec { pname = "cleo"; - version = "1.0.0a5"; + version = "2.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FtGGIRF/tA2OWEjkCFwa1HHg6VY+5E5mAiJC/zjUC1g="; + hash = "sha256-y9PYlGSPLpZl9Ad2AFuDKIopH0LRETLp35aiZtLcXzM="; }; postPatch = '' @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ crashtest - pylev + rapidfuzz ]; pythonImportsCheck = [ @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python-poetry/cleo"; + changelog = "https://github.com/python-poetry/cleo/blob/${src.rev}/CHANGELOG.md"; description = "Allows you to create beautiful and testable command-line interfaces"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix index da01d77cd072..d8bd8c95b8d6 100644 --- a/pkgs/development/python-modules/crashtest/default.nix +++ b/pkgs/development/python-modules/crashtest/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "crashtest"; - version = "0.4.0"; + version = "0.4.1"; disabled = !(pythonAtLeast "3.6"); src = fetchPypi { inherit pname version; - sha256 = "sha256-1imwDx1OecMWkJ9Ot2O7yym1ENZfveE2Whzrk6t/pMg="; + sha256 = "sha256-gNex8xbr+9Qp9kgHbWJ1yHe6MLpIl53kGRcUp1Jm8M4="; }; # has tests, but only on GitHub, however the pyproject build fails for me diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 342b07387248..840fbda9231b 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,15 +11,16 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.4.1"; + version = "3.4.2"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-cqPLnahs3fT6AfQQkS5azh4/cHzaexytg78RsJG5c6U="; + hash = "sha256-OujBpq3SBDKw9Jgb9MD200Rp0fD0OJRw90flxS22I2s="; }; nativeBuildInputs = [ @@ -36,11 +37,15 @@ buildPythonPackage rec { # no tests available, do the imports check instead doCheck = false; - pythonImportsCheck = [ "desktop_notifier" ]; + + pythonImportsCheck = [ + "desktop_notifier" + ]; meta = with lib; { + description = "Python library for cross-platform desktop notifications"; homepage = "https://github.com/samschott/desktop-notifier"; - description = "A Python library for cross-platform desktop notifications"; + changelog = "https://github.com/samschott/desktop-notifier/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index afe9b98d0745..db38ac4c2978 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.6.4"; + version = "0.6.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "duckdb_engine"; owner = "Mause"; - rev = "v${version}"; - hash = "sha256-7PfrI4bNz0XtBa/cb8T43j06BJ3B2S5zIyBZsEusyXc="; + rev = "refs/tags/v${version}"; + hash = "sha256-DLm/8bye8p2fhs36CW5PQAxm3uhJq1L+DT1Zn2uJhqE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/expecttest/default.nix b/pkgs/development/python-modules/expecttest/default.nix index db64b386f241..6892a7bcb63a 100644 --- a/pkgs/development/python-modules/expecttest/default.nix +++ b/pkgs/development/python-modules/expecttest/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , hypothesis , lib -, poetry +, poetry-core , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-5CnpVFSbf3FcAa06Y7atG8sxu8uevpfrliB2HuVcrx0="; }; - buildInputs = [ poetry ]; + buildInputs = [ poetry-core ]; checkInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 317f3d406759..cc45b86ab626 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-y9fuVg5Mu0ZT8hoja9V5mEfOz/hPH66Zbk5Rr/luPSc="; + hash = "sha256-d+colAAESTt2YME8URX3e/l6GsC1l0vzg3wY/NQPkDk="; }; nativeBuildInputs = [ @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fake implementation of Redis API"; homepage = "https://github.com/dsoftwareinc/fakeredis-py"; + changelog = "https://github.com/cunla/fakeredis-py/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 81f032a095d9..7fbc6ad0bb51 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.2.5"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wbB4AD+PwsCGSvBGUeK+EhPltzjqgykeX/VlJSm8Xlg="; + hash = "sha256-qr2RiIFl1njOOhoblub93foMQ63xpgp9Wj5p0SoLoHw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 03a43a92eecf..f8fb0996e29f 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.2.4"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = "refs/tags/${version}"; - hash = "sha256-HZsgha7CAjJYDDBlh2Ib24glUiMAXpNR8KsSdm78BA8="; + hash = "sha256-xriI4VFLTTeYkfIu7kb/k1OcgnHhCdvl5Ic/JF4Pf6s="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to retrieve information from Growatt units"; homepage = "https://github.com/indykoning/PyPi_GrowattServer"; + changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix index c7d4178e3bf9..3a1a34f8340b 100644 --- a/pkgs/development/python-modules/hachoir/default.nix +++ b/pkgs/development/python-modules/hachoir/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hachoir"; - version = "3.1.3"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vstinner"; repo = pname; - rev = version; - hash = "sha256-HlxDwkU0GccO+IUzbtVpLbsAo+Mcacm4/WrXWCsmpBg="; + rev = "refs/tags/${version}"; + hash = "sha256-BRrb6bnPSDVjZF1cOA9NlUYd2HrtqZEAVhHgkjmE0Xg="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to view and edit a binary stream"; homepage = "https://hachoir.readthedocs.io/"; + changelog = "https://github.com/vstinner/hachoir/blob/${version}/doc/changelog.rst"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index 854f104be758..49638e825823 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , hypothesis -, poetry +, poetry-core , pydantic , pytest , pythonOlder @@ -20,6 +21,14 @@ buildPythonPackage rec { hash = "sha256-XiwvsJ3AmEJRLYBjC7eSNZodM9LARzrUfuI9oL6eMrE="; }; + patches = [ + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/timothycrosley/hypothesis-auto/commit/8277b4232617c0433f80e9c2844452b9fae67a65.patch"; + hash = "sha256-/0z0nphtQnUBiLYhhzLZT59kQgktSugaBg+ePNxy0qI="; + }) + ]; + postPatch = '' # https://github.com/timothycrosley/hypothesis-auto/pull/20 substituteInPlace pyproject.toml \ @@ -28,7 +37,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index af61a5d5f236..b6d0019407ca 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -2,7 +2,8 @@ , buildPythonPackage , fetchPypi , fetchFromGitHub -, poetry +, poetry-core +, pythonRelaxDepsHook , docstring-to-markdown , jedi , pygls @@ -13,18 +14,23 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.37.0"; + version = "0.39.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pappasam"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-5il12WDmUkdud9zTpzTaoSXEqOaK15Ut3/fUAX422fA="; + sha256 = "sha256-nra2Xvfo1cfMoZkY7sem7NIEDwDmODWbGVNCeefSuQY="; }; + pythonRelaxDeps = [ + "pygls" + ]; + nativeBuildInputs = [ - poetry + poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -49,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/pappasam/jedi-language-server"; + changelog = "https://github.com/pappasam/jedi-language-server/blob/${src.rev}/CHANGELOG.md"; description = "A Language Server for the latest version(s) of Jedi"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 48487af1bc47..6a5668260549 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ManimCommunity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ftoESXUMc+jnKmEzhmwZc/R7vVX9idsezPFHRUzPbaU="; + hash = "sha256-FT3X6TmGfwd8kRPtuqy78ZCGeEGGg6IJEeEpB7ZbIsA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index dc545b48874a..3857ea2971d0 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-WPmoK/5pTVv9ueRnR6Gxtj86LM8ChB0dMfEvo+lLmy0="; + hash = "sha256-wzDi4C/XUykoTxgoDneQzWplTlo0bGUODM38Eza4fUY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index f0606f769194..1fd7e47ade23 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,22 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, isPyPy, pytest -, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython, cftime +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, python +, setuptools +, numpy +, zlib +, netcdf +, hdf5 +, curl +, libjpeg +, cython +, cftime }: + buildPythonPackage rec { pname = "netCDF4"; - version = "1.6.1"; + version = "1.6.2"; + format = "pyproject"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-uo3F1lKTqZ8a+4wqz1iNkD/f3BljpiVFtnf6JzQmKng="; + sha256 = "sha256-A4KwL/aiiEGfb/7IXexA9FH0G4dVVHFUxXXd2fD0rlM="; }; - checkInputs = [ pytest ]; - - buildInputs = [ - cython - ]; + nativeBuildInputs = [ setuptools cython ]; propagatedBuildInputs = [ cftime @@ -29,22 +39,24 @@ buildPythonPackage rec { ]; checkPhase = '' - py.test test/tst_*.py + pushd test/ + NO_NET=1 NO_CDL=1 ${python.interpreter} run_all.py ''; - # Tests need fixing. - doCheck = false; - # Variables used to configure the build process - USE_NCCONFIG="0"; + USE_NCCONFIG = "0"; HDF5_DIR = lib.getDev hdf5; - NETCDF4_DIR=netcdf; - CURL_DIR=curl.dev; - JPEG_DIR=libjpeg.dev; + NETCDF4_DIR = netcdf; + CURL_DIR = curl.dev; + JPEG_DIR = libjpeg.dev; + + pythonImportsCheckHook = [ "netcdf4" ]; meta = with lib; { description = "Interface to netCDF library (versions 3 and 4)"; - homepage = "https://pypi.python.org/pypi/netCDF4"; - license = licenses.free; # Mix of license (all MIT* like) + homepage = "https://github.com/Unidata/netcdf4-python"; + changelog = "https://github.com/Unidata/netcdf4-python/raw/v${version}/Changelog"; + maintainers = with maintainers; [ ]; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/opytimark/default.nix b/pkgs/development/python-modules/opytimark/default.nix new file mode 100644 index 000000000000..059c5555b997 --- /dev/null +++ b/pkgs/development/python-modules/opytimark/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, numpy +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "opytimizer"; + version = "1.0.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gugarosa"; + repo = "opytimark"; + rev = "v${version}"; + hash = "sha256-T3OFm10gvGrUXAAHOnO0Zv1nWrXPBXSmEWnbJxrWYU0="; + }; + + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/gugarosa/opytimark/pull/2.patch"; + hash = "sha256-r/oCKI9Q1nuCZDGHx7UW8j523sFe4EFmguMOJTs/LOU="; + }) + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # several tests are failing + disabledTests = [ + "test_year" + "test_decorator" + "test_loader" + "cec_benchmark" + ]; + + pythonImportsCheck = [ + "opytimark" + ]; + + meta = with lib; { + description = "Library consisting of optimization benchmarking functions"; + homepage = "https://github.com/gugarosa/opytimark"; + changelog = "https://github.com/gugarosa/opytimark/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 7cbbb859e0ae..0e5de80d8b15 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder -, poetry +, poetry-core +, tomlkit , typer , setuptools }: @@ -21,17 +23,26 @@ buildPythonPackage rec { hash = "sha256-aP8bzWFUzAZrEsz8pYL2y5c7GaUjWG5GA+cc4/tGPZk="; }; - nativeBuildInputs = [ - setuptools + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/yhino/pipenv-poetry-migrate/commit/726ebd823bf6ef982992085bd04e41d178775b98.patch"; + hash = "sha256-TBVH1MZA0O1/2zLpVgNckLaP4JO3wIJJi0Nst726erk="; + }) + ]; + + nativeBuildInputs = [ + poetry-core ]; propagatedBuildInputs = [ - poetry + setuptools # for pkg_resources + tomlkit typer ]; postPatch = '' - substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' + substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' ''; checkInputs = [ diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index 59f4b4b707f2..9506e4fca4fc 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -1,21 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k }: buildPythonPackage rec { pname = "posix_ipc"; - version = "1.0.5"; + version = "1.1.0"; + format = "setuptools"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97"; + sha256 = "sha256-+GoVsys4Vzx44wXr2RANgZij2frMA/+v457cNYM3OOM="; }; + pythonImportsCheckHook = [ "posix_ipc" ]; + meta = with lib; { description = "POSIX IPC primitives (semaphores, shared memory and message queues)"; + homepage = "https://github.com/osvenskan/posix_ipc"; license = licenses.bsd3; - homepage = "http://semanchuk.com/philip/posix_ipc/"; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index 51497e8875b7..da1b2223f2fc 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -3,8 +3,9 @@ , aioresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-aiohttp -, poetry +, poetry-core , pytest-asyncio , pytest-cov , pytestCheckHook @@ -22,7 +23,15 @@ buildPythonPackage rec { sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c"; }; - nativeBuildInputs = [ poetry ]; + patches = [ + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/asymworks/pyairnow/commit/f7a01733a41c648563fc2fe4b559f61ef08b9153.patch"; + hash = "sha256-lcHnFP3bwkPTi9Zq1dZtShLKyXcxO0XoDF+PgjbWOqs="; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index ce69c36d7461..5f837330754a 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygls"; - version = "0.12.3"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,16 +21,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openlawlibrary"; repo = "pygls"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-RtoRIfPIbERQFx0GzQqsxnKAMsIK5Zbf2sNtHhC2fmo="; + rev = "v${version}"; + hash = "sha256-guwOnB4EEUpucfprNLLr49Yn8EdOpRzzG+cT4NCn0rA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + toml + ]; propagatedBuildInputs = [ pydantic - toml typeguard ]; @@ -46,6 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygls" ]; meta = with lib; { + changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md"; description = "Pythonic generic implementation of the Language Server Protocol"; homepage = "https://github.com/openlawlibrary/pygls"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-golden/default.nix b/pkgs/development/python-modules/pytest-golden/default.nix index d6fd3fe5d2d0..9d1ba62df41d 100644 --- a/pkgs/development/python-modules/pytest-golden/default.nix +++ b/pkgs/development/python-modules/pytest-golden/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub #, hatchling , ruamel-yaml -, poetry +, poetry-core , pytest , pytest-asyncio , pytestCheckHook @@ -27,13 +27,19 @@ buildPythonPackage rec { hash = "sha256-l5fXWDK6gWJc3dkYFTokI9tWvawMRnF0td/lSwqkYXE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" poetry-core \ + --replace poetry.masonry.api poetry.core.masonry.api + ''; + pythonRelaxDeps = [ "testfixtures" ]; nativeBuildInputs = [ # hatchling used for > 0.2.2 - poetry + poetry-core pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 0224ffeb43a0..88670ec9f7a5 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-stxFT4oM4qLHXFJ2+kTNVgcjQ77239Gg0rp6T76wVBU="; + hash = "sha256-r46rTS9MOMUUWRwGF3pohV+1bPL03VmoILEjEKfr04o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index b42523dc8bf5..4e8236365ef3 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchzip , cmake +, comic-neue , boost , catch2 , inchi @@ -15,32 +15,32 @@ , numpy , pandas , pillow -, git }: let external = { - avalon = fetchzip { - url = "http://sourceforge.net/projects/avalontoolkit/files/AvalonToolkit_1.2/AvalonToolkit_1.2.0.source.tar"; - sha256 = "0nhxfxckb5a5qs0g148f55yarhncqjgjzcvdskkv9rxi2nrs7160"; - stripRoot = false; + avalon = fetchFromGitHub { + owner = "rohdebe1"; + repo = "ava-formake"; + rev = "AvalonToolkit_2.0.2"; + hash = "sha256-YI39OknHiSyArNGqRKrSVzEJnFc1xJ0W3UcTZrTKeME="; }; yaehmop = fetchFromGitHub { owner = "greglandrum"; repo = "yaehmop"; - rev = "cfb5aeebbdf5ae93c4f4eeb14c7a507dea54ae9e"; - sha256 = "sha256-QMnc5RyHlY3giw9QmrkGntiA+Srs7OhCIKs9GGo5DfQ="; + rev = "v2022.09.1"; + hash = "sha256-QMnc5RyHlY3giw9QmrkGntiA+Srs7OhCIKs9GGo5DfQ="; }; freesasa = fetchFromGitHub { owner = "mittinatten"; repo = "freesasa"; - rev = "2.1.1"; - sha256 = "sha256-fUJvLDTVhpBWl9MavZwp0kAO5Df1QuHEKqe20CXNfcg="; + rev = "2.0.3"; + hash = "sha256-7E+imvfDAJFnXQRWb5hNaSu+Xrf9NXeIKc9fl+o3yHQ="; }; }; in buildPythonPackage rec { pname = "rdkit"; - version = "2022.03.5"; + version = "2022.09.1"; format = "other"; src = @@ -51,35 +51,35 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - sha256 = "19idgilabh04cbr1qj6zgrgsfjm248mmfz6fsr0smrd68d0xnml9"; + hash = "sha256-AaawjCv3/ShByOKU0c37/hjuyfD7NhFC8UngDoG7C0s="; }; unpackPhase = '' - mkdir -p source/External/AvalonTools/avalon source/External/YAeHMOP/yaehmop source/External/FreeSASA/freesasa - cp -r ${src}/* source - cp -r ${external.avalon}/SourceDistribution/* source/External/AvalonTools/avalon - cp -r ${external.yaehmop}/* source/External/YAeHMOP/yaehmop - cp -r ${external.freesasa}/* source/External/FreeSASA/freesasa + cp -r $src/* . + find . -type d -exec chmod +w {} + - find source -type d -exec chmod 755 {} + - cp source/External/FreeSASA/freesasa2.c source/External/FreeSASA/freesasa/src - ln -s ${rapidjson} source/External/rapidjson-1.1.0 + mkdir External/AvalonTools/avalon + ln -s ${external.avalon}/* External/AvalonTools/avalon + + mkdir External/YAeHMOP/yaehmop + ln -s ${external.yaehmop}/* External/YAeHMOP/yaehmop + + mkdir -p External/FreeSASA/freesasa + cp -r ${external.freesasa}/* External/FreeSASA/freesasa + chmod +w External/FreeSASA/freesasa/src + cp External/FreeSASA/freesasa2.c External/FreeSASA/freesasa/src + + ln -s ${rapidjson} External/rapidjson-1.1.0 + ln -s ${comic-neue}/share/fonts/truetype/ComicNeue-Regular.ttf Data/Fonts/ ''; - sourceRoot = "source"; - nativeBuildInputs = [ cmake - git # required by freesasa ]; buildInputs = [ boost - catch2 - inchi - eigen cairo - rapidjson ]; propagatedBuildInputs = [ @@ -95,10 +95,6 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; preConfigure = '' - # Don't want this contacting the git remote during the build - substituteInPlace External/YAeHMOP/CMakeLists.txt --replace \ - 'GIT_TAG master' 'DOWNLOAD_COMMAND true' - # Since we can't expand with bash in cmakeFlags cmakeFlags="$cmakeFlags -DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')" cmakeFlags="$cmakeFlags -DFREESASA_DIR=$PWD/External/FreeSASA/freesasa" @@ -114,7 +110,6 @@ buildPythonPackage rec { "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" "-DRDK_INSTALL_INTREE=OFF" "-DRDK_INSTALL_STATIC_LIBS=OFF" - "-DRDK_INSTALL_COMIC_FONTS=OFF" "-DRDK_BUILD_INCHI_SUPPORT=ON" "-DRDK_BUILD_AVALON_SUPPORT=ON" "-DRDK_BUILD_FREESASA_SUPPORT=ON" @@ -145,9 +140,9 @@ buildPythonPackage rec { ''; pythonImportsCheck = [ - "rdkit" - "rdkit.Chem" - "rdkit.Chem.AllChem" + "rdkit" + "rdkit.Chem" + "rdkit.Chem.AllChem" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 5e2451affb90..36e76f6bc6c7 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -2,26 +2,36 @@ , buildPythonPackage , fetchPypi , six +, pythonOlder }: buildPythonPackage rec { pname = "retrying"; - version = "1.3.3"; + version = "1.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0fwp86xv0rvkncjdvy2mwcvbglw4w9k0fva25i7zx8kd19b3kh08"; + hash = "sha256-NF2oxXZb2YKx0ZFd65EC/T0fetFr2EqXALhfZNJOjz4="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; # doesn't ship tests in tarball doCheck = false; - meta = with lib; { - homepage = "https://github.com/rholder/retrying"; - description = "General-purpose retrying library"; - license = licenses.asl20; - }; + pythonImportsCheck = [ + "retrying" + ]; + meta = with lib; { + description = "General-purpose retrying library"; + homepage = "https://github.com/rholder/retrying"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix new file mode 100644 index 000000000000..44f1c91fc435 --- /dev/null +++ b/pkgs/development/python-modules/signalslot/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, contexter +, eventlet +, mock +, pytestCheckHook +, six +, weakrefmethod +}: + +buildPythonPackage rec { + pname = "signalslot"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Z26RPNau+4719e82jMhb2LyIR6EvsANI8r3+eKuw494="; + }; + + propagatedBuildInputs = [ + contexter + six + weakrefmethod + ]; + + checkInputs = [ + eventlet + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "signalslot" ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--pep8 --cov" "" \ + --replace "--cov-report html" "" + ''; + + meta = with lib; { + description = "Simple Signal/Slot implementation"; + homepage = "https://github.com/numergy/signalslot"; + license = licenses.mit; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 3c84d30ab371..ca4b1b81725d 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, poetry, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, poetry-core, pythonOlder , click, backports-cached-property, graphql-core, pygments, python-dateutil, python-multipart, typing-extensions , aiohttp, asgiref, chalice, django, fastapi, flask, pydantic, sanic, starlette, uvicorn }: @@ -17,8 +17,16 @@ buildPythonPackage rec { sha256 = "sha256-8ERmG10qNiYg9Zr8oUZk/Uz68sCE+oWrqmJ5kUMqbRo="; }; + patches = [ + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; + hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; + }) + ]; + nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weakrefmethod/default.nix b/pkgs/development/python-modules/weakrefmethod/default.nix new file mode 100644 index 000000000000..66c0aef2eb9f --- /dev/null +++ b/pkgs/development/python-modules/weakrefmethod/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, unittest2 }: + +buildPythonPackage rec { + pname = "weakrefmethod"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-N7wfu1V1rPghctTre2/EQS131aHXDf8sH4pFdDAc2mY="; + }; + + checkInputs = [ + unittest2 + ]; + + pythonImportsCheck = [ "weakrefmethod" ]; + + meta = with lib; { + description = "A WeakMethod class for storing bound methods using weak references"; + homepage = "https://github.com/twang817/weakrefmethod"; + license = licenses.psfl; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index 47a25c25d1f4..e60fc87a1c50 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchPypi , paramiko @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "webssh"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yqjwahh2METXD83geTGt5sUL+vmxbrYxj4KtwTxbD94="; + hash = "sha256-g3RRQUWbjHRaZRVekmETcrHYeVIIpeteCCh7o28jBLY="; }; propagatedBuildInputs = [ @@ -36,10 +36,11 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Web based SSH client"; homepage = "https://github.com/huashengdun/webssh/"; + changelog = "https://github.com/huashengdun/webssh/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/ruby-modules/bundler-update-script/default.nix b/pkgs/development/ruby-modules/bundler-update-script/default.nix index 50d0364aa067..cf4942f6e58c 100644 --- a/pkgs/development/ruby-modules/bundler-update-script/default.nix +++ b/pkgs/development/ruby-modules/bundler-update-script/default.nix @@ -1,11 +1,11 @@ -{ runtimeShell, lib, writeScript, bundix, bundler, bundler-audit, coreutils, git, nix }: +{ runtimeShell, lib, writeScript, bundix, bundler, bundler-audit, coreutils, git, nix_2_3 }: attrPath: let updateScript = writeScript "bundler-update-script" '' #!${runtimeShell} - PATH=${lib.makeBinPath [ bundler bundler-audit bundix coreutils git nix ]} + PATH=${lib.makeBinPath [ bundler bundler-audit bundix coreutils git nix_2_3 ]} set -o errexit set -o nounset set -o pipefail diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index e6d107b39356..81096c44ac44 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-tBhsH5ZlEsrboOCSJLcwY9kYv0aK9IrLCU+ZjY0y648="; + hash = "sha256-VWFYgRIpEmOpOonazoRF0wPUfAiOu90gxm22M6Wkvgo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 92ea26b83375..307efdd9458a 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -41,7 +41,8 @@ stdenv.mkDerivation { runHook preInstall install -Dm755 scala-cli $out/bin/.scala-cli-wrapped makeWrapper $out/bin/.scala-cli-wrapped $out/bin/scala-cli \ - --set JAVA_HOME ${jre.home} + --set JAVA_HOME ${jre.home} \ + --argv0 "$out/bin/scala-cli" runHook postInstall ''; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index e3df6799330d..6fb1463abcfe 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,17 +1,17 @@ { - "version": "0.1.16", + "version": "0.1.17", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1ryjsf126dsqkpnkc2dmr3p373sb518q2ply0y1ifrx3rhqj0viq" + "sha256": "0p3z4wvindcb9wahq2q8ca24zgl05qb3z2asmqi2z54pqfkc21d7" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1vfx9ccl08mykr579nq9kwbv88d6gaq1vd9xscwyq5rps6lxrz92" + "sha256": "17zj3g62b27blbdfa3j4lzvs3v13jyy7428zxalkpdx8ixy0ghyy" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1p2lk2hkj149r27p4kwxvwlvjvzv9l0zncqfs3wa972jyn4hhr9g" + "sha256": "0dm7jhsvrjb73wyvvds17r779gcm00yvsy31arc8552df5nkq4iz" } } } diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/development/tools/bunyan-rs/default.nix index 77191efbe4fa..28f53a148e22 100644 --- a/pkgs/development/tools/bunyan-rs/default.nix +++ b/pkgs/development/tools/bunyan-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "bunyan-rs"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "LukeMathWalker"; repo = "bunyan"; rev = "v${version}"; - sha256 = "sha256-NGM8ryOy5bxF53Ak2/UDCf47MBlx/t6wcPlt+K8qvkg="; + sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA="; }; - cargoSha256 = "sha256-kzzOEHil7mW+fsstgr4/N4i8c9rzx4TzqGfYDgkzjh0="; + cargoSha256 = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac="; meta = with lib; { description = "A CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)"; diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index f5f016f0d2de..5e3801628e7c 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-h2sLwhlz8AHyBK6Bbci17dvLkQ/9WEClz4lwM3GVVK8="; + hash = "sha256-9IdQWNbk28OdpxVU1t4d1sGvjc62GeWUueYGDKRfOy4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index aed802868a41..49ffef19f779 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-swag"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-HQ3VsYnPZGGZkeu8sc1sfKfRdOUWmdb98OQaIB62Yk4="; + sha256 = "sha256-xERuD15NEmBqosNAUmWEGqWVXc9jLA9HrbZrqmzhLFA="; }; vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index 4713211454be..088b91e212ab 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "v${version}"; - sha256 = "sha256-Mr3sqPrP9fIuQrE+XtDe5lu8dGwYNtKElfxFvLIllb4="; + sha256 = "sha256-N99e3paDwsl8lerijmq2srEdKaf3oJ1FJx6RUDQbXZg="; }; - cargoSha256 = "sha256-mF7bUcy5np/odQvhz0PEsWWgWRL2k8X0VaO9y1pDtzE="; + cargoSha256 = "sha256-AkAOYq8VTtKMSqH4WDq48jepc58blkCQPB4EeppuUkk="; buildFeatures = [ "cli" ]; diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index bbf01b293c00..3dc581a06a36 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.10.0"; + version = "2.13.1"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "kyYmPU/y7pR2kx5ymDMuJvinTo5hpKs0Jy3LZPjDJyw="; + sha256 = "ErlIjReX6ui3rLeEpZ87HjagRp+RswpOcEk17FFd0Rk="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "swaZmlEoKSmH95pqAYW3ygOzQKkedWhc7FOMy3RnJFs="; + sha256 = "S/bV7AAsZhGrOZEeAY9E78nYcIykNMNzWobulUE06XE="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "QjrLn+gxoJovMlLsIe24BNKVaFK3vgFk9BwRHSl/y3M="; + sha256 = "SDIaZ4k5y85cJKrQOEPehj/vhActl49UHNXSqpspaog="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "pBzSswicNK8z/asmGhj+IhBSS0mPJSf91XBX75AGAtY="; + sha256 = "GAc3ikI8FVT9xFhrTWeX/pJVo147B0luPsS0QDYPv54="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "ekeA/+N59mgDtkchEP1p4jz74goaPySmvZ6urCLcUNw="; + sha256 = "hy7u0lYI0qBdIDENFWea5aBeZWwwDITAl7WTlXjQuyM="; }; }; diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index 168c40911e68..892884e9339c 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonApplication , fetchFromGitHub -, poetry +, poetry-core +, pythonRelaxDepsHook , cmake-format , pygls , cmake @@ -26,8 +27,13 @@ buildPythonApplication rec { ./disable-test-timeouts.patch ]; + pythonRelaxDeps = [ + "pygls" + ]; + nativeBuildInputs = [ - poetry + poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index ae314347ff4f..2d19f0fca3c3 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.11.11"; + version = "2022.11.25"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5p9kR36DWV87iR4eWLGxNV1MWTQy5jsHjcG+m9k8UGY="; + sha256 = "sha256-ElnWxwU7EIbZqqvIGp/rc5vS0X6BuyAgSJoy7BQYYu4="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/rakkess/default.nix b/pkgs/development/tools/rakkess/default.nix index 1f85917bff5b..a340a042cc2b 100644 --- a/pkgs/development/tools/rakkess/default.nix +++ b/pkgs/development/tools/rakkess/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "rakkess"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "corneliusweig"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qDcSIpIS09OU2tYoBGq7BCXFkf9QWj07RvNKMjghrFU="; + sha256 = "sha256-igovWWk8GfNmOS/NbZWfv9kox6QLNIbM09jdvA/lL3A="; }; - vendorSha256 = "sha256-1/8it/djhDjbWqe36VefnRu9XuwAa/qKpZT6d2LGpJ0="; + vendorSha256 = "sha256-lVxJ4wFBhHc8JVpkmqphLYPE9Z8Cr6o+aAHvC1naqyE="; ldflags = [ "-s" "-w" "-X github.com/corneliusweig/rakkess/internal/version.version=v${version}" ]; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix similarity index 95% rename from pkgs/applications/graphics/renderdoc/default.nix rename to pkgs/development/tools/renderdoc/default.nix index 3068ecd4c5cf..938f596beae4 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/development/tools/renderdoc/default.nix @@ -43,8 +43,9 @@ mkDerivation rec { buildInputs = [ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3 - ] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2]) - # TODO: figure out how to make cmake recognise pyside2 + ] ++ (with python3Packages; [ + pyside2 pyside2-tools shiboken2 + ]) ++ lib.optional waylandSupport wayland; nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 258d1d39459c..f0e7e4577e07 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9MmIu7oNdLLOl4zsx/A1v0dEc54bN+J6T2GcLFOvMpQ="; + sha256 = "sha256-koEKWtcpkxK2h562ZIjM0PvvLit7TMo03Ikg2SLMEWM="; }; - cargoSha256 = "sha256-3UNjJRpNrDdrU63R7z+6TJR7lq8waPceDscx2yo+QeE="; + cargoSha256 = "sha256-CAaSnnCL+F1av6UYj4QKMEEXSFIAKroBQxew4SO1oU8="; nativeBuildInputs = [ makeWrapper ]; @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A tool to compile Cargo projects with zig as the linker"; homepage = "https://github.com/messense/cargo-zigbuild"; + changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/development/tools/steamos-devkit/default.nix new file mode 100644 index 000000000000..8451f7f9898e --- /dev/null +++ b/pkgs/development/tools/steamos-devkit/default.nix @@ -0,0 +1,135 @@ +{ lib +, fetchFromGitHub +, fetchFromGitLab +, writeScript +, python3 +, copyDesktopItems +, makeDesktopItem +, pkg-config +, SDL2 +}: +let + # steamos-devkit requires a build of the unreleased pyimgui 2.0 branch, move to pythonPackages when 2.0 is released. + pyimgui = python3.pkgs.buildPythonPackage { + pname = "pyimgui"; + version = "unstable-2022-03-06"; + + src = fetchFromGitHub { + owner = "pyimgui"; + repo = "pyimgui"; + rev = "1f095af5886f424ee12f26fa93b108b6420fafa4"; # dev/version-2.0 branch + fetchSubmodules = true; + sha256 = "sha256-k070ue132m8H1Zm8bo7J7spCS5dSTGOj689ci7vJ+aw="; + }; + + nativeBuildInputs = with python3.pkgs; [ + cython + pkg-config + SDL2 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + pyopengl + pysdl2 + ]; + + # Requires OpenGL acceleration + doCheck = false; + pythonImportsCheck = [ "imgui" ]; + }; + steamos-devkit-script = '' + #!${python3.interpreter} + import os + + # Change the cwd to avoid imgui using cwd which often is ~ to store the state, use the same location as the settings + path = os.path.expanduser(os.path.join("~", ".devkit-client-gui")) + os.makedirs(path, exist_ok=True) + os.chdir(path) + + # Workaround to get pysdl to work on wayland, remove when https://gitlab.steamos.cloud/devkit/steamos-devkit/-/issues/1 is solved. + if os.environ.get("XDG_SESSION_TYPE") == "wayland": + os.environ["SDL_VIDEODRIVER"] = "wayland" + + import devkit_client.gui2 + devkit_client.gui2.main() + ''; +in +python3.pkgs.buildPythonPackage rec { + pname = "steamos-devkit"; + version = "0.20221101"; + + src = fetchFromGitLab { + domain = "gitlab.steamos.cloud"; + owner = "devkit"; + repo = "steamos-devkit"; + rev = "v${version}"; + sha256 = "sha256-VKnfcMF3WxkvqxlhJF+5j4Hso/TZpSS4dMOmSrWagRU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + bcrypt + cffi + cryptography + idna + ifaddr + netifaces + numpy + paramiko + pycparser + pyimgui + pynacl + pysdl2 + signalslot + six + ]; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + postUnpack = '' + # Find the absolute source root to link correctly to the previous root + prevRoot=$(realpath $sourceRoot) + + # Update the source root to the devkit_client package + sourceRoot="$sourceRoot/client" + + # Link the setup script into the new source root + ln -s $prevRoot/setup/shiv-linux-setup.py $sourceRoot/setup.py + ''; + + postInstall = '' + mkdir -p $out/bin + + # These are various assets like scripts that steamos-devkit will copy to the remote device + cp -R ./devkit-utils $out/${python3.sitePackages}/devkit-utils + + # writeScript + symlink will be ignored by wrapPythonPrograms + # Copying it is undesirable too, just write it directly to a script instead + cat << EOF > $out/bin/steamos-devkit + ${steamos-devkit-script} + EOF + chmod +x $out/bin/steamos-devkit + ''; + + # There are no checks for steamos-devkit + doCheck = false; + pythonImportsCheck = [ "devkit_client" ]; + + desktopItems = [ + (makeDesktopItem { + name = "SteamOS-Devkit"; + exec = "steamos-devkit"; + desktopName = "SteamOS Devkit Client"; + }) + ]; + + meta = with lib; { + description = "SteamOS Devkit Client"; + homepage = "https://gitlab.steamos.cloud/devkit/steamos-devkit"; + license = licenses.mit; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/development/tools/tabnine/sources.json b/pkgs/development/tools/tabnine/sources.json index e6587ea6bcb1..14ee825c72c0 100644 --- a/pkgs/development/tools/tabnine/sources.json +++ b/pkgs/development/tools/tabnine/sources.json @@ -1,17 +1,17 @@ { - "version": "4.4.169", + "version": "4.4.186", "platforms": { "x86_64-linux": { "name": "x86_64-unknown-linux-musl", - "hash": "sha256-gLhFSsOcMElm6a4oHM0yLL6ZGtSk+YvAsUTU/UgGwWg=" + "hash": "sha256-J/VzIxCxttKB4ggLLxyK596k0U1mh6jqaBrzTRxL32Q=" }, "aarch64-darwin": { "name": "aarch64-apple-darwin", - "hash": "sha256-nEUPSj1BFkZ1VyeA7X3Y0zt6eeD4AKAIcJ51QF24JVA=" + "hash": "sha256-quIINq0ocD5k/KyB/N3yBTqyW3GSljAuoaPp4JNYvMw=" }, "x86_64-darwin": { "name": "x86_64-apple-darwin", - "hash": "sha256-GePhGKPvvhYmOSN5NEaqcsFvyuSJi8eTfYTOtufmDiI=" + "hash": "sha256-lYmKgRi43MDyy7jZn8J/PFHgBE9UdjF1bqx2wrMJ4uU=" } } } diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 6b38664b4b81..61e5d10b0c95 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.30.4"; + version = "4.30.5"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-8tCxmcg2FW8OyYQmsoEkhtLJn0V/1u5uw+Er7kWlqcM="; + sha256 = "sha256-+OMBDWiQXCPVTjE8FhzfVRCyGJ0cEw7TVhcoS4yW/50="; }; vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s="; diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index cbbf77c67c8a..a03cb12727ce 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "bridge-utils"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ph2L5PGhQFxgyO841UTwwYwFszubB+W0sxAzU2Fl5g4="; }; - patches = [ ./autoconf-ar.patch ]; + patches = [ + ./autoconf-ar.patch + + (fetchpatch { + name = "musl-includes.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/bridge-utils/fix-PATH_MAX-on-ppc64le.patch?id=12c9046eee3a0a35665dc4e280c1f5ae2af5845d"; + sha256 = "sha256-uY1tgJhcm1DFctg9scmC8e+mgowgz4f/oF0+k+x+jqw="; + }) + ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 00657757fce4..1474232bd624 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libowfat, libcap, zlib, openssl }: +{ lib, stdenv, fetchurl, libowfat, libcap, zlib, openssl, libxcrypt }: let version = "0.16"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0nrnws5qrl4frqcsfa9z973vv5mifgr9z170qbvg3mq1wa7475jz"; }; - buildInputs = [ libowfat libcap zlib openssl.dev ]; + buildInputs = [ libowfat libcap zlib openssl libxcrypt ]; configurePhase = '' substituteInPlace Makefile --replace "/usr/local" "$out" @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = "http://www.fefe.de/gatling/"; license = lib.licenses.gpl2; platforms = platforms.linux; - broken = true; # 2022-11-16 }; } diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index 77ed5932180e..4e2439a396df 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.157.4"; + version = "0.157.5"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-mszVdDnluR+na1DDEyNNqTyRS/8pUZ+et0M7KkXqNiE="; + sha256 = "sha256-cgS8QxxNdE7KMlgb4EJtqpsRUBUFCH+F7Wh0Dh4Gg5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index e71cd6a84bb4..1d5386e89e1a 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "mattermost"; - version = "7.4.0"; + version = "7.5.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-GgspsSzfr1DKcSaLO6tDguCTQlK1c9SuTzRZmTvoNG4="; + sha256 = "sha256-uaud5yCJTV3/+5eqHvIurxM1EPtetTWeFTjkPKYmFiA="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-N4wvgrTmg1J06IPmpLlPHOHNNB+bH2BBQgEsv9GWCN0="; + sha256 = "sha256-DdQjXo3n13qt62iFWhSWuTcEXJiHLGdkWn8ulqvzTI0="; }; vendorSha256 = "sha256-qZQXNVbJZDddVE+xk6F8XJCEg5dhhuXz68wcn2Uvmxk="; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 9ca3ebaf0e89..c84231cb3b8e 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -6,17 +6,24 @@ , makeWrapper , which , curl +, bc +, coreutils # date and timeout binary +, bind # host and dig binary +, nmap +, iproute2 +, netcat-gnu +, python3 }: stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.54.0"; + version = "2.55.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-rRzO5MYpQrDuMyQlOCupV6IR7ZZgpU2lhPpgqoEXiaY="; + hash = "sha256-7eMK1WYazxfqkwxAJyE4SyKukegkYOUd3AC7Y8A7EFA="; }; nativeBuildInputs = [ @@ -30,12 +37,13 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/check_ssl_cert \ - --prefix PATH : "${lib.makeBinPath [ openssl file which curl ]}" + --prefix PATH : "${lib.makeBinPath [ openssl file which curl bc coreutils bind nmap iproute2 netcat-gnu python3 ]}" ''; meta = with lib; { description = "Nagios plugin to check the CA and validity of an X.509 certificate"; homepage = "https://github.com/matteocorti/check_ssl_cert"; + changelog = "https://github.com/matteocorti/check_ssl_cert/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 1bdd7854205a..feda083c85de 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pushgateway"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "pushgateway"; rev = "v${version}"; - sha256 = "sha256-fSp173/ubeXw44IHVnuyYAYnTCrHcsq7GRwPlH05kJY="; + sha256 = "sha256-UnkSv0ZGNFqEQX+QeCySN5XeGbM2hCJGgWxry5I+3tg="; }; - vendorSha256 = "sha256-abl2L8+QY2khLnsjXWWnzs9ewbFWctiJgHE29BRR2gU="; + vendorSha256 = "sha256-wEKk7Jrf14oJzP6MSRJidOUUgAbPFoBOmqPrXJg86FI="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index cfa2d1d43a15..14920ea035ff 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.6.3"; + version = "3.6.6"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "sha256-m29/whlmhIkLin84NOWs2NVZcXNpVsyyHZ1CLp4FXd0="; + sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA="; }; - cargoSha256 = "sha256-XK4hjBIcOx6JMv61gOpIXaZy7Unw+Bk84TEb+8Fib6Q="; + cargoSha256 = "sha256-NsxGpjuZPpz4gCJRp5IOcfRFh8DTud47nV2bE0/kc2Q="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index f5276e104faa..1c170e6f9cdf 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -30,6 +30,7 @@ , bash , python3Packages , nixosTests +, libiconv , enableLDAP ? false, openldap , enablePrinting ? false, cups @@ -103,6 +104,7 @@ stdenv.mkDerivation rec { tdb libxcrypt ] ++ optionals stdenv.isLinux [ liburing systemd ] + ++ optionals stdenv.isDarwin [ libiconv ] ++ optionals enableLDAP [ openldap.dev python3Packages.markdown ] ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi @@ -208,6 +210,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; # N.B. enableGlusterFS does not build + # TODO: darwin support needs newer SDK for "_futimens" and "_utimensat" + # see https://github.com/NixOS/nixpkgs/issues/101229 broken = stdenv.isDarwin || enableGlusterFS; maintainers = with maintainers; [ aneeshusa ]; }; diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 9e0a9a96425e..d29453556be2 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.4.1"; + version = "0.4.4"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-xlfAmAU9u4pI3q8EZm4c7BF/lPAHMjLYa/57VWq067M="; + sha256 = "sha256-MziobrOqEUsg/XhzLChNker3OU9YAH0LmQ+i+UYoPkE="; }; - vendorSha256 = "sha256-XSAMKR5WPG/6ix5T0e9jtHJXQ6HNkh7li+BDFyIhATQ="; + vendorSha256 = "sha256-YmAPZtGq2wWqrmTwFOPvSZ3pXa3hUFd+TQfU+Nzhlvs="; doCheck = false; diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix index c9b39eccd8a8..ab5dfe5e99f6 100644 --- a/pkgs/servers/ursadb/default.nix +++ b/pkgs/servers/ursadb/default.nix @@ -1,40 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zeromq, cppzmq }: +{ lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ursadb"; - version = "1.2.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "ursadb"; - rev = "v${version}"; - hash = "sha256-/EK1CKJ0IR7fkKSpQkONbWcz6uhUoAwK430ljNYsV5U="; + rev = "v${finalAttrs.version}"; + hash = "sha256-JssL1Yd+2CPy9fDPJnstiRucdy6TyUdb0Q6xa160CLM="; + fetchSubmodules = true; }; postPatch = '' substituteInPlace CMakeLists.txt \ - --replace \ - "add_executable(ursadb_test Tests.cpp)" "" \ - --replace \ - "target_link_libraries(ursadb_test ursa)" "" - ''; - - installPhase = '' - mkdir -p $out/bin - cp ursadb $out/bin/ - cp ursadb_new $out/bin/ - cp ursadb_trim $out/bin/ + --replace "add_executable(ursadb_test src/Tests.cpp)" "" \ + --replace "target_link_libraries(ursadb_test ursa)" "" \ + --replace "target_enable_ipo(ursadb_test)" "" \ + --replace "target_clangformat_setup(ursadb_test)" "" \ + --replace 'target_include_directories(ursadb_test PUBLIC ${"$"}{CMAKE_SOURCE_DIR})' "" \ + --replace "ursadb_test" "" ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ - zeromq - cppzmq - ]; - meta = with lib; { homepage = "https://github.com/CERT-Polska/ursadb"; description = "Trigram database written in C++, suited for malware indexing"; @@ -43,4 +34,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 888ccf675e96..ac09e5325889 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -31,14 +31,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.39.21.1"; + version = "0.39.22.1"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = version; - sha256 = "sha256-cX2HwlsWOJ34msEnPP38jq+kzSxOM/spe0Ja2lZ/Q7w="; + sha256 = "sha256-qK44m64/skmeoBgHToTyOpeWUF2kgks10OHoAoLim+k="; }; postPatch = '' @@ -49,33 +49,35 @@ py.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with py.pkgs; [ - flask - flask-wtf + apprise + beautifulsoup4 + brotli + chardet + cryptography eventlet - validators - timeago - inscriptis feedgen + flask flask-login flask-restful + flask-wtf + inscriptis jinja2 jinja2-time - pytz - brotli - requests - urllib3 - chardet - wtforms jsonpath-ng jq - apprise - paho-mqtt - cryptography - beautifulsoup4 lxml - selenium - werkzeug + paho-mqtt + pillow playwright + pytz + requests + selenium + setuptools + timeago + urllib3 + validators + werkzeug + wtforms ] ++ requests.optional-dependencies.socks; # tests can currently not be run in one pytest invocation and without docker diff --git a/pkgs/servers/wesher/default.nix b/pkgs/servers/wesher/default.nix new file mode 100644 index 000000000000..d044654f67e1 --- /dev/null +++ b/pkgs/servers/wesher/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "wesher"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "costela"; + repo = "wesher"; + rev = "v${version}"; + sha256 = "sha256-EIajvcBhS5G9dJzRgXhnD1QKOAhmzngdyCU4L7itT8U="; + }; + + vendorSha256 = "sha256-BZzhBC4C0OoAxUEDROkggCQF35C9Z4+0/Jk0ZD8Hz1s="; + + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; + + meta = with lib; { + description = "Wireguard overlay mesh network manager"; + homepage = "https://github.com/costela/wesher"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tylerjl ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 6cd66011bb9e..81cd4dc88283 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-QWu34BmmqqP4j3lU/25xnNdVRMKIPU4p6Ydh2jNiwEU="; + sha256 = "sha256-Y/fG10WKdSXNU9pLSItPKmTNfx8hL/YO8wtwTHob1QQ="; }; - vendorSha256 = "sha256-gOjlzo/28DC7dq/V88Sc5b88qX/WoBxyAS3P2n9jp6I="; + vendorSha256 = "sha256-sIIEWIVb1d4GDZVLfXz1myeQcxaG6aF8gYJn9+C8zQk="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 609c085edbd3..9d7c35a73bea 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lego"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lMPyquQ+CeMe/V+hG4h61+GiuCXqjVAcTV9Fo3DNb6E="; + sha256 = "sha256-YaJT+gTnw9A2joL8D3P7fs/NTyHpH4gDhg6STv19SZU="; }; vendorSha256 = "sha256-gHwyXzmws99tPRJKR/boc0Hf+b5h9ZkzH2aiN8u6Z0I="; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 8e198d1eceff..855061ef3e2d 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.62.1"; + version = "0.62.2"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mzDowDWnIxQCbCxqPun6oCqMeke4KE+kaVDH/V5TFC4="; + sha256 = "sha256-n3ZkSsyaNreIohCrGYQUnRAnher1VqbV8vQKA20bnPs="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 245da2e199a9..9200dd917495 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6xALedNX37+xUhvsVz7lWgqDppK0b3avUJ3zA6W2n6M="; + sha256 = "sha256-0lEKXCQ7os6hyqEuugNI8ogZiqJZq58VGafEKrcmV3I="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-CBsu2p66XgpeInKw/F6f6ULyoLc6cTtlXzNv3fI41YU="; + vendorSha256 = "sha256-cl6EShtXhe72fbKIMbma9pEGLPBVSNZMiHWi94BbkMM="; excludedPackages = "misc"; diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 9b7b520ce3aa..599326c8fbfb 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { url = "https://sources.debian.org/data/main/j/jfsutils/1.1.15-4/debian/patches/add_sysmacros.patch"; sha256 = "1qcwvxs4d0d24w5x98z59arqfx2n7f0d9xaqhjcg6w8n34vkhnyc"; }) + # fix for musl + (fetchpatch { + name = "musl-fix-includes.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/jfsutils/musl-fix-includes.patch?id=567823dca7dc1f8ce919efbe99762d2d5c020124"; + sha256 = "sha256-FjdUOI+y+MdSWxTR+csH41uR0P+PWWTfIMPwQjBfQtQ="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/games/pokefinder/cstddef.patch b/pkgs/tools/games/pokefinder/cstddef.patch new file mode 100644 index 000000000000..c74340b0d6df --- /dev/null +++ b/pkgs/tools/games/pokefinder/cstddef.patch @@ -0,0 +1,12 @@ +diff --git a/Source/Core/Util/EncounterSlot.cpp b/Source/Core/Util/EncounterSlot.cpp +index adddbdab..71c98e83 100644 +--- a/Source/Core/Util/EncounterSlot.cpp ++++ b/Source/Core/Util/EncounterSlot.cpp +@@ -20,6 +20,7 @@ + #include "EncounterSlot.hpp" + #include + #include ++#include + + namespace + { diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix new file mode 100644 index 000000000000..547b0c47bc26 --- /dev/null +++ b/pkgs/tools/games/pokefinder/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, qttools +, wrapQtAppsHook +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "pokefinder"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "Admiral-Fish"; + repo = "PokeFinder"; + rev = "v${version}"; + sha256 = "j7xgjNF8NWLFVPNItWcFM5WL8yPxgHxVX00x7lt45WI="; + fetchSubmodules = true; + }; + + patches = [ ./cstddef.patch ]; + + postPatch = '' + patchShebangs Source/Core/Resources/ + ''; + + installPhase = '' + install -D Source/Forms/PokeFinder $out/bin/PokeFinder + ''; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ qtbase qttools ]; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + homepage = "https://github.com/Admiral-Fish/PokeFinder"; + description = "Cross platform Pokémon RNG tool"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ leo60228 ]; + }; +} diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index 288286aa9b30..197bddd09559 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.10"; + version = "1.0.11"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Jljq22xbXakwKdf5TXBXzuKuKJOBjf6lzCy8aHrVC3U="; + sha256 = "sha256-HMeJNUF4VT2WdGwAW21GvCp33Bg2HB8NCHv0+3cf74U="; }; - cargoSha256 = "sha256-K0hNnqw178b7noHW76DMR0BoYhkrQpPQeHaH6Azt3Xo="; + cargoSha256 = "sha256-jhSleyhBquU0PxmVPGo1CkuwrzLG7WG5ANPmZ14/ui0="; postPatch = '' patchShebangs tests/test.sh diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 6db9e4c91e3f..028ee081f460 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.64.1"; + version = "0.66.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-qYQWPhvWVNUqsQLTLUd4SOfW0YiXPyGBrtX8AY15FNg="; + sha256 = "sha256-EvDdZTMq2Z8nFlQCiIuF+9SSnj4Lfsa03a7luzc9ynU="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-uq5o/wtmgGMthUqK86x+uKV7jFAd9koKucnBCKGUJMo="; + vendorSha256 = "sha256-D2/7Ubt1Zpb60CNRRQiMbxJXGF2CWmdeBc/XRxFzIjs="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index 97df0907d8d1..caaa69416270 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.4.2"; + version = "3.4.3"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gT7i+7MiqgDSlvo9VqygRZjhB3gS6aoXKSef6BVABaA="; + sha256 = "sha256-m9u4CLvyF2n61JQyxEKlVzWZCUhzVEVqpSZMNDZXCAo="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 51f0865a6d84..a2757d1bced7 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wakatime"; - version = "1.57.0"; + version = "1.60.1"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-3xeTkODG6CMDFjUrh89cFi9UlTikmWmxM3P3vg2pXEo="; + sha256 = "sha256-HOSNNeLtqyLahjG8AzhpfOb9Nmtd0XpI+AA03mlUBCQ="; }; vendorSha256 = "sha256-ANRcgeZYtcWGbK8c9KE8joo97d8LKvKA8/A+/rrjOoM="; diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/tools/misc/xstow/default.nix index 079f4e67579d..c46bef50caf2 100644 --- a/pkgs/tools/misc/xstow/default.nix +++ b/pkgs/tools/misc/xstow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses }: +{ stdenv, lib, fetchurl, ncurses, autoreconfHook }: stdenv.mkDerivation rec { pname = "xstow"; version = "1.1.0"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-wXQ5XSmogAt1torfarrqIU4nBYj69MGM/HBYqeIE+dw="; }; + nativeBuildInputs = [ autoreconfHook ]; + + # Upstream seems to try to support building both static and dynamic version + # of executable on dynamic systems, but fails with link error when attempting + # to cross-build "xstow-static" to the system where "xstow" proper is static. + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + substituteInPlace src/Makefile.am --replace xstow-static "" + substituteInPlace src/Makefile.am --replace xstow-stow "" + ''; + buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index d77be7326d0b..aede201ee91a 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zabbix-cli"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "usit-gd"; repo = "zabbix-cli"; - rev = version; - sha256 = "sha256-t8iVsdoJEHXtq9KK0WUGUX65zekKv8yzNoe8XgeeHd0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-i4dviSdrHNAn4mSWMn5DOBg4j8BXCfwKVYsDaBd/g6o="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 13792bc7ef71..0b17203ad976 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "hysteria"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "HyNetwork"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WQpObXUZBVzRzFSiNNea0tRX0s0+a8qn4NacEaUBwaA="; + sha256 = "sha256-va/2eCi7wu8YMKf/I0ZiDFAY/shaHA/boF1PCYFolwM="; }; - vendorSha256 = "sha256-ww7JtTfyN0/ziQ2jLXRgMhnpx0vFozdSTKe7I129Hvg="; + vendorSha256 = "sha256-a24NyJDatyM+j29vyY5zbPRhRTOGfa2c1FkZdKpDvxk="; proxyVendor = true; ldflags = [ diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index 655edb99b551..554ee52ed4ca 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZgYUCfqvKvXsgRziW0A7i4Cvntd4U2q9kKXHwBtAA9k="; + sha256 = "sha256-VjHZjClOiwz6XwbLJFSl6wEkhA5hOo3RNfNte37ZfBc="; }; vendorSha256 = "sha256-XFXe02WTtkzIzpcVN1Vwi+7rTKWlrMWCOV/rrDBRliY="; diff --git a/pkgs/tools/networking/ripe-atlas-tools/default.nix b/pkgs/tools/networking/ripe-atlas-tools/default.nix index 0c415c65b8ea..05f3ef22bd8c 100644 --- a/pkgs/tools/networking/ripe-atlas-tools/default.nix +++ b/pkgs/tools/networking/ripe-atlas-tools/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "ripe-atlas-tools"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "RIPE-NCC"; repo = "ripe-atlas-tools"; - rev = "v${version}"; - sha256 = "sha256-5AMqBXxJZOtI0/2NrEjrUfNXWKc7sn6kZX26766LBUM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-tNojduSNjJc8yOkDbuFLKoASqIV4P3mGuNbiIcf6Nac="; }; postPatch = '' diff --git a/pkgs/tools/package-management/licensee/Gemfile.lock b/pkgs/tools/package-management/licensee/Gemfile.lock index e631b63963c3..438ba3e8c6f3 100644 --- a/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/pkgs/tools/package-management/licensee/Gemfile.lock @@ -1,38 +1,36 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - dotenv (2.7.6) - faraday (1.3.0) - faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday-net_http (1.0.1) - licensee (9.15.1) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + dotenv (2.8.1) + faraday (2.7.1) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + licensee (9.15.3) dotenv (~> 2.0) - octokit (~> 4.20) - reverse_markdown (~> 1.0) + octokit (>= 4.20, < 7.0) + reverse_markdown (>= 1, < 3) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - mini_portile2 (2.5.0) - multipart-post (2.1.1) - nokogiri (1.11.1) - mini_portile2 (~> 2.5.0) + mini_portile2 (2.8.0) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - octokit (4.20.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - public_suffix (4.0.6) - racc (1.5.2) - reverse_markdown (1.4.0) + octokit (6.0.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + public_suffix (5.0.0) + racc (1.6.0) + reverse_markdown (2.1.1) nokogiri - ruby2_keywords (0.0.4) - rugged (1.1.0) - sawyer (0.8.2) + ruby2_keywords (0.0.5) + rugged (1.5.0.1) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - thor (1.1.0) + faraday (>= 0.17.3, < 3) + thor (1.2.1) PLATFORMS ruby @@ -41,4 +39,4 @@ DEPENDENCIES licensee BUNDLED WITH - 2.1.4 + 2.3.25 diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix index b9b11b465f69..656f67f3a270 100644 --- a/pkgs/tools/package-management/licensee/gemset.nix +++ b/pkgs/tools/package-management/licensee/gemset.nix @@ -5,41 +5,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.1"; }; dotenv = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; type = "gem"; }; - version = "2.7.6"; + version = "2.8.1"; }; faraday = { - dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; type = "gem"; }; - version = "1.3.0"; + version = "2.7.1"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; type = "gem"; }; - version = "1.0.1"; + version = "3.0.2"; }; licensee = { dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; @@ -47,30 +47,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pvrz9fjvxzk3aq85zgh8dkw98kz54jmwi10k3shc8dqbrlvragy"; + sha256 = "0n0l1c8kxhpdg6pgv1wgwpdfc7gqkygpd8h41shwc95rapdha9gg"; type = "gem"; }; - version = "9.15.1"; + version = "9.15.3"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.5.0"; - }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; - type = "gem"; - }; - version = "2.1.1"; + version = "2.8.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -78,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.11.1"; + version = "1.13.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -89,30 +79,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; + sha256 = "0a5iy1v1n8f5ggp6q601mn8dz1n08ffs4gv0zsh5ca68j8dfmpx5"; type = "gem"; }; - version = "4.20.0"; + version = "6.0.1"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.6"; + version = "5.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; reverse_markdown = { dependencies = ["nokogiri"]; @@ -120,30 +110,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; + sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j"; type = "gem"; }; - version = "1.4.0"; + version = "2.1.1"; }; ruby2_keywords = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; rugged = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; + sha256 = "02h1cv73znwfgy61mqmfylcfvwyyp3lddiz3njgivfx234mpz50x"; type = "gem"; }; - version = "1.1.0"; + version = "1.5.0.1"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -151,19 +141,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.2"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; } diff --git a/pkgs/tools/package-management/poetry2conda/default.nix b/pkgs/tools/package-management/poetry2conda/default.nix index 1e570156f8c9..f69f28203196 100644 --- a/pkgs/tools/package-management/poetry2conda/default.nix +++ b/pkgs/tools/package-management/poetry2conda/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 }: @@ -16,7 +17,15 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "sha256-UqNoEGgStvqtxhYwExk7wO4SvATaM2kGaFbB5ViJa7U="; }; - nativeBuildInputs = [ poetry ]; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/dojeda/poetry2conda/commit/b127090498c89fbd8bbcbac45d03178a1e1c4219.patch"; + hash = "sha256-J26NhVPG1vD/QNXi5irtGW05CYsIYvZNQIi8YvHwCLc="; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ poetry-semver diff --git a/pkgs/tools/package-management/wapm/cli/default.nix b/pkgs/tools/package-management/wapm/cli/default.nix index fcb206b1a752..f1feebdbb0c4 100644 --- a/pkgs/tools/package-management/wapm/cli/default.nix +++ b/pkgs/tools/package-management/wapm/cli/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "wapm-cli"; - version = "0.5.5"; + version = "0.5.9"; src = fetchFromGitHub { owner = "wasmerio"; repo = "wapm-cli"; rev = "v${version}"; - sha256 = "sha256-BKBd1tJwV4VOjRnAx/spQy3LIXzujrO2SS5eA1uybNA="; + sha256 = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs="; }; - cargoSha256 = "sha256-dv04AXOnzizjq/qx3qy524ylQHgE4gIBgeYI+2IRTug="; + cargoSha256 = "sha256-r4123NJ+nxNOVIg6svWr636xbxOJQ7tp76JoAi2m9p8="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/tools/security/gotrue/default.nix b/pkgs/tools/security/gotrue/default.nix new file mode 100644 index 000000000000..112e0c4ddc6d --- /dev/null +++ b/pkgs/tools/security/gotrue/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gotrue"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "netlify"; + repo = pname; + rev = "v${version}"; + hash = "sha256-9h6CyCY7741tJR+qWDLwgPkAtE/kmaoTqlXEY+mOW58="; + }; + + vendorHash = "sha256-x96+l9EBzYplGRFHsfQazSjqZs35bdXQEJv3pBuaJVo="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/netlify/gotrue/cmd.Version=${version}" + ]; + + # integration tests require network access + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/netlify/gotrue"; + description = "An SWT based API for managing users and issuing SWT tokens"; + changelog = "https://github.com/netlify/gotrue/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix new file mode 100644 index 000000000000..5cdbe402501c --- /dev/null +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gotrue"; + version = "2.35.0"; + + src = fetchFromGitHub { + owner = "supabase"; + repo = pname; + rev = "v${version}"; + hash = "sha256-uFE2pcEpGhrl8LcZLvYEMlq8sgRmFkltf3H8huZzXpM="; + }; + + vendorHash = "sha256-uchgHxUczb4IIUkUdHWyeXWr2LXda6eWwjQxUBcPDoA="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/netlify/gotrue/utilities.Version=${version}" + ]; + + # integration tests require network to connect to postgres database + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/supabase/gotrue"; + description = "A JWT based API for managing users and issuing JWT tokens"; + changelog = "https://github.com/supabase/gotrue/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/tools/security/threatest/default.nix b/pkgs/tools/security/threatest/default.nix index 8af45fd580de..c11bf8735761 100644 --- a/pkgs/tools/security/threatest/default.nix +++ b/pkgs/tools/security/threatest/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "threatest"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "DataDog"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ehyE19VGSLykJUOXoYMFr2Y82Bwpj2ZK5//VJybVAtk="; + hash = "sha256-9/TIiBp3w7NaECX929Tai5nqHKxb7YxYEr2hAl2ttsM="; }; vendorHash = "sha256-vTzgxByZ2BC7nuq/+LJV7LR0KsUxh1EbHFe81PwqCJc="; diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index aced99ece95b..2ef4d13c366b 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.0.8"; + version = "1.1.0"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9x0ELoYCwfE0N7CuxZYMPBmX8A5Vh4pAtbcY6X6S9eQ="; + sha256 = "sha256-/v3P5C0F/FVPJqJ38dzSnAc7ua2fOs3BeX9BDoQ8bDw="; }; - cargoHash = "sha256-e7yftR1mLMllBe0OIU5QWmGtQm+h30CbTInB6ojQk7M="; + cargoHash = "sha256-KXsW0fgbBy0tf/He0vH9Xq8yGuz77H/jeIabgw3ppy8="; buildFeatures = lib.optional withCmd "cmd"; diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 5291b9e9f821..6d80babb2f95 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -1,22 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: +{ lib, stdenv, fetchCrate, rustPlatform, openssl, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.2.10"; + version = "0.2.17"; - src = fetchFromGitHub { - owner = "lzanini"; - repo = pname; - rev = "v${version}"; - hash = "sha256-5PzXX7icRxcHpzjp3x/9ssn2o0444uHrzBn1Ds1DEPM="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-rJzZVZn8CJOIcSVLCLv6tWox0MRdxNBMUKo1fij1ogc="; }; - cargoPatches = [ - # Remove when https://github.com/lzanini/mdbook-katex/pull/35 is in a new release. - ./update-mdbook-for-rust-1.64.patch - ]; + cargoHash = "sha256-aSFXTeP5wDshdrrJ+eJCTmLuTlxCuM+5irUr0iW4tAY="; - cargoHash = "sha256-lrEirKkGf9/8yLyLSON54UaeQ3Xtl7g7ezUc7e1KVHw="; + OPENSSL_DIR = "${lib.getDev openssl}"; + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-katex/update-mdbook-for-rust-1.64.patch b/pkgs/tools/text/mdbook-katex/update-mdbook-for-rust-1.64.patch deleted file mode 100644 index ee90a3076702..000000000000 --- a/pkgs/tools/text/mdbook-katex/update-mdbook-for-rust-1.64.patch +++ /dev/null @@ -1,1417 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3ff0894..ffef44f 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,10 +1,12 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 3 -+ - [[package]] - name = "aho-corasick" --version = "0.7.15" -+version = "0.7.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" - dependencies = [ - "memchr", - ] -@@ -52,9 +54,9 @@ dependencies = [ - - [[package]] - name = "autocfg" --version = "1.0.1" -+version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - - [[package]] - name = "base64" -@@ -62,11 +64,17 @@ version = "0.12.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -+[[package]] -+name = "base64" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -+ - [[package]] - name = "bitflags" --version = "1.2.1" -+version = "1.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - - [[package]] - name = "block-buffer" -@@ -82,9 +90,9 @@ dependencies = [ - - [[package]] - name = "block-buffer" --version = "0.9.0" -+version = "0.10.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" - dependencies = [ - "generic-array 0.14.4", - ] -@@ -98,6 +106,17 @@ dependencies = [ - "byte-tools", - ] - -+[[package]] -+name = "bstr" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -+dependencies = [ -+ "lazy_static", -+ "memchr", -+ "regex-automata", -+] -+ - [[package]] - name = "byte-tools" - version = "0.3.1" -@@ -116,6 +135,12 @@ version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -+[[package]] -+name = "bytes" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" -+ - [[package]] - name = "cc" - version = "1.0.62" -@@ -157,11 +182,45 @@ dependencies = [ - "atty", - "bitflags", - "strsim 0.8.0", -- "textwrap", -+ "textwrap 0.11.0", - "unicode-width", - "vec_map", - ] - -+[[package]] -+name = "clap" -+version = "3.2.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" -+dependencies = [ -+ "atty", -+ "bitflags", -+ "clap_lex", -+ "indexmap", -+ "once_cell", -+ "strsim 0.10.0", -+ "termcolor", -+ "textwrap 0.15.1", -+] -+ -+[[package]] -+name = "clap_complete" -+version = "3.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" -+dependencies = [ -+ "clap 3.2.22", -+] -+ -+[[package]] -+name = "clap_lex" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -+dependencies = [ -+ "os_str_bytes", -+] -+ - [[package]] - name = "copy_dir" - version = "0.1.2" -@@ -172,10 +231,23 @@ dependencies = [ - ] - - [[package]] --name = "cpuid-bool" --version = "0.1.2" -+name = "cpufeatures" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "crypto-common" -+version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" -+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -+dependencies = [ -+ "generic-array 0.14.4", -+ "typenum", -+] - - [[package]] - name = "darling" -@@ -248,39 +320,31 @@ dependencies = [ - - [[package]] - name = "digest" --version = "0.9.0" -+version = "0.10.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" - dependencies = [ -- "generic-array 0.14.4", -+ "block-buffer 0.10.3", -+ "crypto-common", - ] - --[[package]] --name = "dtoa" --version = "0.4.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" -- - [[package]] - name = "elasticlunr-rs" --version = "2.3.9" -+version = "3.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "35622eb004c8f0c5e7e2032815f3314a93df0db30a1ce5c94e62c1ecc81e22b9" -+checksum = "b94d9c8df0fe6879ca12e7633fdfe467c503722cc981fc463703472d2b876448" - dependencies = [ -- "lazy_static", - "regex", - "serde", - "serde_derive", - "serde_json", -- "strum", -- "strum_macros", - ] - - [[package]] - name = "env_logger" --version = "0.7.1" -+version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" - dependencies = [ - "atty", - "humantime", -@@ -368,25 +432,11 @@ dependencies = [ - "new_debug_unreachable", - ] - --[[package]] --name = "futures" --version = "0.3.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" --dependencies = [ -- "futures-channel", -- "futures-core", -- "futures-io", -- "futures-sink", -- "futures-task", -- "futures-util", --] -- - [[package]] - name = "futures-channel" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" -+checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" - dependencies = [ - "futures-core", - "futures-sink", -@@ -394,23 +444,16 @@ dependencies = [ - - [[package]] - name = "futures-core" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" -- --[[package]] --name = "futures-io" --version = "0.3.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" -+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" - - [[package]] - name = "futures-macro" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" -+checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" - dependencies = [ -- "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -@@ -418,33 +461,28 @@ dependencies = [ - - [[package]] - name = "futures-sink" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" -+checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" - - [[package]] - name = "futures-task" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" --dependencies = [ -- "once_cell", --] -+checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" - - [[package]] - name = "futures-util" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" -+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" - dependencies = [ - "futures-core", - "futures-macro", - "futures-sink", - "futures-task", -- "pin-project 1.0.1", -+ "pin-project-lite", - "pin-utils", -- "proc-macro-hack", -- "proc-macro-nested", - "slab", - ] - -@@ -468,23 +506,25 @@ dependencies = [ - ] - - [[package]] --name = "getopts" --version = "0.2.21" -+name = "getrandom" -+version = "0.1.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" - dependencies = [ -- "unicode-width", -+ "cfg-if 0.1.10", -+ "libc", -+ "wasi 0.9.0+wasi-snapshot-preview1", - ] - - [[package]] - name = "getrandom" --version = "0.1.15" -+version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" -+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" - dependencies = [ -- "cfg-if 0.1.10", -+ "cfg-if 1.0.0", - "libc", -- "wasi 0.9.0+wasi-snapshot-preview1", -+ "wasi 0.11.0+wasi-snapshot-preview1", - ] - - [[package]] -@@ -504,11 +544,11 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - - [[package]] - name = "h2" --version = "0.2.7" -+version = "0.3.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -+checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" - dependencies = [ -- "bytes", -+ "bytes 1.2.1", - "fnv", - "futures-core", - "futures-sink", -@@ -519,21 +559,20 @@ dependencies = [ - "tokio", - "tokio-util", - "tracing", -- "tracing-futures", - ] - - [[package]] - name = "handlebars" --version = "3.5.1" -+version = "4.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2764f9796c0ddca4b82c07f25dd2cb3db30b9a8f47940e78e1c883d9e95c3db9" -+checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" - dependencies = [ - "log", - "pest", - "pest_derive", -- "quick-error 2.0.0", - "serde", - "serde_json", -+ "thiserror", - ] - - [[package]] -@@ -548,9 +587,9 @@ version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" - dependencies = [ -- "base64", -+ "base64 0.12.3", - "bitflags", -- "bytes", -+ "bytes 0.5.6", - "headers-core", - "http", - "mime", -@@ -567,15 +606,6 @@ dependencies = [ - "http", - ] - --[[package]] --name = "heck" --version = "0.3.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" --dependencies = [ -- "unicode-segmentation", --] -- - [[package]] - name = "hermit-abi" - version = "0.1.17" -@@ -605,19 +635,20 @@ version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" - dependencies = [ -- "bytes", -+ "bytes 0.5.6", - "fnv", -- "itoa", -+ "itoa 0.4.6", - ] - - [[package]] - name = "http-body" --version = "0.3.1" -+version = "0.4.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" - dependencies = [ -- "bytes", -+ "bytes 1.2.1", - "http", -+ "pin-project-lite", - ] - - [[package]] -@@ -634,20 +665,17 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - - [[package]] - name = "humantime" --version = "1.3.0" -+version = "2.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" --dependencies = [ -- "quick-error 1.2.3", --] -+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - - [[package]] - name = "hyper" --version = "0.13.9" -+version = "0.14.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" -+checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" - dependencies = [ -- "bytes", -+ "bytes 1.2.1", - "futures-channel", - "futures-core", - "futures-util", -@@ -656,8 +684,8 @@ dependencies = [ - "http-body", - "httparse", - "httpdate", -- "itoa", -- "pin-project 1.0.1", -+ "itoa 0.4.6", -+ "pin-project", - "socket2", - "tokio", - "tower-service", -@@ -712,15 +740,6 @@ dependencies = [ - "libc", - ] - --[[package]] --name = "input_buffer" --version = "0.3.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" --dependencies = [ -- "bytes", --] -- - [[package]] - name = "iovec" - version = "0.1.4" -@@ -736,6 +755,12 @@ version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - -+[[package]] -+name = "itoa" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" -+ - [[package]] - name = "katex" - version = "0.3.2" -@@ -771,9 +796,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - - [[package]] - name = "libc" --version = "0.2.80" -+version = "0.2.134" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" -+checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" - - [[package]] - name = "libquickjs-sys" -@@ -843,14 +868,15 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - - [[package]] - name = "mdbook" --version = "0.4.4" -+version = "0.4.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "714a3ac362b9b32eef9468ecfe604cb8e2204d50793602e9d49fee44781230e7" -+checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9" - dependencies = [ - "ammonia", - "anyhow", - "chrono", -- "clap", -+ "clap 3.2.22", -+ "clap_complete", - "elasticlunr-rs", - "env_logger", - "futures-util", -@@ -860,16 +886,16 @@ dependencies = [ - "log", - "memchr", - "notify", -- "open", -+ "opener", - "pulldown-cmark", - "regex", - "serde", -- "serde_derive", - "serde_json", - "shlex", - "tempfile", - "tokio", - "toml", -+ "topological-sort", - "warp", - ] - -@@ -877,7 +903,7 @@ dependencies = [ - name = "mdbook-katex" - version = "0.2.10" - dependencies = [ -- "clap", -+ "clap 2.33.3", - "katex", - "mdbook", - "serde_json", -@@ -886,9 +912,9 @@ dependencies = [ - - [[package]] - name = "memchr" --version = "2.3.4" -+version = "2.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" -+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - - [[package]] - name = "mime" -@@ -925,6 +951,18 @@ dependencies = [ - "winapi 0.2.8", - ] - -+[[package]] -+name = "mio" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" -+dependencies = [ -+ "libc", -+ "log", -+ "wasi 0.11.0+wasi-snapshot-preview1", -+ "windows-sys", -+] -+ - [[package]] - name = "mio-extras" - version = "2.0.6" -@@ -933,7 +971,7 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" - dependencies = [ - "lazycell", - "log", -- "mio", -+ "mio 0.6.22", - "slab", - ] - -@@ -978,7 +1016,7 @@ dependencies = [ - "fsevent-sys", - "inotify", - "libc", -- "mio", -+ "mio 0.6.22", - "mio-extras", - "walkdir 2.3.1", - "winapi 0.3.9", -@@ -1004,32 +1042,43 @@ dependencies = [ - ] - - [[package]] --name = "once_cell" --version = "1.5.2" -+name = "num_cpus" -+version = "1.13.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" -+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] - - [[package]] --name = "opaque-debug" --version = "0.2.3" -+name = "once_cell" -+version = "1.15.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" - - [[package]] - name = "opaque-debug" --version = "0.3.0" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - - [[package]] --name = "open" --version = "1.4.0" -+name = "opener" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c283bf0114efea9e42f1a60edea9859e8c47528eae09d01df4b29c1e489cc48" -+checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952" - dependencies = [ -+ "bstr", - "winapi 0.3.9", - ] - -+[[package]] -+name = "os_str_bytes" -+version = "6.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" -+ - [[package]] - name = "percent-encoding" - version = "2.1.0" -@@ -1105,7 +1154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" - dependencies = [ - "phf_shared", -- "rand", -+ "rand 0.7.3", - ] - - [[package]] -@@ -1117,33 +1166,13 @@ dependencies = [ - "siphasher", - ] - --[[package]] --name = "pin-project" --version = "0.4.27" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" --dependencies = [ -- "pin-project-internal 0.4.27", --] -- - [[package]] - name = "pin-project" - version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841" - dependencies = [ -- "pin-project-internal 1.0.1", --] -- --[[package]] --name = "pin-project-internal" --version = "0.4.27" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn", -+ "pin-project-internal", - ] - - [[package]] -@@ -1159,9 +1188,9 @@ dependencies = [ - - [[package]] - name = "pin-project-lite" --version = "0.1.11" -+version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" -+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - - [[package]] - name = "pin-utils" -@@ -1181,18 +1210,6 @@ version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - --[[package]] --name = "proc-macro-hack" --version = "0.5.19" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -- --[[package]] --name = "proc-macro-nested" --version = "0.1.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" -- - [[package]] - name = "proc-macro2" - version = "1.0.24" -@@ -1204,28 +1221,15 @@ dependencies = [ - - [[package]] - name = "pulldown-cmark" --version = "0.7.2" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ca36dea94d187597e104a5c8e4b07576a8a45aa5db48a65e12940d3eb7461f55" -+checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" - dependencies = [ - "bitflags", -- "getopts", - "memchr", - "unicase", - ] - --[[package]] --name = "quick-error" --version = "1.2.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -- --[[package]] --name = "quick-error" --version = "2.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" -- - [[package]] - name = "quick-js" - version = "0.4.0" -@@ -1251,14 +1255,25 @@ version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" - dependencies = [ -- "getrandom", -+ "getrandom 0.1.15", - "libc", -- "rand_chacha", -- "rand_core", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", - "rand_hc", - "rand_pcg", - ] - -+[[package]] -+name = "rand" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -+dependencies = [ -+ "libc", -+ "rand_chacha 0.3.1", -+ "rand_core 0.6.4", -+] -+ - [[package]] - name = "rand_chacha" - version = "0.2.2" -@@ -1266,7 +1281,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" - dependencies = [ - "ppv-lite86", -- "rand_core", -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core 0.6.4", - ] - - [[package]] -@@ -1275,7 +1300,16 @@ version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" - dependencies = [ -- "getrandom", -+ "getrandom 0.1.15", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.6.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -+dependencies = [ -+ "getrandom 0.2.7", - ] - - [[package]] -@@ -1284,7 +1318,7 @@ version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" - dependencies = [ -- "rand_core", -+ "rand_core 0.5.1", - ] - - [[package]] -@@ -1293,7 +1327,7 @@ version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" - dependencies = [ -- "rand_core", -+ "rand_core 0.5.1", - ] - - [[package]] -@@ -1304,21 +1338,26 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - - [[package]] - name = "regex" --version = "1.4.2" -+version = "1.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" -+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" - dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -- "thread_local", - ] - -+[[package]] -+name = "regex-automata" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -+ - [[package]] - name = "regex-syntax" --version = "0.6.21" -+version = "0.6.27" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" -+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - - [[package]] - name = "remove_dir_all" -@@ -1329,6 +1368,15 @@ dependencies = [ - "winapi 0.3.9", - ] - -+[[package]] -+name = "rustls-pemfile" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -+dependencies = [ -+ "base64 0.13.0", -+] -+ - [[package]] - name = "ryu" - version = "1.0.5" -@@ -1355,6 +1403,9 @@ name = "serde" - version = "1.0.117" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" -+dependencies = [ -+ "serde_derive", -+] - - [[package]] - name = "serde_derive" -@@ -1373,21 +1424,21 @@ version = "1.0.59" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" - dependencies = [ -- "itoa", -+ "itoa 0.4.6", - "ryu", - "serde", - ] - - [[package]] - name = "serde_urlencoded" --version = "0.6.1" -+version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" - dependencies = [ -- "dtoa", -- "itoa", -+ "form_urlencoded", -+ "itoa 1.0.3", -+ "ryu", - "serde", -- "url", - ] - - [[package]] -@@ -1399,27 +1450,25 @@ dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", -- "opaque-debug 0.2.3", -+ "opaque-debug", - ] - - [[package]] - name = "sha-1" --version = "0.9.2" -+version = "0.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" -+checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" - dependencies = [ -- "block-buffer 0.9.0", - "cfg-if 1.0.0", -- "cpuid-bool", -- "digest 0.9.0", -- "opaque-debug 0.3.0", -+ "cpufeatures", -+ "digest 0.10.5", - ] - - [[package]] - name = "shlex" --version = "0.1.1" -+version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" -+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - - [[package]] - name = "siphasher" -@@ -1435,13 +1484,11 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - - [[package]] - name = "socket2" --version = "0.3.16" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d" -+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" - dependencies = [ -- "cfg-if 0.1.10", - "libc", -- "redox_syscall", - "winapi 0.3.9", - ] - -@@ -1483,28 +1530,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - - [[package]] --name = "strum" --version = "0.18.0" -+name = "strsim" -+version = "0.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" -- --[[package]] --name = "strum_macros" --version = "0.18.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" --dependencies = [ -- "heck", -- "proc-macro2", -- "quote", -- "syn", --] -+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - - [[package]] - name = "syn" --version = "1.0.48" -+version = "1.0.67" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" -+checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" - dependencies = [ - "proc-macro2", - "quote", -@@ -1519,7 +1554,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" - dependencies = [ - "cfg-if 0.1.10", - "libc", -- "rand", -+ "rand 0.7.3", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -@@ -1538,9 +1573,9 @@ dependencies = [ - - [[package]] - name = "termcolor" --version = "1.1.0" -+version = "1.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" -+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" - dependencies = [ - "winapi-util", - ] -@@ -1554,35 +1589,32 @@ dependencies = [ - "unicode-width", - ] - -+[[package]] -+name = "textwrap" -+version = "0.15.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" -+ - [[package]] - name = "thiserror" --version = "1.0.22" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" -+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" - dependencies = [ - "thiserror-impl", - ] - - [[package]] - name = "thiserror-impl" --version = "1.0.22" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" -+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" - dependencies = [ - "proc-macro2", - "quote", - "syn", - ] - --[[package]] --name = "thread_local" --version = "1.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" --dependencies = [ -- "lazy_static", --] -- - [[package]] - name = "time" - version = "0.1.44" -@@ -1611,58 +1643,68 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - - [[package]] - name = "tokio" --version = "0.2.23" -+version = "1.21.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" -+checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" - dependencies = [ -- "bytes", -- "fnv", -- "futures-core", -- "iovec", -- "lazy_static", -+ "autocfg", -+ "bytes 1.2.1", -+ "libc", - "memchr", -- "mio", -+ "mio 0.8.4", -+ "num_cpus", - "pin-project-lite", -- "slab", -+ "socket2", - "tokio-macros", -+ "winapi 0.3.9", - ] - - [[package]] - name = "tokio-macros" --version = "0.2.6" -+version = "1.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" -+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" - dependencies = [ - "proc-macro2", - "quote", - "syn", - ] - -+[[package]] -+name = "tokio-stream" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" -+dependencies = [ -+ "futures-core", -+ "pin-project-lite", -+ "tokio", -+] -+ - [[package]] - name = "tokio-tungstenite" --version = "0.11.0" -+version = "0.17.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6d9e878ad426ca286e4dcae09cbd4e1973a7f8987d97570e2469703dd7f5720c" -+checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" - dependencies = [ - "futures-util", - "log", -- "pin-project 0.4.27", - "tokio", - "tungstenite", - ] - - [[package]] - name = "tokio-util" --version = "0.3.1" -+version = "0.7.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" - dependencies = [ -- "bytes", -+ "bytes 1.2.1", - "futures-core", - "futures-sink", -- "log", - "pin-project-lite", - "tokio", -+ "tracing", - ] - - [[package]] -@@ -1674,6 +1716,12 @@ dependencies = [ - "serde", - ] - -+[[package]] -+name = "topological-sort" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" -+ - [[package]] - name = "tower-service" - version = "0.3.0" -@@ -1682,11 +1730,11 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" - - [[package]] - name = "tracing" --version = "0.1.21" -+version = "0.1.35" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" -+checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" - dependencies = [ -- "cfg-if 0.1.10", -+ "cfg-if 1.0.0", - "log", - "pin-project-lite", - "tracing-core", -@@ -1694,21 +1742,11 @@ dependencies = [ - - [[package]] - name = "tracing-core" --version = "0.1.17" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" --dependencies = [ -- "lazy_static", --] -- --[[package]] --name = "tracing-futures" --version = "0.2.4" -+version = "0.1.29" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" -+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" - dependencies = [ -- "pin-project 0.4.27", -- "tracing", -+ "once_cell", - ] - - [[package]] -@@ -1719,28 +1757,28 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - - [[package]] - name = "tungstenite" --version = "0.11.1" -+version = "0.17.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" -+checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" - dependencies = [ -- "base64", -+ "base64 0.13.0", - "byteorder", -- "bytes", -+ "bytes 1.2.1", - "http", - "httparse", -- "input_buffer", - "log", -- "rand", -- "sha-1 0.9.2", -+ "rand 0.8.5", -+ "sha-1 0.10.0", -+ "thiserror", - "url", - "utf-8", - ] - - [[package]] - name = "typenum" --version = "1.12.0" -+version = "1.15.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" -+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - - [[package]] - name = "ucd-trie" -@@ -1775,12 +1813,6 @@ dependencies = [ - "tinyvec", - ] - --[[package]] --name = "unicode-segmentation" --version = "1.7.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae" -- - [[package]] - name = "unicode-width" - version = "0.1.8" -@@ -1805,12 +1837,6 @@ dependencies = [ - "percent-encoding", - ] - --[[package]] --name = "urlencoding" --version = "1.1.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c9232eb53352b4442e40d7900465dfc534e8cb2dc8f18656fcb2ac16112b5593" -- - [[package]] - name = "utf-8" - version = "0.7.5" -@@ -1862,29 +1888,32 @@ dependencies = [ - - [[package]] - name = "warp" --version = "0.2.5" -+version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407" -+checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" - dependencies = [ -- "bytes", -- "futures", -+ "bytes 1.2.1", -+ "futures-channel", -+ "futures-util", - "headers", - "http", - "hyper", - "log", - "mime", - "mime_guess", -- "pin-project 0.4.27", -+ "percent-encoding", -+ "pin-project", -+ "rustls-pemfile", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", -+ "tokio-stream", - "tokio-tungstenite", -+ "tokio-util", - "tower-service", - "tracing", -- "tracing-futures", -- "urlencoding", - ] - - [[package]] -@@ -1899,6 +1928,12 @@ version = "0.10.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -+[[package]] -+name = "wasi" -+version = "0.11.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -+ - [[package]] - name = "winapi" - version = "0.2.8" -@@ -1942,6 +1977,49 @@ version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -+[[package]] -+name = "windows-sys" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -+dependencies = [ -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", -+ "windows_x86_64_msvc", -+] -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" -+ - [[package]] - name = "ws2_32-sys" - version = "0.2.1" -diff --git a/Cargo.toml b/Cargo.toml -index 16efef1..e750ee2 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -10,6 +10,6 @@ readme = "README.md" - [dependencies] - katex = "0.3.2" - clap = "2.33.3" --mdbook = "0.4.4" -+mdbook = "0.4.21" - serde_json = "1.0.59" - toml = "0.5.7" diff --git a/pkgs/tools/wayland/wlprop/default.nix b/pkgs/tools/wayland/wlprop/default.nix new file mode 100644 index 000000000000..82f80a594ad0 --- /dev/null +++ b/pkgs/tools/wayland/wlprop/default.nix @@ -0,0 +1,34 @@ +{ fetchgit, gawk, jq, lib, makeWrapper, slurp, stdenv, sway }: + +stdenv.mkDerivation rec { + pname = "wlprop"; + version = "unstable-2022-08-18"; + + src = fetchgit { + url = "https://gist.github.com/f313386043395ff06570e02af2d9a8e0"; + rev = "758c548bfb4be5b437c428c8062b3987f126f002"; + sha256 = "sha256-ZJ9LYYrU2cNYikiVNTlEcI4QXcoqfl7iwk3Be+NhGG8="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + installPhase = '' + runHook preInstall + + install -Dm755 wlprop.sh $out/bin/wlprop + wrapProgram "$out/bin/wlprop" \ + --prefix PATH : "$out/bin:${lib.makeBinPath [ gawk jq slurp sway ]}" + + runHook postInstall + ''; + passthru.scriptName = "wlprop.sh"; + + meta = with lib; { + description = "An xprop clone for wlroots based compositors"; + homepage = "https://gist.github.com/crispyricepc/f313386043395ff06570e02af2d9a8e0"; + license = licenses.mit; + maintainers = with maintainers; [ sebtm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ceeeb718faa7..f4543d727708 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3602,6 +3602,8 @@ with pkgs; wlopm = callPackage ../tools/wayland/wlopm { }; + wlprop = callPackage ../tools/wayland/wlprop {}; + wlr-randr = callPackage ../tools/wayland/wlr-randr { }; wlrctl = callPackage ../tools/wayland/wlrctl { }; @@ -11009,7 +11011,7 @@ with pkgs; renameutils = callPackage ../tools/misc/renameutils { }; - renderdoc = libsForQt5.callPackage ../applications/graphics/renderdoc { }; + renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { }; replace = callPackage ../tools/text/replace { }; @@ -13436,16 +13438,23 @@ with pkgs; abcl = callPackage ../development/compilers/abcl { }; + temurin-bin-19 = javaPackages.compiler.temurin-bin.jdk-19; + temurin-jre-bin-19 = javaPackages.compiler.temurin-bin.jre-19; + + temurin-bin-18 = javaPackages.compiler.temurin-bin.jdk-18; + temurin-jre-bin-18 = javaPackages.compiler.temurin-bin.jre-18; + temurin-bin-17 = javaPackages.compiler.temurin-bin.jdk-17; temurin-jre-bin-17 = javaPackages.compiler.temurin-bin.jre-17; + temurin-bin-16 = javaPackages.compiler.temurin-bin.jdk-16; temurin-bin-11 = javaPackages.compiler.temurin-bin.jdk-11; temurin-jre-bin-11 = javaPackages.compiler.temurin-bin.jre-11; temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8; temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8; - temurin-bin = temurin-bin-17; - temurin-jre-bin = temurin-jre-bin-17; + temurin-bin = temurin-bin-19; + temurin-jre-bin = temurin-jre-bin-19; semeru-bin-17 = javaPackages.compiler.semeru-bin.jdk-17; semeru-jre-bin-17 = javaPackages.compiler.semeru-bin.jre-17; @@ -14494,14 +14503,14 @@ with pkgs; openjdk16-bootstrap = javaPackages.compiler.openjdk16-bootstrap; - openjdk18-bootstrap = javaPackages.compiler.openjdk18-bootstrap; - openjdk18 = javaPackages.compiler.openjdk18; - openjdk18_headless = javaPackages.compiler.openjdk18.headless; - jdk18 = openjdk18; - jdk18_headless = openjdk18_headless; + openjdk19 = javaPackages.compiler.openjdk19; + openjdk19_headless = javaPackages.compiler.openjdk19.headless; + jdk19 = openjdk19; + jdk19_headless = openjdk19_headless; /* default JDK */ - jdk = jdk17; + jdk = jdk19; + jdk_headless = jdk19_headless; # Since the introduction of the Java Platform Module System in Java 9, Java # no longer ships a separate JRE package. @@ -14510,13 +14519,16 @@ with pkgs; # 'jre_minimal' to build a bespoke JRE containing only the modules you need. # # For a general-purpose system, 'jre' defaults to the full JDK: - jre = jdk17; - jre_headless = jdk17_headless; + jre = jdk; + jre_headless = jdk_headless; + jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix { + jdk = jdk17; + }; jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { }; - openjdk = openjdk17; - openjdk_headless = openjdk17_headless; + openjdk = jdk; + openjdk_headless = jdk_headless; graalvmCEPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { @@ -15794,6 +15806,8 @@ with pkgs; mujs = callPackage ../development/interpreters/mujs { }; + nelua = callPackage ../development/interpreters/nelua { }; + nextflow = callPackage ../development/interpreters/nextflow { }; ngn-k = callPackage ../development/interpreters/ngn-k { }; @@ -15830,7 +15844,7 @@ with pkgs; php82 = callPackage ../development/interpreters/php/8.2.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; pcre2 = pcre2.override { - withJitSealloc = !stdenv.isDarwin; + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 }; }; php82Extensions = recurseIntoAttrs php82.extensions; @@ -15840,7 +15854,7 @@ with pkgs; php81 = callPackage ../development/interpreters/php/8.1.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; pcre2 = pcre2.override { - withJitSealloc = !stdenv.isDarwin; + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 }; }; php81Extensions = recurseIntoAttrs php81.extensions; @@ -15850,7 +15864,7 @@ with pkgs; php80 = callPackage ../development/interpreters/php/8.0.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; pcre2 = pcre2.override { - withJitSealloc = !stdenv.isDarwin; + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 }; }; php80Extensions = recurseIntoAttrs php80.extensions; @@ -17011,6 +17025,8 @@ with pkgs; explain = callPackage ../development/tools/explain { }; + func = callPackage ../applications/networking/cluster/func { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; license_finder = callPackage ../development/tools/license_finder { }; @@ -24679,6 +24695,8 @@ with pkgs; webmetro = callPackage ../servers/webmetro { }; + wesher = callPackage ../servers/wesher { }; + wishlist = callPackage ../servers/wishlist { }; wsdd = callPackage ../servers/wsdd { }; @@ -25206,7 +25224,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Hypervisor; }; - libkrun-sev = callPackage ../development/libraries/libkrun { sevVariant = true; }; + libkrun-sev = libkrun.override { sevVariant = true; }; libkrunfw = callPackage ../development/libraries/libkrunfw { }; @@ -25849,6 +25867,8 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; + steamos-devkit = callPackage ../development/tools/steamos-devkit { }; + swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { }; sysdig = callPackage ../os-specific/linux/sysdig { @@ -28339,6 +28359,8 @@ with pkgs; gspeech = callPackage ../applications/audio/gspeech { }; + gtkcord4 = callPackage ../applications/audio/gtkcord4 {}; + haruna = libsForQt5.callPackage ../applications/video/haruna { }; hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { }; @@ -29749,7 +29771,7 @@ with pkgs; }; jabref = callPackage ../applications/office/jabref { - jdk = jdk18; + jdk = javaPackages.compiler.openjdk18; }; jack_capture = callPackage ../applications/audio/jack-capture { }; @@ -31419,6 +31441,8 @@ with pkgs; poke = callPackage ../applications/editors/poke { }; + pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { }; + pokemonsay = callPackage ../tools/misc/pokemonsay { }; polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; @@ -31772,6 +31796,8 @@ with pkgs; rkdeveloptool-pine64 = callPackage ../misc/rkdeveloptool-pine64 { }; + rke = callPackage ../applications/networking/cluster/rke {}; + rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; rofi-unwrapped = callPackage ../applications/misc/rofi { }; @@ -32076,21 +32102,11 @@ with pkgs; printrun = callPackage ../applications/misc/printrun { }; - prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; + prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer { }; - super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { - wxGTK31 = wxGTK31.override { - # https://github.com/supermerill/SuperSlicer/issues/1093 - withEGL = false; - }; - }; + super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; - super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { - wxGTK31 = wxGTK31.override { - # https://github.com/supermerill/SuperSlicer/issues/1093 - withEGL = false; - }; - }).latest; + super-slicer-latest = super-slicer.latest; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; @@ -36645,6 +36661,10 @@ with pkgs; gotestwaf = callPackage ../tools/security/gotestwaf { }; + gotrue = callPackage ../tools/security/gotrue {}; + + gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix {}; + gowitness = callPackage ../tools/security/gowitness { }; guetzli = callPackage ../applications/graphics/guetzli { }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index dd2f70d7529f..769549847309 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -9,11 +9,12 @@ let openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; + openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { }; mavenfod = callPackage ../development/java-modules/maven-fod.nix { }; in { - inherit mavenbuild mavenfod fetchMaven openjfx11 openjfx15 openjfx17; + inherit mavenbuild mavenfod fetchMaven openjfx11 openjfx15 openjfx17 openjfx19; compiler = let @@ -198,6 +199,14 @@ in { openjfx = openjfx17; }; + openjdk19 = mkOpenjdk + ../development/compilers/openjdk/19.nix + ../development/compilers/openjdk/darwin/19.nix + { + openjdk19-bootstrap = temurin-bin.jdk-19; + openjfx = openjfx19; + }; + temurin-bin = recurseIntoAttrs (callPackage ( if stdenv.isLinux then ../development/compilers/temurin-bin/jdk-linux.nix diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c8a0271098a0..642eb11d674c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -385,7 +385,11 @@ let url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz"; hash = "sha256-UyJOS7vv/0z3tj7ZpiljiTuf/Ull1w2WcQNI+Gdt4kk="; }; - propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; + postPatch = '' + substituteInPlace Build.PL \ + --replace "gtk+-2.0" "gtk+-3.0" + ''; + propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk3 pkgs.wxGTK30-gtk3 ModulePluggable ]; buildInputs = [ LWPProtocolHttps ]; meta = { description = "Building, finding and using wxWidgets binaries"; @@ -26946,6 +26950,12 @@ let url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz"; hash = "sha256-HP22U1oPRnbm8aqyydjhbVd74+s7fMBMgHTWheZlG3A="; }; + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/gtk3.patch?h=perl-wx&id=a3776d3747e3767d1e0f6d37bdaabf087f779fea"; + hash = "sha256-CokmRzDTFmEMN/jTKw9ECCPvi0mHt5+h8Ojg4Jgd7D4="; + }) + ]; propagatedBuildInputs = [ AlienWxWidgets ]; # Testing requires an X server: # Error: Unable to initialize GTK, is DISPLAY set properly?" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c357d23bfc9..647bef6357fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6542,6 +6542,8 @@ self: super: with self; { opuslib = callPackage ../development/python-modules/opuslib { }; + opytimark = callPackage ../development/python-modules/opytimark { }; + oralb-ble = callPackage ../development/python-modules/oralb-ble { }; orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; @@ -10251,6 +10253,8 @@ self: super: with self; { sievelib = callPackage ../development/python-modules/sievelib { }; + signalslot = callPackage ../development/python-modules/signalslot { }; + signedjson = callPackage ../development/python-modules/signedjson { }; sigrok = callPackage ../development/python-modules/sigrok { }; @@ -11887,6 +11891,8 @@ self: super: with self; { wcwidth = callPackage ../development/python-modules/wcwidth { }; + weakrefmethod = callPackage ../development/python-modules/weakrefmethod { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; web3 = callPackage ../development/python-modules/web3 { };